From dbf87f32ae756cd4efd33b05003929206169bda3 Mon Sep 17 00:00:00 2001 From: "J\"orn Rennecke" Date: Wed, 5 Jun 2002 19:52:07 +0000 Subject: [PATCH] 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 --- gcc/ChangeLog | 11 +++++++++++ gcc/config.gcc | 29 ++++++++++++++++++----------- gcc/config/sh/t-be | 1 + gcc/config/sh/t-le | 1 + gcc/config/sh/t-sh | 3 ++- gcc/config/sh/t-sh64 | 4 ++-- 6 files changed, 35 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2ece7300ea8..9fac44231aa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +Wed Jun 5 20:42:31 2002 J"orn Rennecke + + * 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 * toplev.h (report_error_function): Remove. diff --git a/gcc/config.gcc b/gcc/config.gcc index 3c1f9fe328c..e76e0a95882 100644 --- 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 849d5854a70..2e81cd97b61 100644 --- 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 b4b0dfa1abe..3c676f51b33 100644 --- 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 79528dd7d18..f3a3d74ed51 100644 --- 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 c3329893019..6fc1aed77a9 100644 --- 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= -- 2.30.2