aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Nerode <neroden@gcc.gnu.org>2002-11-29 21:38:33 +0000
committerNathanael Nerode <neroden@gcc.gnu.org>2002-11-29 21:38:33 +0000
commit874e38b4f2e3ef2adfecf7ec29401120fe592d57 (patch)
tree10c52561011c52f90f65341795184d82210e9040
parent852e5f18a12f013ff740aabc0dc5ac9bdc2ef5ab (diff)
downloadgdb-874e38b4f2e3ef2adfecf7ec29401120fe592d57.zip
gdb-874e38b4f2e3ef2adfecf7ec29401120fe592d57.tar.gz
gdb-874e38b4f2e3ef2adfecf7ec29401120fe592d57.tar.bz2
2002-11-29 Nathanael Nerode <neroden@gcc.gnu.org>
(Continuing slow-motion replay) * configure.in (v810*): Remove special setting of tools. * configure: Add support for extra required flags for ar or nm. * configure.in (aix4.3+): Use above support for target-specific issues, rather than using config/mt-aix43.
-rw-r--r--ChangeLog9
-rwxr-xr-xconfigure4
-rw-r--r--configure.in11
3 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e47276..7827f6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2002-11-29 Nathanael Nerode <neroden@gcc.gnu.org>
+ (Continuing slow-motion replay)
+ * configure.in (v810*): Remove special setting of tools.
+
+ * configure: Add support for extra required flags for ar or nm.
+ * configure.in (aix4.3+): Use above support for target-specific
+ issues, rather than using config/mt-aix43.
+
+2002-11-29 Nathanael Nerode <neroden@gcc.gnu.org>
+
(Starting slow-motion replay merge from gcc 3.4 b-i-b branch)
* configure: Remove 'removing', which doesn't work. Replace $subdir
with . everywhere. Replace $subdirs with ''. Replace $makesrcdir
diff --git a/configure b/configure
index 362ccec..9ba4225 100755
--- a/configure
+++ b/configure
@@ -936,6 +936,7 @@ t loop
AR=${AR-${host_alias}-ar}
AR_FOR_TARGET=${AR_FOR_TARGET-${target_alias}-ar}
+ AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target}
AS=${AS-${host_alias}-as}
AS_FOR_TARGET=${AS_FOR_TARGET-${target_alias}-as}
BISON=${BISON-bison}
@@ -957,6 +958,7 @@ t loop
MAKEINFO=${MAKEINFO-makeinfo}
NM=${NM-${host_alias}-nm}
NM_FOR_TARGET=${NM_FOR_TARGET-${target_alias}-nm}
+ NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
RANLIB=${RANLIB-${host_alias}-ranlib}
RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET-${target_alias}-ranlib}
WINDRES=${WINDRES-${host_alias}-windres}
@@ -1032,6 +1034,7 @@ else
AR=ar
AR_FOR_TARGET='\$(USUAL_AR_FOR_TARGET)'
+ AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target}
AS=as
AS_FOR_TARGET='\$(USUAL_AS_FOR_TARGET)'
BISON='$(USUAL_BISON)'
@@ -1046,6 +1049,7 @@ else
MAKEINFO='\$(USUAL_MAKEINFO)'
NM=nm
NM_FOR_TARGET='\$(USUAL_NM_FOR_TARGET)'
+ NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
RANLIB_FOR_TARGET='\$(USUAL_RANLIB_FOR_TARGET)'
WINDRES=windres
WINDRES_FOR_TARGET='\$(USUAL_WINDRES_FOR_TARGET)'
diff --git a/configure.in b/configure.in
index 21b86fd..10749a8 100644
--- a/configure.in
+++ b/configure.in
@@ -1118,10 +1118,9 @@ if test -n "${host_makefile_frag}" ; then
host_makefile_frag=mh-frag
fi
+extra_arflags_for_target=
+extra_nmflags_for_target=
case "${target}" in
- v810*)
- target_makefile_frag="config/mt-v810"
- ;;
i[3456]86-*-netware*)
target_makefile_frag="config/mt-netware"
;;
@@ -1132,7 +1131,11 @@ case "${target}" in
target_makefile_frag="config/mt-linux"
;;
*-*-aix4.[3456789]* | *-*-aix[56789].*)
- target_makefile_frag="config/mt-aix43"
+ # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm
+ # commands to handle both 32-bit and 64-bit objects. These flags are
+ # harmless if we're using GNU nm or ar.
+ extra_arflags_for_target=" -X32_64"
+ extra_nmflags_for_target=" -B -X32_64"
;;
mips*-*-pe | sh*-*-pe | *arm-wince-pe)
target_makefile_frag="config/mt-wince"