|
 |
4ac4fd |
2004-07-13 Jakub Jelinek <jakub@redhat.com>
|
|
|
4ac4fd |
|
|
|
4ac4fd |
* acinclude.m4 (glibcxx_shared_libgcc): Correct
|
|
|
4ac4fd |
glibcxx_shared_libgcc test for multilibs.
|
|
|
4ac4fd |
* aclocal.m4: Rebuilt.
|
|
|
4ac4fd |
* configure: Rebuilt.
|
|
|
4ac4fd |
|
|
|
4ac4fd |
--- libstdc++-v3/acinclude.m4.jj 2003-01-28 10:51:32.000000000 +0100
|
|
|
4ac4fd |
+++ libstdc++-v3/acinclude.m4 2004-08-12 14:54:01.657789664 +0200
|
|
|
4ac4fd |
@@ -2208,6 +2208,23 @@ ac_save_CFLAGS="$CFLAGS"
|
|
|
4ac4fd |
CFLAGS=' -lgcc_s'
|
|
|
4ac4fd |
AC_TRY_LINK( , [return 0], glibcpp_shared_libgcc=yes, glibcpp_shared_libgcc=no)
|
|
|
4ac4fd |
CFLAGS="$ac_save_CFLAGS"
|
|
|
4ac4fd |
+if test $glibcpp_shared_libgcc = no; then
|
|
|
4ac4fd |
+ cat > conftest.c <
|
|
|
4ac4fd |
+int main (void) { return 0; }
|
|
|
4ac4fd |
+EOF
|
|
|
4ac4fd |
+changequote(,)dnl
|
|
|
4ac4fd |
+ glibcpp_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
|
|
|
4ac4fd |
+ -shared -shared-libgcc -o conftest.so \
|
|
|
4ac4fd |
+ conftest.c -v 2>&1 >/dev/null \
|
|
|
4ac4fd |
+ | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
|
|
|
4ac4fd |
+changequote([,])dnl
|
|
|
4ac4fd |
+ rm -f conftest.c conftest.so
|
|
|
4ac4fd |
+ if test x${glibcpp_libgcc_s_suffix+set} = xset; then
|
|
|
4ac4fd |
+ CFLAGS=" -lgcc_s$glibcpp_libgcc_s_suffix"
|
|
|
4ac4fd |
+ AC_TRY_LINK(, [return 0;], glibcpp_shared_libgcc=yes)
|
|
|
4ac4fd |
+ CFLAGS="$ac_save_CFLAGS"
|
|
|
4ac4fd |
+ fi
|
|
|
4ac4fd |
+fi
|
|
|
4ac4fd |
AC_MSG_RESULT($glibcpp_shared_libgcc)
|
|
|
4ac4fd |
|
|
|
4ac4fd |
# For GNU ld, we need at least this version. It's 2.12 in the same format
|
|
|
4ac4fd |
--- libstdc++-v3/aclocal.m4.jj 2003-02-14 09:30:26.000000000 +0100
|
|
|
4ac4fd |
+++ libstdc++-v3/aclocal.m4 2004-08-12 14:57:06.460552615 +0200
|
|
|
4ac4fd |
@@ -2220,6 +2220,23 @@ ac_save_CFLAGS="$CFLAGS"
|
|
|
4ac4fd |
CFLAGS=' -lgcc_s'
|
|
|
4ac4fd |
AC_TRY_LINK( , [return 0], glibcpp_shared_libgcc=yes, glibcpp_shared_libgcc=no)
|
|
|
4ac4fd |
CFLAGS="$ac_save_CFLAGS"
|
|
|
4ac4fd |
+if test $glibcpp_shared_libgcc = no; then
|
|
|
4ac4fd |
+ cat > conftest.c <
|
|
|
4ac4fd |
+int main (void) { return 0; }
|
|
|
4ac4fd |
+EOF
|
|
|
4ac4fd |
+changequote(,)dnl
|
|
|
4ac4fd |
+ glibcpp_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
|
|
|
4ac4fd |
+ -shared -shared-libgcc -o conftest.so \
|
|
|
4ac4fd |
+ conftest.c -v 2>&1 >/dev/null \
|
|
|
4ac4fd |
+ | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
|
|
|
4ac4fd |
+changequote([,])dnl
|
|
|
4ac4fd |
+ rm -f conftest.c conftest.so
|
|
|
4ac4fd |
+ if test x${glibcpp_libgcc_s_suffix+set} = xset; then
|
|
|
4ac4fd |
+ CFLAGS=" -lgcc_s$glibcpp_libgcc_s_suffix"
|
|
|
4ac4fd |
+ AC_TRY_LINK(, [return 0;], glibcpp_shared_libgcc=yes)
|
|
|
4ac4fd |
+ CFLAGS="$ac_save_CFLAGS"
|
|
|
4ac4fd |
+ fi
|
|
|
4ac4fd |
+fi
|
|
|
4ac4fd |
AC_MSG_RESULT($glibcpp_shared_libgcc)
|
|
|
4ac4fd |
|
|
|
4ac4fd |
# For GNU ld, we need at least this version. It's 2.12 in the same format
|
|
|
4ac4fd |
--- libstdc++-v3/configure.jj 2003-02-14 09:30:58.000000000 +0100
|
|
|
4ac4fd |
+++ libstdc++-v3/configure 2004-08-12 14:57:49.978961900 +0200
|
|
|
4ac4fd |
@@ -22090,6 +22090,36 @@ else
|
|
|
4ac4fd |
fi
|
|
|
4ac4fd |
rm -f conftest*
|
|
|
4ac4fd |
CFLAGS="$ac_save_CFLAGS"
|
|
|
4ac4fd |
+if test $glibcpp_shared_libgcc = no; then
|
|
|
4ac4fd |
+ cat > conftest.c <
|
|
|
4ac4fd |
+int main (void) { return 0; }
|
|
|
4ac4fd |
+EOF
|
|
|
4ac4fd |
+ glibcpp_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
|
|
|
4ac4fd |
+ -shared -shared-libgcc -o conftest.so \
|
|
|
4ac4fd |
+ conftest.c -v 2>&1 >/dev/null \
|
|
|
4ac4fd |
+ | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
|
|
|
4ac4fd |
+ rm -f conftest.c conftest.so
|
|
|
4ac4fd |
+ if test x${glibcpp_libgcc_s_suffix+set} = xset; then
|
|
|
4ac4fd |
+ CFLAGS=" -lgcc_s$glibcpp_libgcc_s_suffix"
|
|
|
4ac4fd |
+ cat > conftest.$ac_ext <
|
|
|
4ac4fd |
+#line 22106 "configure"
|
|
|
4ac4fd |
+#include "confdefs.h"
|
|
|
4ac4fd |
+
|
|
|
4ac4fd |
+int main() {
|
|
|
4ac4fd |
+return 0;
|
|
|
4ac4fd |
+; return 0; }
|
|
|
4ac4fd |
+EOF
|
|
|
4ac4fd |
+if { (eval echo configure:22113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
|
4ac4fd |
+ rm -rf conftest*
|
|
|
4ac4fd |
+ glibcpp_shared_libgcc=yes
|
|
|
4ac4fd |
+else
|
|
|
4ac4fd |
+ echo "configure: failed program was:" >&5
|
|
|
4ac4fd |
+ cat conftest.$ac_ext >&5
|
|
|
4ac4fd |
+fi
|
|
|
4ac4fd |
+rm -f conftest*
|
|
|
4ac4fd |
+ CFLAGS="$ac_save_CFLAGS"
|
|
|
4ac4fd |
+ fi
|
|
|
4ac4fd |
+fi
|
|
|
4ac4fd |
echo "$ac_t""$glibcpp_shared_libgcc" 1>&6
|
|
|
4ac4fd |
|
|
|
4ac4fd |
# For GNU ld, we need at least this version. It's 2.12 in the same format
|