Re: --enable-targets=all breakage

["H . J . Lu" <hjl at lucon dot org>]

On Tue, Jun 04, 2002 at 10:02:22AM -0700, Jason R Thorpe wrote:
> On Tue, Jun 04, 2002 at 04:36:08PM +0930, Alan Modra wrote:
> 
>  > That should work.  The other approach is to carve up elf32-sh64.c
>  > appropriately.
> 
> If I were to carve it up, where would you suggest that sh64_get_contents_type
> and sh64_address_is_shmedia be moved to?
> 

Can you try this? I have no way to verify it.


H.J.
----
2002-06-04  H.J. Lu  (hjl@gnu.org)

	* Makefile.am (BFD32_BACKENDS): Remove elf32-sh64-nbsd.lo.
	(BFD32_BACKENDS_CFILES): Remove elf32-sh64-nbsd.c.
	(BFD64_BACKENDS): Remove elf64-sh64-nbsd.lo.
	(BFD64_BACKENDS_CFILES): Remove elf64-sh64-nbsd.c.
	(elf32-sh64-nbsd.lo, elf64-sh64-nbsd.lo): Removed.
	* Makefile.in: Regenerated.
	* elf32-sh64-nbsd.c: Removed.
	* elf64-sh64-nbsd.c: Removed.

	* elf32-sh64.c: Add elf32-sh64-nbsd.
	* elf64-sh64.c: Add elf64-sh64-nbsd.

--- bfd/Makefile.am.netbsd	Tue Jun  4 09:25:20 2002
+++ bfd/Makefile.am	Tue Jun  4 10:02:47 2002
@@ -230,7 +230,6 @@ BFD32_BACKENDS = \
 	elf32-sh-lin.lo \
 	elf32-sh64.lo \
 	elf32-sh-nbsd.lo \
-	elf32-sh64-nbsd.lo \
 	elf32-sparc.lo \
 	elf32-v850.lo \
 	elf32-vax.lo \
@@ -382,7 +381,6 @@ BFD32_BACKENDS_CFILES = \
 	elf32-sh.c \
 	elf32-sh-lin.c \
 	elf32-sh-nbsd.c \
-	elf32-sh64-nbsd.c \
 	elf32-sparc.c \
 	elf32-v850.c \
 	elf32-vax.c \
@@ -469,7 +467,6 @@ BFD64_BACKENDS = \
 	elf64-mips.lo \
 	elf64-mmix.lo \
 	elf64-sh64.lo \
-	elf64-sh64-nbsd.lo \
 	elf64-ppc.lo \
 	elf64-s390.lo \
 	elf64-sparc.lo \
@@ -495,7 +492,6 @@ BFD64_BACKENDS_CFILES = \
 	elf64-ppc.c \
 	elf64-s390.c \
 	elf64-sh64.c \
-	elf64-sh64-nbsd.c \
 	elf64-sparc.c \
 	elf64.c \
 	mmo.c \
@@ -1197,11 +1193,6 @@ elf32-sh64.lo: elf32-sh64.c $(INCDIR)/fi
   $(INCDIR)/bfdlink.h $(srcdir)/../opcodes/sh64-opc.h \
   elf32-sh.c $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \
   elf32-target.h
-elf32-sh64-nbsd.lo: elf32-sh64-nbsd.c $(INCDIR)/filenames.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/bfdlink.h $(srcdir)/../opcodes/sh64-opc.h \
-  elf32-sh64.c elf32-sh.c $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-target.h
 elf32-s390.lo: elf32-s390.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/s390.h $(INCDIR)/elf/reloc-macros.h \
@@ -1491,10 +1482,6 @@ elf64-sh64.lo: elf64-sh64.c $(INCDIR)/fi
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \
   elf64-target.h
-elf64-sh64-nbsd.lo: elf64-sh64-nbsd.c $(INCDIR)/filenames.h \
-  $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/elf/sh.h \
-  $(INCDIR)/elf/reloc-macros.h elf64-sh64.c elf64-target.h
 elf64-sparc.lo: elf64-sparc.c $(INCDIR)/filenames.h \
   elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
   $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h $(INCDIR)/opcode/sparc.h \
--- bfd/elf32-sh64.c.netbsd	Tue Jun  4 09:25:34 2002
+++ bfd/elf32-sh64.c	Tue Jun  4 10:01:28 2002
@@ -983,3 +983,13 @@ sh64_address_is_shmedia (sec, addr)
   sh64_elf_crange dummy;
   return sh64_get_contents_type (sec, addr, &dummy) == CRT_SH5_ISA32;
 }
+
+#define TARGET_BIG_SYM		bfd_elf32_sh64nbsd_vec
+#define TARGET_BIG_NAME		"elf32-sh64-nbsd"
+#define TARGET_LITTLE_SYM	bfd_elf32_sh64lnbsd_vec
+#define TARGET_LITTLE_NAME	"elf32-sh64l-nbsd"
+#define ELF_MAXPAGESIZE		0x10000
+#define elf_symbol_leading_char	0
+
+#define INCLUDED_TARGET_FILE 1
+#include "elf32-target.h"
--- bfd/elf64-sh64.c.netbsd	Tue Jun  4 09:25:40 2002
+++ bfd/elf64-sh64.c	Tue Jun  4 10:01:02 2002
@@ -4206,3 +4206,13 @@ sh64_elf64_finish_dynamic_sections (outp
 #define elf_backend_plt_header_size	PLT_ENTRY_SIZE
 
 #include "elf64-target.h"
+
+#define TARGET_BIG_SYM			bfd_elf64_sh64nbsd_vec
+#define TARGET_BIG_NAME			"elf64-sh64-nbsd"
+#define TARGET_LITTLE_SYM		bfd_elf64_sh64lnbsd_vec
+#define TARGET_LITTLE_NAME		"elf64-sh64l-nbsd"
+#define ELF_MAXPAGESIZE			0x10000
+#define elf_symbol_leading_char		0
+
+#define INCLUDED_TARGET_FILE 1
+#include "elf64-target.h"