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

* 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

gcc/ChangeLog

+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

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

gcc/config/sh/t-netbsd-sh5

 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=

gcc/config/sh/t-netbsd-sh5-32

-MULTILIB_OPTIONS += m5-32media-nofpu/m5-compact/m5-compact-nofpu/m5-64media/m5-64media-nofpu
-MULTILIB_DIRNAMES=
-MULTILIB_MATCHES =

gcc/config/sh/t-netbsd-sh5-64

-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 =