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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181095 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index c540bf9ccd9d4e13dc114668662e615218fe1318..29b4605b079d0d81b862fccefdc7366bdce7a68e 100644 (file)
--- 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 c98c2e6693e6deede1c10ef14b3cb6c37ffac478..d9211b0e556174e8022142c896a3d2869b300323 100644 (file)
--- 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 2346b5286608df4db98578c7f04a7086e10244db..63116c460a6694b09a7c0e72afbdf07dec6104a2 100644 (file)
--- 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 342f09187f031939a26c6e45a6adfa8773a1d4d9..3681af4257e20774cf835e3fef91c093ee6c0620 100644 (file)
--- 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 1895a769582768f754a5ef4321e4a8e2d88017bf..e1c58f579378e644abc50a1a08534fa937b15e58 100644 (file)
--- 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 308038c57639e84a63bccb3f9775b3244a7af957..748189393e6de400b761187311c88a598ba9705b 100644 (file)
--- 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 2e5ccf0ecfc0f3806840356809d62cf6cd8a3159..abcee817a4bb9353b0e0d7dc2a7daaf42b2e60a0 100644 (file)
--- 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 732f7bcad0b06b2b3de72455206b9ba3a8a4791f..121a6427ec222dd206bd57eb7f7d1ab4ecb06e07 100644 (file)
--- 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 3d4330c663e2ad39f74cd3e287a07a5ef7676ab3..70c0781d513b33a1a233ff5be5d379143c1a64b4 100644 (file)
--- 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' \