|
 |
4ac4fd |
2004-07-13 Jakub Jelinek <jakub@redhat.com>
|
|
|
4ac4fd |
|
|
|
4ac4fd |
* acinclude.m4 (glibcpp_shared_libgcc): Correct
|
|
|
4ac4fd |
glibcpp_shared_libgcc test for multilibs.
|
|
|
4ac4fd |
* aclocal.m4: Rebuilt.
|
|
|
4ac4fd |
* configure: Rebuilt.
|
|
|
4ac4fd |
|
|
|
4ac4fd |
--- libstdc++33-v3/acinclude.m4.jj 2004-06-24 18:06:53.000000000 +0200
|
|
|
4ac4fd |
+++ libstdc++33-v3/acinclude.m4 2004-08-18 10:28:50.333384148 +0200
|
|
|
4ac4fd |
@@ -2294,6 +2294,23 @@ if test $enable_symvers != no; then
|
|
|
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 |
fi
|
|
|
4ac4fd |
|
|
|
4ac4fd |
--- libstdc++33-v3/aclocal.m4.jj 2004-06-24 18:06:53.000000000 +0200
|
|
|
4ac4fd |
+++ libstdc++33-v3/aclocal.m4 2004-08-18 10:30:06.361019696 +0200
|
|
|
4ac4fd |
@@ -2306,6 +2306,23 @@ if test $enable_symvers != no; then
|
|
|
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 |
fi
|
|
|
4ac4fd |
|
|
|
4ac4fd |
--- libstdc++33-v3/configure.jj 2004-08-18 09:44:22.000000000 +0200
|
|
|
4ac4fd |
+++ libstdc++33-v3/configure 2004-08-18 10:31:41.502299528 +0200
|
|
|
4ac4fd |
@@ -23563,6 +23563,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 23579 "configure"
|
|
|
4ac4fd |
+#include "confdefs.h"
|
|
|
4ac4fd |
+
|
|
|
4ac4fd |
+int main() {
|
|
|
4ac4fd |
+return 0;
|
|
|
4ac4fd |
+; return 0; }
|
|
|
4ac4fd |
+EOF
|
|
|
4ac4fd |
+if { (eval echo configure:23586: \"$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 |
fi
|
|
|
4ac4fd |
|