diff --git a/bfd/.Sanitize b/bfd/.Sanitize index fb02228075..da60467bcf 100644 --- a/bfd/.Sanitize +++ b/bfd/.Sanitize @@ -31,14 +31,6 @@ else lose_these_too="${tic80_files} ${lose_these_too}" fi -sky_files="cpu-txvu.c elf32-txvu.c" - -if ( echo $* | grep keep\-sky > /dev/null ) ; then - keep_these_too="${sky_files} ${keep_these_too}" -else - lose_these_too="${sky_files} ${lose_these_too}" -fi - # All files listed between the "Things-to-keep:" line and the # "Files-to-sed:" line will be kept. All other files will be removed. # Directories listed in this section will have their own Sanitize @@ -578,7 +570,7 @@ else done fi -sky_files="ChangeLog Makefile.in Makefile.am archures.c elf.c reloc.c targets.c config.bfd configure.in configure bfd-in2.h libbfd.h" +sky_files="ChangeLog archures.c reloc.c cpu-mips.c config.bfd configure.in configure bfd-in2.h libbfd.h" if ( echo $* | grep keep\-sky > /dev/null ) ; then for i in $sky_files ; do if test ! -d $i && (grep sanitize-sky $i > /dev/null) ; then diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0dd61b966c..5e9326c816 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +start-sanitize-sky +Mon Dec 22 15:14:28 1997 Doug Evans + + * config.bfd, configure.in: Add dvp support. + * configure: Regenerate. + * aclocal.m4: Regenerate. + * archures.c, reloc.c, cpu-mips.c: Add dvp support. + * bfd-in2.h, libbfd.h, libcoff.h: Regenerate. + +end-sanitize-sky Wed Jan 28 13:41:26 1998 Ian Lance Taylor * elf.c (_bfd_elf_close_and_cleanup): Only check the strtab if we @@ -77,16 +87,6 @@ Wed Jan 21 21:16:06 1998 Manfred Hollstein * coff-m88k.c (GET_SCNDHR_NRELOC): Fix typo in macro name. (GET_SCNDHR_NLNNO): Likewise. -start-sanitize-sky -Tue Jan 20 15:08:44 1998 Doug Evans - - * reloc.c (BFD_RELOC_TXVU_11_PCREL): New reloc. - * bfd-in2.h: Regenerate. - * libbfd.h: Regenerate. - * elf32-txvu.c (txvu_elf_howto_table): Add entry for it. - (txvu_reloc_map): Likewise. - -end-sanitize-sky Mon Jan 19 12:49:52 1998 Ian Lance Taylor * cpu-sh.c (arch_info_struct): Correct next field of sh3e. @@ -144,19 +144,6 @@ Tue Dec 23 17:01:10 1997 Ian Lance Taylor shared. Set stab* sections to be shared and read. Set .rsrc section to be read and shared. -start-sanitize-sky -Mon Dec 22 15:14:28 1997 Doug Evans - - * Makefile.am (ALL_MACHINES,BFD32_BACKENDS): Add txvu support. - (cpu-txvu.lo,elf32-txvu.lo): Add rules for. - * Makefile.in: Rebuild. - * config.bfd, configure.in: Add txvu support. - * configure: Regenerate. - * archures.c, elf.c, targets.c: Add txvu support. - * bfd-in2.h: Regenerate. - * cpu-txvu.c, elf32-txvu.c: New files. - -end-sanitize-sky Mon Dec 22 13:20:57 1997 Ian Lance Taylor * Makefile.am: Rebuild dependencies. diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4 index 46ef3fed88..e37e2ad5cb 100644 --- a/bfd/aclocal.m4 +++ b/bfd/aclocal.m4 @@ -20,7 +20,25 @@ if test -z "$CC_FOR_BUILD"; then CC_FOR_BUILD=gcc fi fi -AC_SUBST(CC_FOR_BUILD)])dnl +AC_SUBST(CC_FOR_BUILD) +# Also set EXEEXT_FOR_BUILD. +if test "x$cross_compiling" = "xno"; then + EXEEXT_FOR_BUILD='$(EXEEXT)' +else + AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext, + [cat > ac_c_test.c << 'EOF' +int main() { +/* Nothing needed here */ +} +EOF + ${CC_FOR_BUILD} -o ac_c_test am_c_test.c 1>&5 2>&5 + bfd_cv_build_exeext=`echo ac_c_test.* | grep -v ac_c_test.c | sed -e s/ac_c_test//` + rm -f ac_c_test* + test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no]) + EXEEXT_FOR_BUILD="" + test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext} +fi +AC_SUBST(EXEEXT_FOR_BUILD)])dnl dnl See whether we need a declaration for a function. AC_DEFUN(BFD_NEED_DECLARATION, @@ -150,19 +168,26 @@ AC_REQUIRE([AM_PROG_LD]) AC_REQUIRE([AC_PROG_LN_S]) # Always use our own libtool. -LIBTOOL='$(top_builddir)/libtool' +LIBTOOL='$(SHELL) $(top_builddir)/libtool' AC_SUBST(LIBTOOL) +dnl CYGNUS LOCAL arguments to enable-shared dnl Allow the --disable-shared flag to stop us from building shared libs. AC_ARG_ENABLE(shared, [ --enable-shared build shared libraries [default=yes]], -[if test "$enableval" = no; then - enable_shared=no -else - enable_shared=yes -fi]) +[p=${PACKAGE-bogus-package-name} + case "$enableval" in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + # The value of $p (aka $PACKAGE) is assumed to come from AM_INIT_AUTOMAKE. + # If it didn't, it'll be `bogus-package-name', thus making this condition + # not be used. + *$p*) enable_shared=yes ;; + *) shared=no ;; +esac]) libtool_shared= test "$enable_shared" = no && libtool_shared=" --disable-shared" +dnl END CYGNUS LOCAL dnl Allow the --disable-static flag to stop us from building static libs. AC_ARG_ENABLE(static, @@ -221,10 +246,7 @@ else fi AC_CACHE_VAL(ac_cv_path_LD, [case "$LD" in - /*) - ac_cv_path_LD="$LD" # Let the user override the test with a path. - ;; - *) + "") IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -242,6 +264,9 @@ AC_CACHE_VAL(ac_cv_path_LD, done IFS="$ac_save_ifs" ;; + *) + ac_cv_path_LD="$LD" # Let the user override the test with a path. + ;; esac]) LD="$ac_cv_path_LD" if test -n "$LD"; then @@ -315,11 +340,9 @@ AC_DEFUN(AM_MAINTAINER_MODE, # Otherwise set it to "no". dnl AM_CYGWIN32() -dnl You might think we can do this by checking for a cygwin32-specific -dnl cpp define. AC_DEFUN(AM_CYGWIN32, [AC_CACHE_CHECK(for Cygwin32 environment, am_cv_cygwin32, -[AC_TRY_COMPILE(,[int main () { return __CYGWIN32__; }], +[AC_TRY_COMPILE(,[return __CYGWIN32__;], am_cv_cygwin32=yes, am_cv_cygwin32=no) rm -f conftest*]) CYGWIN32= @@ -334,10 +357,11 @@ dnl This knows we add .exe if we're building in the Cygwin32 dnl environment. But if we're not, then it compiles a test program dnl to see if there is a suffix for executables. AC_DEFUN(AM_EXEEXT, -dnl AC_REQUIRE([AC_PROG_CC])AC_REQUIRE([AM_CYGWIN32]) +[AC_REQUIRE([AM_CYGWIN32]) +AC_REQUIRE([AM_MINGW32]) AC_MSG_CHECKING([for executable suffix]) -[AC_CACHE_VAL(am_cv_exeext, -[if test "$CYGWIN32" = yes; then +AC_CACHE_VAL(am_cv_exeext,[ +if test "$CYGWIN32" = yes -o "$MINGW32" = yes; then am_cv_exeext=.exe else cat > am_c_test.c << 'EOF' @@ -346,7 +370,7 @@ int main() { } EOF ${CC-cc} -o am_c_test $CFLAGS $CPPFLAGS $LDFLAGS am_c_test.c $LIBS 1>&5 -am_cv_exeext=`ls am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//` +am_cv_exeext=`echo am_c_test.* | grep -v am_c_test.c | sed -e s/am_c_test//` rm -f am_c_test*]) test x"${am_cv_exeext}" = x && am_cv_exeext=no fi @@ -355,3 +379,16 @@ test x"${am_cv_exeext}" != xno && EXEEXT=${am_cv_exeext} AC_MSG_RESULT(${am_cv_exeext}) AC_SUBST(EXEEXT)]) +# Check to see if we're running under Mingw, without using +# AC_CANONICAL_*. If so, set output variable MINGW32 to "yes". +# Otherwise set it to "no". + +dnl AM_MINGW32() +AC_DEFUN(AM_MINGW32, +[AC_CACHE_CHECK(for Mingw32 environment, am_cv_mingw32, +[AC_TRY_COMPILE(,[return __MINGW32__;], +am_cv_mingw32=yes, am_cv_mingw32=no) +rm -f conftest*]) +MINGW32= +test "$am_cv_mingw32" = yes && MINGW32=yes]) + diff --git a/bfd/archures.c b/bfd/archures.c index f508cfd775..95ed1c4577 100644 --- a/bfd/archures.c +++ b/bfd/archures.c @@ -1,5 +1,5 @@ /* BFD library support routines for architectures. - Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. + Copyright (C) 1990, 91-97, 1998 Free Software Foundation, Inc. Hacked by John Gilmore and Steve Chamberlain of Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -102,6 +102,7 @@ DESCRIPTION .{* Nonzero if MACH has the v9 instruction set. *} .#define bfd_mach_sparc_v9_p(mach) \ . ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9a) +. bfd_arch_mips, {* MIPS Rxxxx *} . {* start-sanitize-tx19 *} .#define bfd_mach_mips1900 1900 . {* end-sanitize-tx19 *} @@ -128,7 +129,14 @@ DESCRIPTION .#define bfd_mach_mips8000 8000 .#define bfd_mach_mips10000 10000 .#define bfd_mach_mips16 16 -. bfd_arch_mips, {* MIPS Rxxxx *} +. {* start-sanitize-sky *} +. {* The DVP is a machine within the mips architecture. *} +.#define bfd_mach_dvp_dma 42000 +.#define bfd_mach_dvp_pke 42001 +.#define bfd_mach_dvp_vu 42002 +.#define bfd_mach_dvp_gpuif 42003 +.#define bfd_mach_dvp_p(mach) ((mach) >= 42000 && (mach) <= 42003) +. {* end-sanitize-sky *} . bfd_arch_i386, {* Intel 386 *} .#define bfd_mach_i386_i386 0 .#define bfd_mach_i386_i8086 1 @@ -175,10 +183,6 @@ DESCRIPTION . {* start-sanitize-tic80 *} . bfd_arch_tic80, {* TI TMS320c80 (MVP) *} . {* end-sanitize-tic80 *} -. {* start-sanitize-sky *} -. bfd_arch_txvu, {* TX VU *} -.#define bfd_mach_txvu 0 -. {* end-sanitize-sky *} . bfd_arch_v850, {* NEC V850 *} .#define bfd_mach_v850 0 . {* start-sanitize-v850e *} diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 32e6eb6bbc..640ab4f494 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -1194,6 +1194,7 @@ enum bfd_architecture /* Nonzero if MACH has the v9 instruction set. */ #define bfd_mach_sparc_v9_p(mach) \ ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9a) + bfd_arch_mips, /* MIPS Rxxxx */ /* start-sanitize-tx19 */ #define bfd_mach_mips1900 1900 /* end-sanitize-tx19 */ @@ -1220,7 +1221,14 @@ enum bfd_architecture #define bfd_mach_mips8000 8000 #define bfd_mach_mips10000 10000 #define bfd_mach_mips16 16 - bfd_arch_mips, /* MIPS Rxxxx */ + /* start-sanitize-sky */ + /* The DVP is a machine within the mips architecture. */ +#define bfd_mach_dvp_dma 42000 +#define bfd_mach_dvp_pke 42001 +#define bfd_mach_dvp_vu 42002 +#define bfd_mach_dvp_gpuif 42003 +#define bfd_mach_dvp_p(mach) ((mach) >= 42000 && (mach) <= 42003) + /* end-sanitize-sky */ bfd_arch_i386, /* Intel 386 */ #define bfd_mach_i386_i386 0 #define bfd_mach_i386_i8086 1 @@ -1267,10 +1275,6 @@ enum bfd_architecture /* start-sanitize-tic80 */ bfd_arch_tic80, /* TI TMS320c80 (MVP) */ /* end-sanitize-tic80 */ - /* start-sanitize-sky */ - bfd_arch_txvu, /* TX VU */ -#define bfd_mach_txvu 0 - /* end-sanitize-sky */ bfd_arch_v850, /* NEC V850 */ #define bfd_mach_v850 0 /* start-sanitize-v850e */ @@ -1784,6 +1788,14 @@ to compensate for the borrow when the low bits are added. */ BFD_RELOC_MIPS_GOT_LO16, BFD_RELOC_MIPS_CALL_HI16, BFD_RELOC_MIPS_CALL_LO16, +/* start-sanitize-sky */ + +/* MIPS DVP Relocations. +This is an 11-bit pc relative reloc. The recorded address is for the +lower instruction word, and the value is in 128 bit units. */ + BFD_RELOC_MIPS_DVP_11_PCREL, +/* end-sanitize-sky */ + /* i386/elf relocations */ BFD_RELOC_386_GOT32, @@ -2071,14 +2083,6 @@ instruction. */ /* This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the instruction. */ BFD_RELOC_MN10300_16_PCREL, -/* start-sanitize-sky */ - -/* SKY TXVU Relocations. -This is an 11-bit pc relative reloc. The recorded address is for the -lower instruction word. */ - BFD_RELOC_TXVU_11_PCREL, -/* end-sanitize-sky */ - BFD_RELOC_UNUSED }; typedef enum bfd_reloc_code_real bfd_reloc_code_real_type; reloc_howto_type * diff --git a/bfd/config.bfd b/bfd/config.bfd index f7ef94984a..5e6f765ba6 100755 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -559,8 +559,9 @@ case "${targ}" in # end-sanitize-tic80 # start-sanitize-sky - txvu-*-*) - targ_defvec=bfd_elf32_txvu_vec + dvp-*-*) + targ_defvec=bfd_elf32_littlemips_vec + targ_selvecs=bfd_elf64_littlemips_vec ;; # end-sanitize-sky diff --git a/bfd/configure b/bfd/configure index 34203e4625..03996853f7 100755 --- a/bfd/configure +++ b/bfd/configure @@ -1287,16 +1287,20 @@ fi # Always use our own libtool. -LIBTOOL='$(top_builddir)/libtool' +LIBTOOL='$(SHELL) $(top_builddir)/libtool' # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" - case "$enableval" in + p=${PACKAGE-bogus-package-name} + case "$enableval" in yes) enable_shared=yes ;; no) enable_shared=no ;; - *bfd*) enable_shared=yes ;; + # The value of $p (aka $PACKAGE) is assumed to come from AM_INIT_AUTOMAKE. + # If it didn't, it'll be `bogus-package-name', thus making this condition + # not be used. + *$p*) enable_shared=yes ;; *) shared=no ;; esac fi @@ -1421,7 +1425,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1425: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1429: 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" @@ -1439,19 +1443,19 @@ fi echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:1443: checking for Cygwin32 environment" >&5 +echo "configure:1447: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_cygwin32=yes else @@ -1468,19 +1472,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:1472: checking for Mingw32 environment" >&5 +echo "configure:1476: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_mingw32=yes else @@ -1499,7 +1503,7 @@ test "$am_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1503: checking for executable suffix" >&5 +echo "configure:1507: checking for executable suffix" >&5 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1532,7 +1536,7 @@ target64=false # 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:1536: checking for $ac_word" >&5 +echo "configure:1540: 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 @@ -1561,7 +1565,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:1565: checking for $ac_word" >&5 +echo "configure:1569: 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 @@ -1609,7 +1613,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1613: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1617: 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. @@ -1619,11 +1623,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 <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1631: \"$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 @@ -1643,12 +1647,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:1647: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1651: 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:1652: checking whether we are using GNU C" >&5 +echo "configure:1656: 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 @@ -1657,7 +1661,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1661: \"$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:1665: \"$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 @@ -1672,7 +1676,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:1676: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1680: 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 @@ -1738,7 +1742,7 @@ if test "x$cross_compiling" = "xno"; then EXEEXT_FOR_BUILD='$(EXEEXT)' else echo $ac_n "checking for build system executable suffix""... $ac_c" 1>&6 -echo "configure:1742: checking for build system executable suffix" >&5 +echo "configure:1746: checking for build system executable suffix" >&5 if eval "test \"`echo '$''{'bfd_cv_build_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1760,7 +1764,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1764: checking how to run the C preprocessor" >&5 +echo "configure:1768: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1775,13 +1779,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1792,13 +1796,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1824,17 +1828,17 @@ for ac_hdr in stddef.h string.h strings.h stdlib.h time.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1828: checking for $ac_hdr" >&5 +echo "configure:1832: checking for $ac_hdr" >&5 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1864,17 +1868,17 @@ for ac_hdr in fcntl.h sys/file.h sys/time.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1868: checking for $ac_hdr" >&5 +echo "configure:1872: checking for $ac_hdr" >&5 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1901,12 +1905,12 @@ fi done echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1905: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1909: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1915,7 +1919,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1923: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1938,12 +1942,12 @@ fi for ac_func in fcntl getpagesize setitimer sysconf fdopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1942: checking for $ac_func" >&5 +echo "configure:1946: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2001,12 +2005,12 @@ EOF esac echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6 -echo "configure:2005: checking whether strstr must be declared" >&5 +echo "configure:2009: checking whether strstr must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2027,7 +2031,7 @@ int main() { char *(*pfn) = (char *(*)) strstr ; return 0; } EOF -if { (eval echo configure:2031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_strstr=no else @@ -2049,12 +2053,12 @@ EOF fi echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6 -echo "configure:2053: checking whether malloc must be declared" >&5 +echo "configure:2057: checking whether malloc must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2075,7 +2079,7 @@ int main() { char *(*pfn) = (char *(*)) malloc ; return 0; } EOF -if { (eval echo configure:2079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_malloc=no else @@ -2097,12 +2101,12 @@ EOF fi echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6 -echo "configure:2101: checking whether realloc must be declared" >&5 +echo "configure:2105: checking whether realloc must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2123,7 +2127,7 @@ int main() { char *(*pfn) = (char *(*)) realloc ; return 0; } EOF -if { (eval echo configure:2127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_realloc=no else @@ -2145,12 +2149,12 @@ EOF fi echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6 -echo "configure:2149: checking whether free must be declared" >&5 +echo "configure:2153: checking whether free must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2171,7 +2175,7 @@ int main() { char *(*pfn) = (char *(*)) free ; return 0; } EOF -if { (eval echo configure:2175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_free=no else @@ -2193,12 +2197,12 @@ EOF fi echo $ac_n "checking whether getenv must be declared""... $ac_c" 1>&6 -echo "configure:2197: checking whether getenv must be declared" >&5 +echo "configure:2201: checking whether getenv must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_getenv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2219,7 +2223,7 @@ int main() { char *(*pfn) = (char *(*)) getenv ; return 0; } EOF -if { (eval echo configure:2223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_getenv=no else @@ -2498,19 +2502,19 @@ EOF # Define HAVE_SYS_PROCFS_H if the file exists and defines # prstatus_t. echo $ac_n "checking for sys/procfs.h""... $ac_c" 1>&6 -echo "configure:2502: checking for sys/procfs.h" >&5 +echo "configure:2506: checking for sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_header_sys_procfs_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { prstatus_t t; ; return 0; } EOF -if { (eval echo configure:2514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_header_sys_procfs_h=yes else @@ -2588,6 +2592,11 @@ for i in $selvecs ; do done selvecs="$f" +# start-sanitize-sky +# dvp is really mips, but we need to distinguish it from mips for opcodes +selarchs=`echo $selarchs | sed -e s/dvp/mips/g` +# end-sanitize-sky + # uniq the architectures in all the configured targets. f="" for i in $selarchs ; do @@ -2653,9 +2662,6 @@ do bfd_elf32_sh_vec) tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;; bfd_elf32_shl_vec) tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;; bfd_elf32_sparc_vec) tb="$tb elf32-sparc.lo elf32.lo $elf" ;; -# start-sanitize-sky - bfd_elf32_txvu_vec) tb="$tb elf32-txvu.lo elf32.lo $elf" ;; -# end-sanitize-sky bfd_elf32_v850_vec) tb="$tb elf32-v850.lo elf32.lo $elf" ;; bfd_elf64_big_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf" target64=true ;; @@ -2827,17 +2833,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2831: checking for $ac_hdr" >&5 +echo "configure:2837: checking for $ac_hdr" >&5 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2866,12 +2872,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2870: checking for $ac_func" >&5 +echo "configure:2876: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2919,7 +2925,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2923: checking for working mmap" >&5 +echo "configure:2929: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2927,7 +2933,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -3092,12 +3098,12 @@ fi for ac_func in madvise mprotect do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3096: checking for $ac_func" >&5 +echo "configure:3102: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff --git a/bfd/configure.in b/bfd/configure.in index cff26613a5..33d2ac8038 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -366,6 +366,11 @@ for i in $selvecs ; do done selvecs="$f" +# start-sanitize-sky +# dvp is really mips, but we need to distinguish it from mips for opcodes +selarchs=`echo $selarchs | sed -e s/dvp/mips/g` +# end-sanitize-sky + # uniq the architectures in all the configured targets. f="" for i in $selarchs ; do @@ -431,9 +436,6 @@ do bfd_elf32_sh_vec) tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;; bfd_elf32_shl_vec) tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;; bfd_elf32_sparc_vec) tb="$tb elf32-sparc.lo elf32.lo $elf" ;; -# start-sanitize-sky - bfd_elf32_txvu_vec) tb="$tb elf32-txvu.lo elf32.lo $elf" ;; -# end-sanitize-sky bfd_elf32_v850_vec) tb="$tb elf32-v850.lo elf32.lo $elf" ;; bfd_elf64_big_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf" target64=true ;; diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c index 1ece3d41c9..88ea9948d6 100644 --- a/bfd/cpu-mips.c +++ b/bfd/cpu-mips.c @@ -1,5 +1,5 @@ /* bfd back-end for mips support - Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. + Copyright (C) 1990, 91-96, 1998 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -80,6 +80,15 @@ static const bfd_arch_info_type arch_info_struct[] = #define D 1 N (64, 64, bfd_mach_mips5900, "mips:5900", false, &arch_info_struct[13+A+B+C+D]), /* end-sanitize-r5900 */ + /* start-sanitize-sky */ +#undef E +#define E (A+B+C+D) + N (32, 32, bfd_mach_dvp_dma, "dvp:dma", false, &arch_info_struct[13+E+1]), + N (32, 32, bfd_mach_dvp_pke, "dvp:pke", false, &arch_info_struct[13+E+2]), + N (32, 32, bfd_mach_dvp_vu, "dvp:vu", false, &arch_info_struct[13+E+3]), + N (32, 32, bfd_mach_dvp_gpuif, "dvp:gpuif", false, &arch_info_struct[13+E+4]), + /* end-sanitize-sky */ + N (64, 64, bfd_mach_mips16, "mips:16", false, 0), }; diff --git a/bfd/libbfd.h b/bfd/libbfd.h index c063c51dca..11bfcee4a3 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -665,6 +665,10 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_MIPS_GOT_LO16", "BFD_RELOC_MIPS_CALL_HI16", "BFD_RELOC_MIPS_CALL_LO16", +/* start-sanitize-sky */ + "BFD_RELOC_MIPS_DVP_11_PCREL", +/* end-sanitize-sky */ + "BFD_RELOC_386_GOT32", "BFD_RELOC_386_PLT32", "BFD_RELOC_386_COPY", @@ -804,10 +808,6 @@ static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@", "BFD_RELOC_MN10300_32_PCREL", "BFD_RELOC_MN10300_16_PCREL", -/* start-sanitize-sky */ - "BFD_RELOC_TXVU_11_PCREL", -/* end-sanitize-sky */ - "@@overflow: BFD_RELOC_UNUSED@@", }; #endif diff --git a/bfd/reloc.c b/bfd/reloc.c index dbaef89ca8..ce6e2bba98 100644 --- a/bfd/reloc.c +++ b/bfd/reloc.c @@ -1,5 +1,5 @@ /* BFD support for handling relocation entries. - Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997 + Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc. Written by Cygnus Support. @@ -2010,6 +2010,17 @@ ENUMX ENUMDOC MIPS ELF relocations. +COMMENT +{* start-sanitize-sky *} +ENUM + BFD_RELOC_MIPS_DVP_11_PCREL +ENUMDOC + MIPS DVP Relocations. + This is an 11-bit pc relative reloc. The recorded address is for the + lower instruction word, and the value is in 128 bit units. +COMMENT +{* end-sanitize-sky *} + ENUM BFD_RELOC_386_GOT32 ENUMX @@ -2446,17 +2457,6 @@ ENUMDOC This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the instruction. -COMMENT -{* start-sanitize-sky *} -ENUM - BFD_RELOC_TXVU_11_PCREL -ENUMDOC - SKY TXVU Relocations. - This is an 11-bit pc relative reloc. The recorded address is for the - lower instruction word. -COMMENT -{* end-sanitize-sky *} - ENDSENUM BFD_RELOC_UNUSED CODE_FRAGMENT diff --git a/bfd/targets.c b/bfd/targets.c index 687ff9a77d..069a8b746d 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -508,9 +508,6 @@ extern const bfd_target bfd_elf32_powerpcle_vec; extern const bfd_target bfd_elf32_sh_vec; extern const bfd_target bfd_elf32_shl_vec; extern const bfd_target bfd_elf32_sparc_vec; -/* start-sanitize-sky */ -extern const bfd_target bfd_elf32_txvu_vec; -/* end-sanitize-sky */ extern const bfd_target bfd_elf32_v850_vec; extern const bfd_target bfd_elf64_big_generic_vec; extern const bfd_target bfd_elf64_little_generic_vec; @@ -675,9 +672,6 @@ const bfd_target * const bfd_target_vector[] = { &bfd_elf32_m88k_vec, &bfd_elf32_sparc_vec, &bfd_elf32_powerpc_vec, -/* start-sanitize-sky */ - &bfd_elf32_txvu_vec, -/* end-sanitize-sky */ &bfd_elf32_v850_vec, #ifdef BFD64 /* No one seems to use this. */ &bfd_elf64_big_generic_vec,