This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[build, v3] Return gthr-posix.h to libgcc (PR bootstrap/50982)
- From: Rainer Orth <ro at CeBiTec dot Uni-Bielefeld dot DE>
- To: gcc-patches at gcc dot gnu dot org
- Cc: libstdc++ at gcc dot gnu dot org
- Date: Mon, 07 Nov 2011 17:39:26 +0100
- Subject: [build, v3] Return gthr-posix.h to libgcc (PR bootstrap/50982)
The gthr move to libgcc broke bootstrap on AIX in libstdc++:
gthr-default.h is gthr-aix.h, which included config/gthr-posix.h. This
works fine for the original files in libgcc, but the modified copy of
gthr-default.h in libstc++-v3/include/<target>/bits couldn't find
config/gthr-posix.h. The easiest solution was to return gthr-posix.h to
libgcc, as it had been in my original patch.
Bootstrapped without regressions on i386-pc-solaris2.{8, 11} and
sparc-sun-solaris2.{8, 11} and by David on AIX.
Approved by Paolo in the PR, installed on mainline.
Rainer
2011-11-03 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
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.
# HG changeset patch
# Parent 3528e01004aef6c96846b94fb037050378483ddf
Return gthr-posix.h to libgcc (PR bootstrap/50982)
diff --git a/libgcc/config/gthr-lynx.h b/libgcc/config/gthr-lynx.h
--- a/libgcc/config/gthr-lynx.h
+++ b/libgcc/config/gthr-lynx.h
@@ -52,7 +52,7 @@ see the files COPYING3 and COPYING.RUNTI
#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
--- a/libgcc/config/gthr-vxworks.h
+++ b/libgcc/config/gthr-vxworks.h
@@ -31,7 +31,7 @@ see the files COPYING3 and COPYING.RUNTI
#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
--- a/libgcc/config/rs6000/gthr-aix.h
+++ b/libgcc/config/rs6000/gthr-aix.h
@@ -27,7 +27,7 @@ see the files COPYING3 and COPYING.RUNTI
#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
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -4802,7 +4802,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
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -370,7 +370,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
rename from libgcc/config/gthr-posix.h
rename to libgcc/gthr-posix.h
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -1134,7 +1134,7 @@ uppercase = [ABCDEFGHIJKLMNOPQRSTUVWXYZ_
-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
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1522,7 +1522,7 @@ stamp-host: ${host_headers} ${host_heade
-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' \
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University