config.gcc (sh5*-*-netbsd*): Remove sh/t-netbsd-sh5-32 from and add t-sh64 to ${tmake...

* config.gcc (sh5*-*-netbsd*): Remove sh/t-netbsd-sh5-32
from and add t-sh64 to ${tmake_file}.
(sh64*-*-netbsd*): Add t-sh64 to ${tmake_file}.
* config/sh/t-netbsd-sh5 (LIB1ASMFUNCS): Remove.
* config/sh/t-netbsd-sh5-32: Remove.
* config/sh/t-netbsd-sh5-64 (MULTILIB_OPTIONS): Use
MULTILIB_ENDIAN.
(MULTILIB_DIRNAMES): Define.

From-SVN: r54328

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d42f67447fc19cdd28278700a438d3284eb4aa19..cdd80e72f83acffd01c0986d705008df0f439a4a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2002-06-07  Jason Thorpe  <thorpej@wasabisystems.com>
+
+       * config.gcc (sh5*-*-netbsd*): Remove sh/t-netbsd-sh5-32
+       from and add t-sh64 to ${tmake_file}.
+       (sh64*-*-netbsd*): Add t-sh64 to ${tmake_file}.
+       * config/sh/t-netbsd-sh5 (LIB1ASMFUNCS): Remove.
+       * config/sh/t-netbsd-sh5-32: Remove.
+       * config/sh/t-netbsd-sh5-64 (MULTILIB_OPTIONS): Use
+       MULTILIB_ENDIAN.
+       (MULTILIB_DIRNAMES): Define.
+
 Thu Jun  6 23:14:46 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
        * i386.md (and promoting splitters): Disable QI to SImode promoting

diff --git a/gcc/config.gcc b/gcc/config.gcc
index e76e0a95882770f73634fc0162460ef0b1ca5a3c..a52740cdf3686d0b0b341d6fc2ae207259a86592 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2273,12 +2273,12 @@ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
        sh5*-*)
                # SHmedia, 32-bit ABI
                target_cpu_default="SH5_BIT|SH4_BIT|SH3E_BIT"
-               tmake_file="${tmake_file} sh/t-netbsd-sh5 sh/t-netbsd-sh5-32"
+               tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd-sh5"
                ;;
        sh64*-*)
                # SHmedia, 64-bit ABI
                target_cpu_default="SH5_BIT|SH4_BIT"
-               tmake_file="${tmake_file} sh/t-netbsd-sh5 sh/t-netbsd-sh5-64"
+               tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd-sh5 sh/t-netbsd-sh5-64"
                ;;
        *)
                # SH3, software floating point

diff --git a/gcc/config/sh/t-netbsd-sh5 b/gcc/config/sh/t-netbsd-sh5
index 3a2dd69d535a173d9da0389b9290e9a1019d96f2..61e6c53ce63a357a24677182bb17ef3280bba2f5 100644 (file)
--- a/gcc/config/sh/t-netbsd-sh5
+++ b/gcc/config/sh/t-netbsd-sh5
@@ -1,11 +1,5 @@
 TARGET_LIBGCC2_CFLAGS = -fpic
 
-LIB1ASMFUNCS = \
-  _sdivsi3 _sdivsi3_i4 _udivsi3 _udivsi3_i4 _set_fpscr \
-  _shcompact_call_trampoline _shcompact_return_trampoline \
-  _shcompact_incoming_args _ic_invalidate _nested_trampoline \
-  _push_pop_shmedia_regs
-
 LIB2FUNCS_EXTRA=
 
 EXTRA_MULTILIB_PARTS=

diff --git a/gcc/config/sh/t-netbsd-sh5-32 b/gcc/config/sh/t-netbsd-sh5-32
deleted file mode 100644 (file)
index 9586019..0000000
--- a/gcc/config/sh/t-netbsd-sh5-32
+++ /dev/null
@@ -1,3 +0,0 @@
-MULTILIB_OPTIONS += m5-32media-nofpu/m5-compact/m5-compact-nofpu/m5-64media/m5-64media-nofpu
-MULTILIB_DIRNAMES=
-MULTILIB_MATCHES =

diff --git a/gcc/config/sh/t-netbsd-sh5-64 b/gcc/config/sh/t-netbsd-sh5-64
index 74052cbe19799616f7a9a3c12ac2ee9c47ad95db..3555042ca8b809d049362de9c39f57b25bb4973e 100644 (file)
--- a/gcc/config/sh/t-netbsd-sh5-64
+++ b/gcc/config/sh/t-netbsd-sh5-64
@@ -1,3 +1,3 @@
-MULTILIB_OPTIONS += m5-64media-nofpu/m5-compact/m5-compact-nofpu/m5-32media/m5-32media-nofpu
-MULTILIB_DIRNAMES=
+MULTILIB_OPTIONS = $(MULTILIB_ENDIAN) m5-64media-nofpu/m5-compact/m5-compact-nofpu/m5-32media/m5-32media-nofpu
+MULTILIB_DIRNAMES= $(MULTILIB_ENDIAN) nofpu compact nofpu/compact media32 nofpu/media32
 MULTILIB_MATCHES =