diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 26 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.am | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 7 |
4 files changed, 30 insertions, 15 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 440c7cd..904c253 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2007-10-29 Benjamin Kosnik <bkoz@redhat.com> + + * include/Makefile.am (ext_compat_headers): New. + * include/Makefile.in: Regenerate. + * configure: Regenerate. + 2007-10-28 Paolo Carlini <pcarlini@suse.de> * include/bits/stl_algobase.h (_GLIBCXX_MOVE3, diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 05337f9..96ca8bb 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -40634,7 +40634,7 @@ fi; echo "$as_me:$LINENO: checking whether the target supports thread-local storage" >&5 echo $ECHO_N "checking whether the target supports thread-local storage... $ECHO_C" >&6 -if test "${have_tls+set}" = set; then +if test "${gcc_cv_have_tls+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -40669,12 +40669,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - have_tls=yes + gcc_cv_have_tls=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -have_tls=no +gcc_cv_have_tls=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -40748,14 +40748,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - have_tls=yes + gcc_cv_have_tls=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -have_tls=no +gcc_cv_have_tls=no fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -40763,12 +40763,12 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -have_tls=yes +gcc_cv_have_tls=yes fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$chktls_save_LDFLAGS" - if test $have_tls = yes; then + if test $gcc_cv_have_tls = yes; then chktls_save_CFLAGS="$CFLAGS" thread_CFLAGS=failed for flag in '' '-pthread' '-lpthread'; do @@ -40881,14 +40881,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - have_tls=yes + gcc_cv_have_tls=yes else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -have_tls=no +gcc_cv_have_tls=no fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -40901,14 +40901,14 @@ echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) -have_tls=no +gcc_cv_have_tls=no fi rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $have_tls" >&5 -echo "${ECHO_T}$have_tls" >&6 - if test "$enable_tls $have_tls" = "yes yes"; then +echo "$as_me:$LINENO: result: $gcc_cv_have_tls" >&5 +echo "${ECHO_T}$gcc_cv_have_tls" >&6 + if test "$enable_tls $gcc_cv_have_tls" = "yes yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_TLS 1 diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 824e6407..c1b549b 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -501,8 +501,12 @@ ext_headers = \ ${ext_srcdir}/vstring.h \ ${ext_srcdir}/vstring.tcc \ ${ext_srcdir}/vstring_fwd.h \ - ${ext_srcdir}/vstring_util.h + ${ext_srcdir}/vstring_util.h \ + ${ext_compat_headers} +ext_compat_headers = \ + ${backward_srcdir}/hash_set \ + ${backward_srcdir}/hash_map tr1_srcdir = ${glibcxx_srcdir}/include/tr1 tr1_builddir = ./tr1 diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 1e18b72..b08e447 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -748,7 +748,12 @@ ext_headers = \ ${ext_srcdir}/vstring.h \ ${ext_srcdir}/vstring.tcc \ ${ext_srcdir}/vstring_fwd.h \ - ${ext_srcdir}/vstring_util.h + ${ext_srcdir}/vstring_util.h \ + ${ext_compat_headers} + +ext_compat_headers = \ + ${backward_srcdir}/hash_set \ + ${backward_srcdir}/hash_map tr1_srcdir = ${glibcxx_srcdir}/include/tr1 tr1_builddir = ./tr1 |