config.gcc (sh-*-elf*, [...]): Unify.

gcc:
	* config.gcc (sh-*-elf*,  sh64*-*-elf*): Unify.
	(shl*-*-elf*): Add.
	* config/sh/t-be (MULTILIB_ENDIAN): Set.
	* config/sh/t-le (MULTILIB_ENDIAN): Likewise.
	* t-sh (MULTILIB_ENDIAN): Set.
	(MULTILIB_OPTIONS): Use it.
	* t-sh64 (MULTILIB_OPTIONS): Likewise.
	(MULTILIB_DIRNAMES): Likewise.
bfd:
	* config.bfd (sh64l*-*-elf*, shl*-*-elf*): New configurations.
ld:
	configure.tgt (shle*-*-elf*, sh64le-*-elf*): New configurations.

From-SVN: r54292

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2ece7300ea8b5b3509d22a2117e3460a57274dba..9fac44231aad9efc20528cec19c210239297ab7c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+Wed Jun  5 20:42:31 2002  J"orn Rennecke <joern.rennecke@superh.com>
+
+       * config.gcc (sh-*-elf*,  sh64*-*-elf*): Unify.
+       (shl*-*-elf*): Add.
+       * config/sh/t-be (MULTILIB_ENDIAN): Set.
+       * config/sh/t-le (MULTILIB_ENDIAN): Likewise.
+       * t-sh (MULTILIB_ENDIAN): Set.
+       (MULTILIB_OPTIONS): Use it.
+       * t-sh64 (MULTILIB_OPTIONS): Likewise.
+       (MULTILIB_DIRNAMES): Likewise.
+
 2002-06-05  Gabriel Dos Reis  <gdr@codesourcery.com>
 
        * toplev.h (report_error_function): Remove.

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 3c1f9fe328c81f92b7ec88d626d3ccb311f50d64..e76e0a95882770f73634fc0162460ef0b1ca5a3c 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2207,20 +2207,27 @@ s390x-*-linux*)
                thread_file='posix'
        fi
        ;;
-sh-*-elf*)
+sh-*-elf* | shl*-*-elf* | sh64*-*-elf*)
        tmake_file="sh/t-sh sh/t-elf"
+       case $machine in
+       shl* | sh64l*)
+               tm_file="sh/little.h ${tm_file}"
+               tmake_file="${tmake_file} sh/t-le"
+               ;;
+       esac
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h"
        float_format=sh
-       ;;
-sh64-*-elf*)
-       tmake_file="sh/t-sh sh/t-elf sh/t-sh64"
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h sh/sh64.h"
-       float_format=sh
-       extra_headers="shmedia.h ushmedia.h sshmedia.h"
-       # Not strictly necessary to check this, but a good idea anyway.
-       if test $machine = $target; then
-               target_requires_64bit_host_wide_int=yes
-       fi
+       case $machine in
+       sh64*)
+               tmake_file="${tmake_file} sh/t-sh64"
+               tm_file="${tm_file} sh/sh64.h"
+               extra_headers="shmedia.h ushmedia.h sshmedia.h"
+               # Not strictly necessary to check this, but a good idea anyway.
+               if test $machine = $target; then
+                       target_requires_64bit_host_wide_int=yes
+               fi
+               ;;
+       esac
        ;;
 sh-*-rtemself*)
        xm_defines=POSIX

diff --git a/gcc/config/sh/t-be b/gcc/config/sh/t-be
index 849d5854a705548e558d7dc5e15c6a88ac2bea03..2e81cd97b6189999e0c1930c5c90749804db46f3 100644 (file)
--- a/gcc/config/sh/t-be
+++ b/gcc/config/sh/t-be
@@ -1 +1,2 @@
 MULTILIB_OPTIONS= ml
+MULTILIB_ENDIAN = ml

diff --git a/gcc/config/sh/t-le b/gcc/config/sh/t-le
index b4b0dfa1abe5234a4f3a69ec72301dd23a59b6a1..3c676f51b3341b61d86ea47bfa2d2715d3ab8bbb 100644 (file)
--- a/gcc/config/sh/t-le
+++ b/gcc/config/sh/t-le
@@ -1 +1,2 @@
 MULTILIB_OPTIONS= mb
+MULTILIB_ENDIAN = mb

diff --git a/gcc/config/sh/t-sh b/gcc/config/sh/t-sh
index 79528dd7d18a9c88b951319bf855e8332457a5ef..f3a3d74ed519aeb749abdcf8c171576d5fd91cd3 100644 (file)
--- a/gcc/config/sh/t-sh
+++ b/gcc/config/sh/t-sh
@@ -30,7 +30,8 @@ fp-bit.c: $(srcdir)/config/fp-bit.c
        echo '#endif'           >> fp-bit.c
        cat $(srcdir)/config/fp-bit.c >> fp-bit.c
 
-MULTILIB_OPTIONS= ml m2/m3e/m4-single-only/m4-single/m4
+MULTILIB_ENDIAN = ml
+MULTILIB_OPTIONS= $(MULTILIB_ENDIAN) m2/m3e/m4-single-only/m4-single/m4
 MULTILIB_DIRNAMES= 
 MULTILIB_MATCHES = m2=m3 m2=m4-nofpu
 

diff --git a/gcc/config/sh/t-sh64 b/gcc/config/sh/t-sh64
index c3329893019f097f215df26d965f765f594f2e1e..6fc1aed77a9f138b1e12eca14c1127db114fb741 100644 (file)
--- a/gcc/config/sh/t-sh64
+++ b/gcc/config/sh/t-sh64
@@ -6,6 +6,6 @@ LIB1ASMFUNCS = \
   _shcompact_incoming_args _ic_invalidate _nested_trampoline \
   _push_pop_shmedia_regs
 
-MULTILIB_OPTIONS= ml m5-32media-nofpu/m5-compact/m5-compact-nofpu/m5-64media/m5-64media-nofpu
-MULTILIB_DIRNAMES= ml nofpu compact nofpu/compact media64 nofpu/media64
+MULTILIB_OPTIONS = $(MULTILIB_ENDIAN) m5-32media-nofpu/m5-compact/m5-compact-nofpu/m5-64media/m5-64media-nofpu
+MULTILIB_DIRNAMES= $(MULTILIB_ENDIAN) nofpu compact nofpu/compact media64 nofpu/media64
 MULTILIB_MATCHES=