From: Rainer Orth Date: Mon, 7 Nov 2011 16:34:31 +0000 (+0000) Subject: Return gthr-posix.h to libgcc (PR bootstrap/50982) X-Git-Tag: releases/gcc-4.7.0~2400 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fbcc75d56e58a3732ea71dc1c44f1ee7400f4e2;p=thirdparty%2Fgcc.git Return gthr-posix.h to libgcc (PR bootstrap/50982) libgcc: 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. libstdc++-v3: PR bootstrap/50982 * include/Makefile.am (${host_builddir}/gthr-posix.h): Reflect gthr-posix.h move. * include/Makefile.in: Regenerate. From-SVN: r181095 --- diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index c540bf9ccd9d..29b4605b079d 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,14 @@ +2011-11-07 Rainer Orth + + 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 * config.host (arm*-*-rtemseabi*): New target. diff --git a/libgcc/config/gthr-lynx.h b/libgcc/config/gthr-lynx.h index c98c2e6693e6..d9211b0e5561 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 2346b5286608..63116c460a66 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 342f09187f03..3681af4257e2 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 1895a7695827..e1c58f579378 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 308038c57639..748189393e6d 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 similarity index 100% rename from libgcc/config/gthr-posix.h rename to libgcc/gthr-posix.h diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2e5ccf0ecfc0..abcee817a4bb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2011-11-07 Rainer Orth + + 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 * acinclude.m4 (GLIBCXX_CHECK_SC_NPROC_ONLN): Define. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 732f7bcad0b0..121a6427ec22 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 3d4330c663e2..70c0781d513b 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' \