Import this patch from gcc:

2008-01-24  David Edelsohn  <edelsohn@gnu.org>

            * libtool.m4: Backport AIX 6 support from ToT Libtool.
This commit is contained in:
Nick Clifton 2008-02-14 12:44:38 +00:00
parent 0e3361806e
commit 680c43e911
2 changed files with 19 additions and 12 deletions

View file

@ -1,3 +1,10 @@
2008-02-14 Nick Clifton <nickc@redhat.com>
Import this patch from gcc:
2008-01-24 David Edelsohn <edelsohn@gnu.org>
* libtool.m4: Backport AIX 6 support from ToT Libtool.
2008-02-02 Hans-Peter Nilsson <hp@axis.com> 2008-02-02 Hans-Peter Nilsson <hp@axis.com>
* configure.ac: Enable fortran for cris-*-elf and crisv32-*-elf. * configure.ac: Enable fortran for cris-*-elf and crisv32-*-elf.

24
libtool.m4 vendored
View file

@ -1993,7 +1993,7 @@ aix3*)
soname_spec='${libname}${release}${shared_ext}$major' soname_spec='${libname}${release}${shared_ext}$major'
;; ;;
aix4* | aix5*) aix[[4-9]]*)
version_type=linux version_type=linux
need_lib_prefix=no need_lib_prefix=no
need_version=no need_version=no
@ -2834,7 +2834,7 @@ lt_cv_deplibs_check_method='unknown'
# whether `pass_all' will *always* work, you probably want this one. # whether `pass_all' will *always* work, you probably want this one.
case $host_os in case $host_os in
aix4* | aix5*) aix[[4-9]]*)
lt_cv_deplibs_check_method=pass_all lt_cv_deplibs_check_method=pass_all
;; ;;
@ -3461,7 +3461,7 @@ m4_if([$1], [CXX], [
esac esac
else else
case $host_os in case $host_os in
aix4* | aix5*) aix[[4-9]]*)
# All AIX code is PIC. # All AIX code is PIC.
if test "$host_cpu" = ia64; then if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor # AIX 5 now supports IA64 processor
@ -3986,7 +3986,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
m4_if([$1], [CXX], [ m4_if([$1], [CXX], [
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in case $host_os in
aix4* | aix5*) aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option. # If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm # -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
@ -4092,7 +4092,7 @@ m4_if([$1], [CXX], [
# See if GNU ld supports shared libraries. # See if GNU ld supports shared libraries.
case $host_os in case $host_os in
aix3* | aix4* | aix5*) aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken # On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then if test "$host_cpu" != ia64; then
_LT_TAGVAR(ld_shlibs, $1)=no _LT_TAGVAR(ld_shlibs, $1)=no
@ -4326,7 +4326,7 @@ _LT_EOF
fi fi
;; ;;
aix4* | aix5*) aix[[4-9]]*)
if test "$host_cpu" = ia64; then if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't # On IA64, the linker does run time linking by default, so we don't
# have to do anything special. # have to do anything special.
@ -4346,7 +4346,7 @@ _LT_EOF
# Test if we are trying to use run time linking or normal # Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we # AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking. # need to do runtime linking.
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes aix_use_runtimelinking=yes
@ -5138,7 +5138,7 @@ if test -n "$compiler"; then
fi fi
;; ;;
aix4* | aix5*) aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no test "$enable_shared" = yes && enable_static=no
fi fi
@ -5328,7 +5328,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# FIXME: insert proper C++ library support # FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no _LT_TAGVAR(ld_shlibs, $1)=no
;; ;;
aix4* | aix5*) aix[[4-9]]*)
if test "$host_cpu" = ia64; then if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't # On IA64, the linker does run time linking by default, so we don't
# have to do anything special. # have to do anything special.
@ -5341,7 +5341,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Test if we are trying to use run time linking or normal # Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we # AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking. # need to do runtime linking.
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do for ld_flag in $LDFLAGS; do
case $ld_flag in case $ld_flag in
*-brtl*) *-brtl*)
@ -6555,7 +6555,7 @@ if test "$_lt_disable_F77" != yes; then
postinstall_cmds='$RANLIB $lib' postinstall_cmds='$RANLIB $lib'
fi fi
;; ;;
aix4* | aix5*) aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no test "$enable_shared" = yes && enable_static=no
fi fi
@ -6696,7 +6696,7 @@ if test "$_lt_disable_FC" != yes; then
postinstall_cmds='$RANLIB $lib' postinstall_cmds='$RANLIB $lib'
fi fi
;; ;;
aix4* | aix5*) aix[[4-9]]*)
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no test "$enable_shared" = yes && enable_static=no
fi fi