summaryrefslogtreecommitdiff
path: root/libssp
diff options
context:
space:
mode:
authorro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2010-07-02 16:17:04 +0000
committerro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2010-07-02 16:17:04 +0000
commit07190cf162c68809a0ee3011e49d2966086ffd77 (patch)
tree57acd2fb8515721e79bd9323b666b1a50a54670e /libssp
parent3248ef45e482c570c7e5502e22105d1c3cd9eaa5 (diff)
downloadgcc-07190cf162c68809a0ee3011e49d2966086ffd77.tar.gz
libgfortran:
* configure.ac (gfortran_use_symver): Only check for Sun-style symbol versioning on Solaris 2. * configure: Regenerate. libssp: * configure.ac (ssp_use_symver): Only check for Sun-style symbol versioning on Solaris 2. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161724 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libssp')
-rw-r--r--libssp/ChangeLog6
-rwxr-xr-xlibssp/configure18
-rw-r--r--libssp/configure.ac14
3 files changed, 26 insertions, 12 deletions
diff --git a/libssp/ChangeLog b/libssp/ChangeLog
index e947735b7a6..a3fda218d21 100644
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,5 +1,11 @@
2010-07-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+ * configure.ac (ssp_use_symver): Only check for Sun-style symbol
+ versioning on Solaris 2.
+ * configure: Regenerate.
+
+2010-07-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
* configure.ac: Check for Sun symbol versioning.
Check for memmove.
* configure: Regenerate.
diff --git a/libssp/configure b/libssp/configure
index 7722c954148..50098d4409b 100755
--- a/libssp/configure
+++ b/libssp/configure
@@ -4131,15 +4131,17 @@ fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
if test x$ssp_use_symver = xno; then
- LDFLAGS="$save_LDFLAGS"
- LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map"
- # Sun ld cannot handle wildcards and treats all entries as undefined.
- cat > conftest.map <<EOF
+ case "$target_os" in
+ solaris2*)
+ LDFLAGS="$save_LDFLAGS"
+ LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map"
+ # Sun ld cannot handle wildcards and treats all entries as undefined.
+ cat > conftest.map <<EOF
FOO_1.0 {
global: foo; local: *;
};
EOF
- if test x$gcc_no_link = xyes; then
+ if test x$gcc_no_link = xyes; then
as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4160,6 +4162,8 @@ else
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+ ;;
+ esac
fi
LDFLAGS="$save_LDFLAGS"
fi
@@ -10642,7 +10646,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10645 "configure"
+#line 10649 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10748,7 +10752,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10751 "configure"
+#line 10755 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/libssp/configure.ac b/libssp/configure.ac
index 005e3bd2260..8181bed0067 100644
--- a/libssp/configure.ac
+++ b/libssp/configure.ac
@@ -86,15 +86,19 @@ FOO_1.0 {
EOF
AC_TRY_LINK([int foo;],[],[ssp_use_symver=gnu],[ssp_use_symver=no])
if test x$ssp_use_symver = xno; then
- LDFLAGS="$save_LDFLAGS"
- LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map"
- # Sun ld cannot handle wildcards and treats all entries as undefined.
- cat > conftest.map <<EOF
+ case "$target_os" in
+ solaris2*)
+ LDFLAGS="$save_LDFLAGS"
+ LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map"
+ # Sun ld cannot handle wildcards and treats all entries as undefined.
+ cat > conftest.map <<EOF
FOO_1.0 {
global: foo; local: *;
};
EOF
- AC_TRY_LINK([int foo;],[],[ssp_use_symver=sun],[ssp_use_symver=no])
+ AC_TRY_LINK([int foo;],[],[ssp_use_symver=sun],[ssp_use_symver=no])
+ ;;
+ esac
fi
LDFLAGS="$save_LDFLAGS"
fi