From ae09d880bdb0dd56036953766f30a83826896e79 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 14 Feb 1996 23:13:13 +0000 Subject: [PATCH] From Alan Modra : * configure.in: Remove duplicate setting of cpu_type. Check whether opcodes library is required for on all targets, not just primary one. * configure: Rebuild. --- gas/ChangeLog | 6 +++ gas/configure | 146 +++++++++++++++++++++++-------------------------------- gas/configure.in | 109 +++++++++++++++++------------------------ 3 files changed, 112 insertions(+), 149 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 04e5f3c..0d61fd1 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -11,6 +11,12 @@ Wed Feb 14 16:33:12 1996 Martin Anantharaman + From Alan Modra : + * configure.in: Remove duplicate setting of cpu_type. Check + whether opcodes library is required for on all targets, not just + primary one. + * configure: Rebuild. + * config/tc-mips.c (mips_big_got): New static variable. (s_extern): Don't declare. (reg_needs_delay): New static function. diff --git a/gas/configure b/gas/configure index 7f7634a..d7e6ca4 100755 --- a/gas/configure +++ b/gas/configure @@ -680,58 +680,6 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," te_file=generic -# assign cpu type - -# check for architecture variants -case ${target_cpu} in - armeb) cpu_type=arm endian=big ;; - arm*) cpu_type=arm endian=little ;; - hppa*) cpu_type=hppa ;; - i[45]86) cpu_type=i386 ;; - m680[012346]0) cpu_type=m68k ;; - m68008) cpu_type=m68k ;; - m683??) cpu_type=m68k ;; - m8*) cpu_type=m88k ;; - mips*el) cpu_type=mips endian=little;; - mips*) cpu_type=mips endian=big ;; - powerpcle*) cpu_type=ppc endian=little ;; - powerpc*) cpu_type=ppc endian=big ;; - rs6000*) cpu_type=ppc ;; - sparc64) cpu_type=sparc - cat >> confdefs.h <<\EOF -#define SPARC_V9 1 -EOF - ;; - sparc*) cpu_type=sparc ;; - *) cpu_type=${target_cpu} ;; -esac - -# do we need the opcodes library? -case ${cpu_type} in - alpha | vax) - ;; - *) - OPCODES_DEP=../opcodes/libopcodes.a - OPCODES_LIB='-L../opcodes -lopcodes' - - # We need to handle some special cases if opcodes was built shared. - if test "${shared}" = "true"; then - case "${host}" in - *-*-sunos*) - # On SunOS, we must link against the name we are going to install, - # not -lbfd, since SunOS does not support SONAME. - OPCODES_LIB='-L../opcodes -l`echo opcodes | sed '"'"'$(program_transform_name)'"'"'`' - ;; - esac - fi - ;; -esac - - - -gas_target=${cpu_type} -this_target=${generic_target} - canon_targets="" if test -n "$enable_targets" ; then for t in `echo $enable_targets | sed 's/,/ /g'`; do @@ -766,6 +714,8 @@ for this_target in $target $canon_targets ; do # check for architecture variants case ${cpu} in + armeb) cpu_type=arm endian=big ;; + arm*) cpu_type=arm endian=little ;; hppa*) cpu_type=hppa ;; i[45]86) cpu_type=i386 ;; m680[012346]0) cpu_type=m68k ;; @@ -990,6 +940,12 @@ for this_target in $target $canon_targets ; do # Other random stuff. + # do we need the opcodes library? + case ${cpu_type} in + alpha | vax) ;; + *) need_opcodes=yes ;; + esac + test -n "$want_sparc_v9" && cat >> confdefs.h <<\EOF #define SPARC_V9 1 EOF @@ -1287,22 +1243,44 @@ EOF need_bfd=yes ;; esac +# do we need the opcodes library? +case "${need_opcodes}" in + yes) + OPCODES_DEP=../opcodes/libopcodes.a + OPCODES_LIB='-L../opcodes -lopcodes' + + # We need to handle some special cases if opcodes was built shared. + if test "${shared}" = "true"; then + case "${host}" in + *-*-sunos*) + # On SunOS, we must link against the name we are going to install, + # not -lbfd, since SunOS does not support SONAME. + OPCODES_LIB='-L../opcodes -l`echo opcodes | sed '"'"'$(program_transform_name)'"'"'`' + ;; + esac + fi + ;; +esac + + + case "${need_bfd}" in - yes) BFDDEP=../bfd/libbfd.a - BFDLIB='-L../bfd -lbfd' - ALL_OBJ_DEPS="$ALL_OBJ_DEPS ../bfd/bfd.h" - - # We need to handle some special cases if BFD was built shared. - if test "${shared}" = "true"; then - case "${host}" in - *-*-sunos*) - # On SunOS, we must link against the name we are going to install, - # not -lbfd, since SunOS does not support SONAME. - BFDLIB='-L../bfd -l`echo bfd | sed '"'"'$(program_transform_name)'"'"'`' - ;; - esac - fi + yes) + BFDDEP=../bfd/libbfd.a + BFDLIB='-L../bfd -lbfd' + ALL_OBJ_DEPS="$ALL_OBJ_DEPS ../bfd/bfd.h" + + # We need to handle some special cases if BFD was built shared. + if test "${shared}" = "true"; then + case "${host}" in + *-*-sunos*) + # On SunOS, we must link against the name we are going to install, + # not -lbfd, since SunOS does not support SONAME. + BFDLIB='-L../bfd -l`echo bfd | sed '"'"'$(program_transform_name)'"'"'`' ;; + esac + fi + ;; esac @@ -1479,7 +1457,7 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error @@ -1493,7 +1471,7 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error @@ -1526,7 +1504,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -1578,7 +1556,7 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < int main() { return 0; } @@ -1634,7 +1612,7 @@ if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < #include @@ -2022,7 +2000,7 @@ if eval "test \"`echo '$''{'gas_cv_decl_needed_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext <