summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Holcomb <jeffh@redhat.com>2001-11-14 06:24:41 +0000
committerJeff Holcomb <jeffh@redhat.com>2001-11-14 06:24:41 +0000
commit4a02fdb219a5332fedb5bff8802810cbd0171008 (patch)
treeb6efbd572283ca44ff8acd172461da711567c954
parent227b99535ed8efb35ddb01895e8a968ee7885bcc (diff)
downloadbinutils-4a02fdb219a5332fedb5bff8802810cbd0171008.tar.gz
binutils-4a02fdb219a5332fedb5bff8802810cbd0171008.tar.bz2
binutils-4a02fdb219a5332fedb5bff8802810cbd0171008.zip
2001-11-13 Jeff Holcomb <jeffh@redhat.com>
Merged from net gcc: 2001-07-30 Jeff Sturm <jsturm@one-pont.com> * ltcf-c.sh: Use $objext, not $ac_objext. 2001-07-27 Mark Kettenis <kettenis@gnu.org> * ltcf-cxx.sh: Add support for GNU. 2001-07-22 Timothy Wall <twall@redhat.com> * ltcf-c.sh: Don't disable shared libraries for AIX5/IA64. Preserve default settings if using GNU tools with that configuration. * ltcf-cxx.sh: Ditto. * ltcf-gcj.sh: Ditto. 2001-07-21 Michael Chastain <chastain@redhat.com> * ltconfig: Set max_cmd_len to a maximum of 512Kb, as it seems some HPUX 11.0 systems have trouble with 1MB. Mark as gcc-local. * ltmain.sh: Mark as gcc-local.
-rw-r--r--ChangeLog17
-rw-r--r--ltcf-c.sh24
-rw-r--r--ltcf-cxx.sh18
-rw-r--r--ltcf-gcj.sh24
-rwxr-xr-xltconfig6
-rw-r--r--ltmain.sh4
6 files changed, 65 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index b86ab652b1d..1919c5b9641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2001-11-13 Jeff Holcomb <jeffh@redhat.com>
+ Merged from net gcc:
+ 2001-07-30 Jeff Sturm <jsturm@one-pont.com>
+ * ltcf-c.sh: Use $objext, not $ac_objext.
+ 2001-07-27 Mark Kettenis <kettenis@gnu.org>
+ * ltcf-cxx.sh: Add support for GNU.
+ 2001-07-22 Timothy Wall <twall@redhat.com>
+ * ltcf-c.sh: Don't disable shared libraries for AIX5/IA64. Preserve
+ default settings if using GNU tools with that configuration.
+ * ltcf-cxx.sh: Ditto.
+ * ltcf-gcj.sh: Ditto.
+ 2001-07-21 Michael Chastain <chastain@redhat.com>
+ * ltconfig: Set max_cmd_len to a maximum of 512Kb, as it seems some
+ HPUX 11.0 systems have trouble with 1MB. Mark as gcc-local.
+ * ltmain.sh: Mark as gcc-local.
+
+2001-11-13 Jeff Holcomb <jeffh@redhat.com>
+
* Makefile.in (all-bison): Revert 2001-10-24.
Don't depend on texinfo.
diff --git a/ltcf-c.sh b/ltcf-c.sh
index 1ce95e2507d..f11a0cfdd11 100644
--- a/ltcf-c.sh
+++ b/ltcf-c.sh
@@ -58,9 +58,10 @@ if test "$with_gnu_ld" = yes; then
# See if GNU ld supports shared libraries.
case $host_os in
aix3* | aix4* | aix5*)
- # On AIX, the GNU linker is very broken
- ld_shlibs=no
- cat <<EOF 1>&2
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+ cat <<EOF 1>&2
*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
@@ -69,6 +70,7 @@ if test "$with_gnu_ld" = yes; then
*** so that a non-GNU linker is found, and then restart.
EOF
+ fi
;;
amigaos*)
@@ -311,8 +313,10 @@ else
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
+ if test $with_gnu_ld = no; then
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ fi
else
# Test if we are trying to use run time linking, or normal AIX style linking.
# If -brtl is somewhere in LDFLAGS, we need to do run time linking.
@@ -336,9 +340,11 @@ else
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
else
if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ if test $with_gnu_ld = no; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag="-z nodefs"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ fi
else
allow_undefined_flag=' ${wl}-berok'
# -bexpall does not export symbols beginning with underscore (_)
@@ -783,7 +789,7 @@ if test "$enable_shared" = yes && test "$with_gcc" = yes; then
cat conftest.err 1>&5
soname=conftest
lib=conftest
- libobjs=conftest.$ac_objext
+ libobjs=conftest.$objext
deplibs=
wl=$ac_cv_prog_cc_wl
compiler_flags=-v
diff --git a/ltcf-cxx.sh b/ltcf-cxx.sh
index 6079645c644..22875d06f18 100644
--- a/ltcf-cxx.sh
+++ b/ltcf-cxx.sh
@@ -165,8 +165,10 @@ case $host_os in
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
+ if test $with_gnu_ld = no; then
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ fi
else
# Test if we are trying to use run time linking, or normal AIX style linking.
# If -brtl is somewhere in LDFLAGS, we need to do run time linking.
@@ -189,9 +191,11 @@ case $host_os in
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}-brtl \${wl}$exp_sym_flag:\$export_symbols"
else
if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ if test $with_gnu_ld = no; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag="-z nodefs"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ fi
else
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
# Warning - without using the other run time loading flags, -berok will
@@ -242,6 +246,8 @@ case $host_os in
# conventions
ld_shlibs=yes
;;
+ gnu*)
+ ;;
hpux*)
if test $with_gnu_ld = no; then
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
@@ -740,6 +746,8 @@ else
freebsd*)
# FreeBSD uses GNU C++
;;
+ gnu*)
+ ;;
hpux9* | hpux10* | hpux11*)
case $cc_basename in
CC)
diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh
index dbdb880e9b8..7be87123642 100644
--- a/ltcf-gcj.sh
+++ b/ltcf-gcj.sh
@@ -60,10 +60,11 @@ if test "$with_gnu_ld" = yes; then
# See if GNU ld supports shared libraries.
case $host_os in
- aix3* | aix4*)
- # On AIX, the GNU linker is very broken
- ld_shlibs=no
- cat <<EOF 1>&2
+ aix3* | aix4* | aix5*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+ cat <<EOF 1>&2
*** Warning: the GNU linker, at least up to release 2.9.1, is reported
*** to be unable to reliably create shared libraries on AIX.
@@ -72,6 +73,7 @@ if test "$with_gnu_ld" = yes; then
*** so that a non-GNU linker is found, and then restart.
EOF
+ fi
;;
amigaos*)
@@ -304,8 +306,10 @@ else
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
- exp_sym_flag='-Bexport'
- no_entry_flag=""
+ if test $with_gnu_ld = no; then
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ fi
else
# Test if we are trying to use run time linking, or normal AIX style linking.
# If -brtl is somewhere in LDFLAGS, we need to do run time linking.
@@ -329,9 +333,11 @@ else
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
else
if test "$host_cpu" = ia64; then
- hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
- allow_undefined_flag="-z nodefs"
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ if test $with_gnu_ld = no; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag="-z nodefs"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+ fi
else
allow_undefined_flag=' ${wl}-berok'
# -bexpall does not export symbols beginning with underscore (_)
diff --git a/ltconfig b/ltconfig
index f8ccbf4aced..746e15b932d 100755
--- a/ltconfig
+++ b/ltconfig
@@ -181,8 +181,8 @@ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
# Constants:
PROGRAM=ltconfig
PACKAGE=libtool
-VERSION=1.4a
-TIMESTAMP=" (1.641.2.256 2001/05/28 20:09:07)"
+VERSION=1.4a-GCC3.0
+TIMESTAMP=" (1.641.2.256 2001/05/28 20:09:07 with GCC-local changes)"
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
rm="rm -f"
@@ -791,7 +791,7 @@ else
= "XX$testring" &&
new_result=`expr "X$testring" : ".*" 2>&1` &&
lt_cv_sys_max_cmd_len=$new_result &&
- test $i != 18 # 1 MB should be enough
+ test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
testring=$testring$testring
diff --git a/ltmain.sh b/ltmain.sh
index 62a679c2c15..bd76cfb4da0 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -55,8 +55,8 @@ modename="$progname"
# Constants.
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.4a
-TIMESTAMP=" (1.641.2.256 2001/05/28 20:09:07)"
+VERSION=1.4a-GCC3.0
+TIMESTAMP=" (1.641.2.256 2001/05/28 20:09:07 with GCC-local changes)"
default_mode=
help="Try \`$progname --help' for more information."