diff options
author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2010-07-02 16:17:04 +0000 |
---|---|---|
committer | Rainer Orth <ro@gcc.gnu.org> | 2010-07-02 16:17:04 +0000 |
commit | faeb4ee3aac0ece0f8619ba8c3a2908c6ed7b9c1 (patch) | |
tree | 57acd2fb8515721e79bd9323b666b1a50a54670e /libgfortran | |
parent | 1fa29c84624c8ab2c3739d906bc08c7b112eee73 (diff) | |
download | gcc-faeb4ee3aac0ece0f8619ba8c3a2908c6ed7b9c1.tar.gz |
configure.ac (gfortran_use_symver): Only check for Sun-style symbol versioning on Solaris 2.
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.
From-SVN: r161724
Diffstat (limited to 'libgfortran')
-rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
-rwxr-xr-x | libgfortran/configure | 18 | ||||
-rw-r--r-- | libgfortran/configure.ac | 14 |
3 files changed, 26 insertions, 12 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 4e4120f94fb..645056bc30d 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,5 +1,11 @@ 2010-07-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + * configure.ac (gfortran_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. * configure: Regenerate. diff --git a/libgfortran/configure b/libgfortran/configure index b1a98f81992..7038d1a0540 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -4448,15 +4448,17 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test x$gfortran_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 @@ -4477,6 +4479,8 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + ;; + esac fi LDFLAGS="$save_LDFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gfortran_use_symver" >&5 @@ -11358,7 +11362,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11361 "configure" +#line 11365 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11464,7 +11468,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11467 "configure" +#line 11471 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac index 5f78a8b2d2c..8b9ac74c16a 100644 --- a/libgfortran/configure.ac +++ b/libgfortran/configure.ac @@ -147,15 +147,19 @@ FOO_1.0 { EOF AC_TRY_LINK([int foo;],[],[gfortran_use_symver=gnu],[gfortran_use_symver=no]) if test x$gfortran_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;],[],[gfortran_use_symver=sun],[gfortran_use_symver=no]) + AC_TRY_LINK([int foo;],[],[gfortran_use_symver=sun],[gfortran_use_symver=no]) + ;; + esac fi LDFLAGS="$save_LDFLAGS" AC_MSG_RESULT($gfortran_use_symver) |