aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1998-02-07 20:43:38 +0000
committerIan Lance Taylor <ian@airs.com>1998-02-07 20:43:38 +0000
commit641146fe3f0ccc853654421296ba45f4325ab5fe (patch)
treeeef985164dbf3c84f640d74f5feaeb3902727281
parent7ee4e307d69335468dae0bf24d2afa03b8a7ff59 (diff)
downloadgdb-641146fe3f0ccc853654421296ba45f4325ab5fe.zip
gdb-641146fe3f0ccc853654421296ba45f4325ab5fe.tar.gz
gdb-641146fe3f0ccc853654421296ba45f4325ab5fe.tar.bz2
* configure, aclocal.m4: Rebuild with new libtool.
-rw-r--r--gprof/ChangeLog4
-rw-r--r--gprof/aclocal.m443
-rwxr-xr-xgprof/configure73
-rw-r--r--ld/ChangeLog4
4 files changed, 57 insertions, 67 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index cca4586..594dddd 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 7 15:43:12 1998 Ian Lance Taylor <ian@cygnus.com>
+
+ * configure, aclocal.m4: Rebuild with new libtool.
+
Fri Feb 6 12:02:28 1998 Ian Lance Taylor <ian@cygnus.com>
* alpha.c (alpha_Instruction): Use int, not signed.
diff --git a/gprof/aclocal.m4 b/gprof/aclocal.m4
index a7afd8a..c98fec9 100644
--- a/gprof/aclocal.m4
+++ b/gprof/aclocal.m4
@@ -91,7 +91,7 @@ fi
AC_SUBST($1)])
-# serial 18 AM_PROG_LIBTOOL
+# serial 19 AM_PROG_LIBTOOL
AC_DEFUN(AM_PROG_LIBTOOL,
[AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_PROG_RANLIB])
@@ -142,40 +142,31 @@ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
-[case "$host" in
-*-*-irix6*)
- ac_save_CFLAGS="$CFLAGS"
- flag_passed=no
- for f in -32 -64 -n32 ABI -cckr -mips1 -mips2 -mips3 -mips4; do
- case "$f" in
- ABI)
- test -n "$SGI_ABI" && flag_passed=yes
- if test "$flag_passed" = no && test "$ac_cv_prog_gcc" = yes; then
- # Choose the ABI flag according to GCC's specs.
- if $CC -dumpspecs 2>&1 | sed '/^\*link:$/,/^$/!d' | egrep -e '[ ]-32' >/dev/null; then
- LD="${LD-ld} -32"
- else
- LD="${LD-ld} -n32"
- fi
- fi
+case "$host" in
+*-*-irix*)
+ # Find out which ABI we are using.
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case "`/usr/bin/file conftest.o`" in
+ *32-bit*)
+ LD="${LD-ld} -32"
;;
-
- *)
- if echo " $CC $CFLAGS " | egrep -e "[ ]$f[ ]" > /dev/null; then
- flag_passed=yes
- LD="${LD-ld} $f"
- fi
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
;;
esac
- done
- CFLAGS="$ac_save_CFLAGS"
+ fi
+ rm -rf conftest*
;;
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
CFLAGS="$CFLAGS -belf"
;;
-esac]
+esac
# Actually configure libtool. ac_aux_dir is where install-sh is found.
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
diff --git a/gprof/configure b/gprof/configure
index 5b259b8..5fb34ed 100755
--- a/gprof/configure
+++ b/gprof/configure
@@ -1253,32 +1253,23 @@ test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case "$host" in
-*-*-irix6*)
- ac_save_CFLAGS="$CFLAGS"
- flag_passed=no
- for f in -32 -64 -n32 ABI -cckr -mips1 -mips2 -mips3 -mips4; do
- case "$f" in
- ABI)
- test -n "$SGI_ABI" && flag_passed=yes
- if test "$flag_passed" = no && test "$ac_cv_prog_gcc" = yes; then
- # Choose the ABI flag according to GCC's specs.
- if $CC -dumpspecs 2>&1 | sed '/^\*link:$/,/^$/!d' | egrep -e '[ ]-32' >/dev/null; then
- LD="${LD-ld} -32"
- else
- LD="${LD-ld} -n32"
- fi
- fi
+*-*-irix*)
+ # Find out which ABI we are using.
+ echo '#line 1259 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:1260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ case "`/usr/bin/file conftest.o`" in
+ *32-bit*)
+ LD="${LD-ld} -32"
;;
-
- *)
- if echo " $CC $CFLAGS " | egrep -e "[ ]$f[ ]" > /dev/null; then
- flag_passed=yes
- LD="${LD-ld} $f"
- fi
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
;;
esac
- done
- CFLAGS="$ac_save_CFLAGS"
+ fi
+ rm -rf conftest*
;;
*-*-sco3.2v5*)
@@ -1302,7 +1293,7 @@ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1306: checking for $ac_word" >&5
+echo "configure:1297: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1331,7 +1322,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1335: checking for $ac_word" >&5
+echo "configure:1326: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1379,7 +1370,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1383: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1374: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1389,11 +1380,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 1393 "configure"
+#line 1384 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1413,12 +1404,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1417: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1408: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1422: checking whether we are using GNU C" >&5
+echo "configure:1413: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1427,7 +1418,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -1442,7 +1433,7 @@ if test $ac_cv_prog_gcc = yes; then
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1446: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1437: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1474,7 +1465,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1478: checking for POSIXized ISC" >&5
+echo "configure:1469: checking for POSIXized ISC" >&5
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
@@ -1505,7 +1496,7 @@ EOF
esac
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1509: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:1500: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -1523,19 +1514,19 @@ fi
echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6
-echo "configure:1527: checking for Cygwin32 environment" >&5
+echo "configure:1518: checking for Cygwin32 environment" >&5
if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1532 "configure"
+#line 1523 "configure"
#include "confdefs.h"
int main() {
return __CYGWIN32__;
; return 0; }
EOF
-if { (eval echo configure:1539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_cygwin32=yes
else
@@ -1552,19 +1543,19 @@ echo "$ac_t""$am_cv_cygwin32" 1>&6
CYGWIN32=
test "$am_cv_cygwin32" = yes && CYGWIN32=yes
echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6
-echo "configure:1556: checking for Mingw32 environment" >&5
+echo "configure:1547: checking for Mingw32 environment" >&5
if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1561 "configure"
+#line 1552 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:1568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_mingw32=yes
else
@@ -1583,7 +1574,7 @@ test "$am_cv_mingw32" = yes && MINGW32=yes
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1587: checking for executable suffix" >&5
+echo "configure:1578: checking for executable suffix" >&5
if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 497035c..6e073da 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 7 15:41:26 1998 Ian Lance Taylor <ian@cygnus.com>
+
+ * configure, aclocal.m4: Rebuild with new libtool.
+
Thu Feb 5 12:16:11 1998 Ian Lance Taylor <ian@cygnus.com>
* scripttempl/pe.sc: Remove ${RELOCATING-0} from all sections.