From 4b363073298671c9a2a096d2ba70dd7586315c4c Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 13 May 2004 14:12:27 +0000 Subject: [PATCH] Change or32-rtems target from COFF to ELF format --- bfd/ChangeLog | 4 +++ bfd/config.bfd | 4 +-- gas/ChangeLog | 5 +++ gas/configure | 84 ++++++++++++------------------------------------ gas/configure.in | 2 +- ld/ChangeLog | 5 +++ ld/configure.tgt | 2 +- 7 files changed, 39 insertions(+), 67 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0976e40bf62..7465e468115 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2004-05-13 Joel Sherrill + + * config.bfd (or32-*-rtems*): Switch to elf. + 2004-05-13 Nick Clifton * po/fr.po: Updated French translation. diff --git a/bfd/config.bfd b/bfd/config.bfd index 41f1268fe97..87071825cc6 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -883,12 +883,12 @@ case "${targ}" in targ_defvec=bfd_elf32_openrisc_vec ;; - or32-*-coff | or32-*-rtems*) + or32-*-coff) targ_defvec=or32coff_big_vec targ_underscore=yes ;; - or32-*-elf) + or32-*-elf | or32-*-rtems*) targ_defvec=bfd_elf32_or32_big_vec ;; diff --git a/gas/ChangeLog b/gas/ChangeLog index 5aa0bb6f87c..93b930d6424 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2004-05-13 Joel Sherrill + + * configure.in (or32-*-rtems*): Switch to elf. + * configure: Regenerate. + 2004-05-13 Nick Clifton * po/fr.po: Updated French translation. diff --git a/gas/configure b/gas/configure index 7028326dba9..05fa1958fbb 100755 --- a/gas/configure +++ b/gas/configure @@ -2636,7 +2636,7 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -if mkdir -p -- . 2>/dev/null; then +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then # Keeping the `.' argument allows $(mkdir_p) to be used without # argument. Indeed, we sometimes output rules like # $(mkdir_p) $(somedir) @@ -2649,7 +2649,7 @@ else # recognize any option. It will interpret all options as # directories to create, and then abort because `.' already # exists. - for d in ./-p ./--; + for d in ./-p ./--version; do test -d $d && rmdir $d done @@ -2990,7 +2990,9 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -3018,9 +3020,14 @@ else grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -3321,7 +3328,6 @@ cygwin* | mingw* |pw32*) ;; darwin* | rhapsody*) - # this will be overwritten by pass_all, but leave it in just in case lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' lt_cv_file_magic_cmd='/usr/bin/file -L' case "$host_os" in @@ -3332,10 +3338,9 @@ darwin* | rhapsody*) lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' ;; esac - lt_cv_deplibs_check_method=pass_all ;; -freebsd* | kfreebsd*-gnu) +freebsd* ) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -3403,7 +3408,7 @@ linux-gnu*) lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; -netbsd* | knetbsd*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' else @@ -3794,7 +3799,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3797 "configure"' > conftest.$ac_ext + echo '#line 3802 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -3849,52 +3854,6 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" @@ -4490,7 +4449,7 @@ echo "$as_me: error: Unknown vendor for mips-bsd configuration." >&2;} mn10300-*-*) fmt=elf ;; msp430-*-*) fmt=elf ;; openrisc-*-*) fmt=elf ;; - or32-*-rtems*) fmt=coff ;; + or32-*-rtems*) fmt=elf ;; or32-*-coff) fmt=coff ;; or32-*-elf) fmt=elf ;; pj*) fmt=elf ;; @@ -10259,9 +10218,8 @@ case "${need_libm}" in yes) LIBM= case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cygwin* | *-*-pw32*) # These system don't have libm - # on darwin the libm is a symbolic link to libSystem.dylib ;; *-ncr-sysv4.3*) echo "$as_me:$LINENO: checking for _mwvalidcheckl in -lmw" >&5 @@ -12352,14 +12310,14 @@ echo X"$mf" | grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue # Extract the definition of DEP_FILES from the Makefile without # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` + U=`sed -n 's/^U = //p' < "$mf"` test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" # We invoke sed twice because it is the simplest approach to # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' + for file in `sed -n ' /^DEP_FILES = .*\\\\$/ { s/^DEP_FILES = // :loop diff --git a/gas/configure.in b/gas/configure.in index ab3b18a2d0f..1812b10828a 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -401,7 +401,7 @@ changequote([,])dnl mn10300-*-*) fmt=elf ;; msp430-*-*) fmt=elf ;; openrisc-*-*) fmt=elf ;; - or32-*-rtems*) fmt=coff ;; + or32-*-rtems*) fmt=elf ;; or32-*-coff) fmt=coff ;; or32-*-elf) fmt=elf ;; pj*) fmt=elf ;; diff --git a/ld/ChangeLog b/ld/ChangeLog index 4321ca59239..fb0159de53f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2004-05-13 Joel Sherrill + + * configure.tgt (or32-*-rtems*): Switch to elf and + support versioned targets. + 2004-05-13 Nick Clifton * po/fr.po: Updated French translation. diff --git a/ld/configure.tgt b/ld/configure.tgt index 772f8ad815c..cd4274c4067 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -473,7 +473,7 @@ ns32k-*-netbsd* | ns32k-pc532-lites*) targ_emul=ns32knbsd ;; openrisc-*-*) targ_emul=elf32openrisc ;; or32-*-coff) targ_emul=or32 ;; or32-*-elf) targ_emul=or32elf ;; -or32-*-rtems) targ_emul=or32 ;; +or32-*-rtems*) targ_emul=or32elf ;; pdp11-*-*) targ_emul=pdp11 ;; pjl*-*-*) targ_emul=pjlelf ; targ_extra_emuls="elf_i386" ;; pj*-*-*) targ_emul=pjelf ;; -- 2.30.2