Skip to content

R
riscv-gcc-1
Commit 327a26a3 by Ian Lance Taylor
Options

libgo: Update libtool support to files in current GCC trunk. 

From-SVN: r217404
parent cb16603e
Showing with 37 additions and 45 deletions
libgo/config/libtool.m4
...@@ -1011,7 +1011,7 @@ _LT_EOF ...@@ -1011,7 +1011,7 @@ _LT_EOF
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
10.[[012]]*) 10.[[012]][[,.]]*)
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
10.*) 10.*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
...@@ -1237,7 +1237,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ...@@ -1237,7 +1237,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd" LD="${LD-ld} -m elf_i386_fbsd"
;; ;;
x86_64-*linux*) x86_64-*linux*)
LD="${LD-ld} -m elf_i386" case `/usr/bin/file conftest.o` in
*x86-64*)
LD="${LD-ld} -m elf32_x86_64"
;;
*)
LD="${LD-ld} -m elf_i386"
;;
esac
;; ;;
powerpc64le-*linux*) powerpc64le-*linux*)
LD="${LD-ld} -m elf32lppclinux" LD="${LD-ld} -m elf32lppclinux"
...@@ -1293,27 +1300,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ...@@ -1293,27 +1300,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
CFLAGS="$SAVE_CFLAGS" CFLAGS="$SAVE_CFLAGS"
fi fi
;; ;;
*-*solaris*) sparc*-*solaris*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in case `/usr/bin/file conftest.o` in
*64-bit*) *64-bit*)
case $lt_cv_prog_gnu_ld in case $lt_cv_prog_gnu_ld in
yes*) yes*) LD="${LD-ld} -m elf64_sparc" ;;
case $host in
i?86-*-solaris* | x86_64-*-solaris2.1[[0-9]]*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
LD="${LD-ld} -m elf64_sparc"
;;
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
LD="${LD-ld}_sol2"
fi
;;
*) *)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64" LD="${LD-ld} -64"
...@@ -2297,7 +2291,7 @@ freebsd* | dragonfly*) ...@@ -2297,7 +2291,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat` objformat=`/usr/bin/objformat`
else else
case $host_os in case $host_os in
freebsd[[123]]*) objformat=aout ;; freebsd[[23]].*) objformat=aout ;;
*) objformat=elf ;; *) objformat=elf ;;
esac esac
fi fi
...@@ -2315,7 +2309,7 @@ freebsd* | dragonfly*) ...@@ -2315,7 +2309,7 @@ freebsd* | dragonfly*)
esac esac
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
case $host_os in case $host_os in
freebsd2*) freebsd2.*)
shlibpath_overrides_runpath=yes shlibpath_overrides_runpath=yes
;; ;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*) freebsd3.[[01]]* | freebsdelf3.[[01]]*)
...@@ -3597,6 +3591,7 @@ m4_if([$1], [CXX], [ ...@@ -3597,6 +3591,7 @@ m4_if([$1], [CXX], [
# AIX 5 now supports IA64 processor # AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi fi
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;; ;;
amigaos*) amigaos*)
...@@ -3908,6 +3903,7 @@ m4_if([$1], [CXX], [ ...@@ -3908,6 +3903,7 @@ m4_if([$1], [CXX], [
# AIX 5 now supports IA64 processor # AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi fi
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;; ;;
amigaos*) amigaos*)
...@@ -4828,7 +4824,7 @@ _LT_EOF ...@@ -4828,7 +4824,7 @@ _LT_EOF
;; ;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature. # Unfortunately, older versions of FreeBSD 2 do not have this feature.
freebsd2*) freebsd2.*)
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes
...@@ -5775,7 +5771,7 @@ if test "$_lt_caught_CXX_error" != yes; then ...@@ -5775,7 +5771,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac esac
;; ;;
freebsd[[12]]*) freebsd2.*)
# C++ shared libraries reported to be fairly broken before # C++ shared libraries reported to be fairly broken before
# switch to ELF # switch to ELF
_LT_TAGVAR(ld_shlibs, $1)=no _LT_TAGVAR(ld_shlibs, $1)=no
......
libgo/config/ltmain.sh
...@@ -5928,7 +5928,7 @@ func_mode_link () ...@@ -5928,7 +5928,7 @@ func_mode_link ()
test "$hardcode_direct_absolute" = no; then test "$hardcode_direct_absolute" = no; then
add="$dir/$linklib" add="$dir/$linklib"
elif test "$hardcode_minus_L" = yes; then elif test "$hardcode_minus_L" = yes; then
add_dir="-L$dir" add_dir="-L$absdir"
# Try looking first in the location we're being installed to. # Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then if test -n "$inst_prefix_dir"; then
case $libdir in case $libdir in
......
libgo/configure
...@@ -6528,7 +6528,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ...@@ -6528,7 +6528,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd" LD="${LD-ld} -m elf_i386_fbsd"
;; ;;
x86_64-*linux*) x86_64-*linux*)
LD="${LD-ld} -m elf_i386" case `/usr/bin/file conftest.o` in
*x86-64*)
LD="${LD-ld} -m elf32_x86_64"
;;
*)
LD="${LD-ld} -m elf_i386"
;;
esac
;; ;;
powerpc64le-*linux*) powerpc64le-*linux*)
LD="${LD-ld} -m elf32lppclinux" LD="${LD-ld} -m elf32lppclinux"
...@@ -6618,7 +6625,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } ...@@ -6618,7 +6625,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
CFLAGS="$SAVE_CFLAGS" CFLAGS="$SAVE_CFLAGS"
fi fi
;; ;;
*-*solaris*) sparc*-*solaris*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext echo 'int i;' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
...@@ -6629,20 +6636,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } ...@@ -6629,20 +6636,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
case `/usr/bin/file conftest.o` in case `/usr/bin/file conftest.o` in
*64-bit*) *64-bit*)
case $lt_cv_prog_gnu_ld in case $lt_cv_prog_gnu_ld in
yes*) yes*) LD="${LD-ld} -m elf64_sparc" ;;
case $host in
i?86-*-solaris* | x86_64-*-solaris2.1[0-9]*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
LD="${LD-ld} -m elf64_sparc"
;;
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
LD="${LD-ld}_sol2"
fi
;;
*) *)
if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
LD="${LD-ld} -64" LD="${LD-ld} -64"
...@@ -7250,7 +7244,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } ...@@ -7250,7 +7244,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[91]*) 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
10.[012]*) 10.[012][,.]*)
_lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
10.*) 10.*)
_lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
...@@ -8176,6 +8170,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ...@@ -8176,6 +8170,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# AIX 5 now supports IA64 processor # AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic' lt_prog_compiler_static='-Bstatic'
fi fi
lt_prog_compiler_pic='-fPIC'
;; ;;
amigaos*) amigaos*)
...@@ -9357,7 +9352,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ...@@ -9357,7 +9352,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;; ;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature. # Unfortunately, older versions of FreeBSD 2 do not have this feature.
freebsd2*) freebsd2.*)
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes hardcode_direct=yes
hardcode_minus_L=yes hardcode_minus_L=yes
...@@ -10270,7 +10265,7 @@ freebsd* | dragonfly*) ...@@ -10270,7 +10265,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat` objformat=`/usr/bin/objformat`
else else
case $host_os in case $host_os in
freebsd[123]*) objformat=aout ;; freebsd[23].*) objformat=aout ;;
*) objformat=elf ;; *) objformat=elf ;;
esac esac
fi fi
...@@ -10288,7 +10283,7 @@ freebsd* | dragonfly*) ...@@ -10288,7 +10283,7 @@ freebsd* | dragonfly*)
esac esac
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
case $host_os in case $host_os in
freebsd2*) freebsd2.*)
shlibpath_overrides_runpath=yes shlibpath_overrides_runpath=yes
;; ;;
freebsd3.[01]* | freebsdelf3.[01]*) freebsd3.[01]* | freebsdelf3.[01]*)
...@@ -11122,7 +11117,7 @@ else ...@@ -11122,7 +11117,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11125 "configure" #line 11120 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -11228,7 +11223,7 @@ else ...@@ -11228,7 +11223,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11231 "configure" #line 11226 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
...@@ -11607,6 +11602,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } ...@@ -11607,6 +11602,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# AIX 5 now supports IA64 processor # AIX 5 now supports IA64 processor
lt_prog_compiler_static_GO='-Bstatic' lt_prog_compiler_static_GO='-Bstatic'
fi fi
lt_prog_compiler_pic_GO='-fPIC'
;; ;;
amigaos*) amigaos*)
...@@ -12773,7 +12769,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ...@@ -12773,7 +12769,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;; ;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature. # Unfortunately, older versions of FreeBSD 2 do not have this feature.
freebsd2*) freebsd2.*)
archive_cmds_GO='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' archive_cmds_GO='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct_GO=yes hardcode_direct_GO=yes
hardcode_minus_L_GO=yes hardcode_minus_L_GO=yes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment