diff options
| -rw-r--r-- | libgcc/ChangeLog | 11 | ||||
| -rw-r--r-- | libgcc/config/gthr-lynx.h | 2 | ||||
| -rw-r--r-- | libgcc/config/gthr-vxworks.h | 2 | ||||
| -rw-r--r-- | libgcc/config/rs6000/gthr-aix.h | 2 | ||||
| -rw-r--r-- | libgcc/configure | 2 | ||||
| -rw-r--r-- | libgcc/configure.ac | 2 | ||||
| -rw-r--r-- | libgcc/gthr-posix.h (renamed from libgcc/config/gthr-posix.h) | 0 | ||||
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 2 |
10 files changed, 25 insertions, 7 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index c540bf9ccd9..29b4605b079 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,14 @@ +2011-11-07 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR bootstrap/50982 + * config/gthr-posix.h: Move ... + * gthr-posix.h: ... here. + * config/gthr-lynx.h: Reflect this. + * config/gthr-vxworks.h: Likewise. + * config/rs6000/gthr-aix.h: Likewise. + * configure.ac (target_thread_file): Likewise. + * configure: Regenerate. + 2011-11-06 Sebastian Huber <sebastian.huber@embedded-brains.de> * config.host (arm*-*-rtemseabi*): New target. diff --git a/libgcc/config/gthr-lynx.h b/libgcc/config/gthr-lynx.h index c98c2e6693e..d9211b0e556 100644 --- a/libgcc/config/gthr-lynx.h +++ b/libgcc/config/gthr-lynx.h @@ -52,7 +52,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #undef GTHREAD_USE_WEAK #define GTHREAD_USE_WEAK 0 -#include "config/gthr-posix.h" +#include "gthr-posix.h" #else #include "gthr-single.h" diff --git a/libgcc/config/gthr-vxworks.h b/libgcc/config/gthr-vxworks.h index 2346b528660..63116c460a6 100644 --- a/libgcc/config/gthr-vxworks.h +++ b/libgcc/config/gthr-vxworks.h @@ -31,7 +31,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #ifdef _LIBOBJC /* libobjc requires the optional pthreads component. */ -#include "config/gthr-posix.h" +#include "gthr-posix.h" #else #ifdef __cplusplus diff --git a/libgcc/config/rs6000/gthr-aix.h b/libgcc/config/rs6000/gthr-aix.h index 342f09187f0..3681af4257e 100644 --- a/libgcc/config/rs6000/gthr-aix.h +++ b/libgcc/config/rs6000/gthr-aix.h @@ -27,7 +27,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define GCC_GTHR_AIX_H #ifdef _THREAD_SAFE -#include "config/gthr-posix.h" +#include "gthr-posix.h" #else #include "gthr-single.h" #endif diff --git a/libgcc/configure b/libgcc/configure index 1895a769582..e1c58f57937 100644 --- a/libgcc/configure +++ b/libgcc/configure @@ -4798,7 +4798,7 @@ case $target_thread_file in dce) thread_header=config/pa/gthr-dce.h ;; lynx) thread_header=config/gthr-lynx.h ;; mipssde) thread_header=config/mips/gthr-mipssde.h ;; - posix) thread_header=config/gthr-posix.h ;; + posix) thread_header=gthr-posix.h ;; rtems) thread_header=config/gthr-rtems.h ;; single) thread_header=gthr-single.h ;; tpf) thread_header=config/s390/gthr-tpf.h ;; diff --git a/libgcc/configure.ac b/libgcc/configure.ac index 308038c5763..748189393e6 100644 --- a/libgcc/configure.ac +++ b/libgcc/configure.ac @@ -366,7 +366,7 @@ case $target_thread_file in dce) thread_header=config/pa/gthr-dce.h ;; lynx) thread_header=config/gthr-lynx.h ;; mipssde) thread_header=config/mips/gthr-mipssde.h ;; - posix) thread_header=config/gthr-posix.h ;; + posix) thread_header=gthr-posix.h ;; rtems) thread_header=config/gthr-rtems.h ;; single) thread_header=gthr-single.h ;; tpf) thread_header=config/s390/gthr-tpf.h ;; diff --git a/libgcc/config/gthr-posix.h b/libgcc/gthr-posix.h index 46054f6a7c2..46054f6a7c2 100644 --- a/libgcc/config/gthr-posix.h +++ b/libgcc/gthr-posix.h diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2e5ccf0ecfc..abcee817a4b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2011-11-07 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR bootstrap/50982 + * include/Makefile.am (${host_builddir}/gthr-posix.h): Reflect + gthr-posix.h move. + * include/Makefile.in: Regenerate. + 2011-11-07 Jonathan Wakely <jwakely.gcc@gmail.com> * acinclude.m4 (GLIBCXX_CHECK_SC_NPROC_ONLN): Define. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 732f7bcad0b..121a6427ec2 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1133,7 +1133,7 @@ ${host_builddir}/gthr-single.h: ${toplevel_srcdir}/libgcc/gthr-single.h \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ < $< > $@ -${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/libgcc/config/gthr-posix.h \ +${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/libgcc/gthr-posix.h \ stamp-${host_alias} sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 3d4330c663e..70c0781d513 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1521,7 +1521,7 @@ ${host_builddir}/gthr-single.h: ${toplevel_srcdir}/libgcc/gthr-single.h \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ < $< > $@ -${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/libgcc/config/gthr-posix.h \ +${host_builddir}/gthr-posix.h: ${toplevel_srcdir}/libgcc/gthr-posix.h \ stamp-${host_alias} sed -e 's/\(UNUSED\)/_GLIBCXX_\1/g' \ -e 's/\(GCC${uppercase}*_H\)/_GLIBCXX_\1/g' \ |