Set machine number based in bits in e_flags field rather than magic number.

3 files changed, 159 insertions, 25 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 0c0ba76..b255e27 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,20 @@
+Tue Sep  2 17:45:22 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf32-v850.c (v850_elf_object_p): Set machine number based on
+	bits in e_flags field rather than magic numbers.
+	(v850_elf_final_write_processing, v850_elf_set_private_flags,
+	v850_elf_copy_private_bfd_data, v850_elf_merge_private_bfd_data,
+	v850_elf_print_private_bfd_data): New functions.
+
+start-sanitize-v850e
+Tue Sep  2 17:43:49 1997  Nick Clifton  <nickc@cygnus.com>
+
+	* elf.c (prep_headers): Remove V850E magic number.
+start-sanitize-v850eq
+	* elf.c (prep_headers): Remove V850EQ magic number.
+end-sanitize-v850eq
+end-sanitize-v850e
+
 Tue Sep  2 17:35:05 1997  Doug Evans  <dje@canuck.cygnus.com>
 
 	* cpu-arc.c (arc_get_mach): Properly scan defined mach entries.
diff --git a/bfd/elf.c b/bfd/elf.c
index 7b1d196..88bdaf9 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -2876,12 +2876,6 @@ prep_headers (abfd)
 	{
 	default:
 	case 0:               i_ehdrp->e_machine = EM_CYGNUS_V850; break;
-/* start-sanitize-v850e */
-	case bfd_mach_v850e:  i_ehdrp->e_machine = EM_CYGNUS_V850E; break;
-/* end-sanitize-v850e */
-/* start-sanitize-v850eq */
-	case bfd_mach_v850eq: i_ehdrp->e_machine = EM_CYGNUS_V850EQ; break;
-/* end-sanitize-v850eq */
 	}
       break;
 /* end-sanitize-v850 */
diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index 93fb88d..b329f52 100644
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -830,9 +830,6 @@ v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
 
 	  insn  = bfd_get_32 (abfd, (bfd_byte *) data + reloc->address);
 	  
-if (reloc->howto->type == R_V850_SDA_16_16_SPLIT_OFFSET)
-  fprintf (stderr, "relocation %x, insn = %x\n", relocation, insn );
-
 	  insn &= 0x0001ffdf;
 	  insn |= (relocation & 1) << 5;
 	  insn |= (relocation & ~1) << 16;
@@ -1463,40 +1460,161 @@ fprintf (stderr, "local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x re
 }
 
 /* Set the right machine number.  */
-
 static boolean
 v850_elf_object_p (abfd)
      bfd *abfd;
 {
-  switch (get_elf_backend_data (abfd) -> elf_machine_code)
+  switch (elf_elfheader (abfd)->e_flags & EF_V850_ARCH)
     {
     default:
-    case EM_CYGNUS_V850:   (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, 0); break;
+    case E_V850_ARCH:   (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, 0); break;
 /* start-sanitize-v850e */
-    case EM_CYGNUS_V850E:  (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e); break;
+    case E_V850E_ARCH:  (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e); break;
 /* end-sanitize-v850e */
 /* start-sanitize-v850eq */
-    case EM_CYGNUS_V850EQ: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850eq); break;
+    case E_V850EQ_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850eq); break;
 /* start-sanitize-v850eq */
     }
 }
 
-
-#define TARGET_LITTLE_SYM			bfd_elf32_v850_vec
-#define TARGET_LITTLE_NAME			"elf32-v850"
-#define ELF_ARCH				bfd_arch_v850
-#define ELF_MACHINE_CODE			EM_CYGNUS_V850
+/* Store the machine number in the flags field.  */
+void
+v850_elf_final_write_processing (abfd, linker)
+     bfd *   abfd;
+     boolean linker;
+{
+  unsigned long val;
+
+  switch (bfd_get_mach (abfd))
+    {
+    default:
+    case 0: val = E_V850_ARCH; break;
 /* start-sanitize-v850e */
-#undef  ELF_MACHINE_CODE
-#define ELF_MACHINE_CODE			EM_CYGNUS_V850E
-#define ELF_MACHINE_ALT1			EM_CYGNUS_V850
+    case bfd_mach_v850e: val = E_V850E_ARCH; break;
 /* end-sanitize-v850e */
 /* start-sanitize-v850eq */
-#undef  ELF_MACHINE_CODE
-#define ELF_MACHINE_CODE			EM_CYGNUS_V850EQ
-#define ELF_MACHINE_ALT2			EM_CYGNUS_V850E
+    case bfd_mach_v850eq: val = E_V850EQ_ARCH;  break;
 /* end-sanitize-v850eq */
+    }
+
+  elf_elfheader (abfd)->e_flags &=~ EF_V850_ARCH;
+  elf_elfheader (abfd)->e_flags |= val;
+}
+
+/* Function to keep V850 specific file flags. */
+boolean
+v850_elf_set_private_flags (abfd, flags)
+     bfd *    abfd;
+     flagword flags;
+{
+  BFD_ASSERT (!elf_flags_init (abfd)
+	      || elf_elfheader (abfd)->e_flags == flags);
+
+  elf_elfheader (abfd)->e_flags = flags;
+  elf_flags_init (abfd) = true;
+  return true;
+}
+
+/* Copy backend specific data from one object module to another */
+boolean
+v850_elf_copy_private_bfd_data (ibfd, obfd)
+     bfd * ibfd;
+     bfd * obfd;
+{
+  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return true;
+
+  BFD_ASSERT (!elf_flags_init (obfd)
+	      || (elf_elfheader (obfd)->e_flags
+		  == elf_elfheader (ibfd)->e_flags));
+
+  elf_gp (obfd) = elf_gp (ibfd);
+  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
+  elf_flags_init (obfd) = true;
+  return true;
+}
+
+/* Merge backend specific data from an object file to the output
+   object file when linking.  */
+boolean
+v850_elf_merge_private_bfd_data (ibfd, obfd)
+     bfd * ibfd;
+     bfd * obfd;
+{
+  flagword old_flags;
+  flagword new_flags;
+
+  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
+      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
+    return true;
+
+  new_flags = elf_elfheader (ibfd)->e_flags;
+  old_flags = elf_elfheader (obfd)->e_flags;
+
+  if (! elf_flags_init (obfd))
+    {
+      elf_flags_init (obfd) = true;
+      elf_elfheader (obfd)->e_flags = new_flags;
+
+      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
+	  && bfd_get_arch_info (obfd)->the_default)
+	{
+	  return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
+	}
+
+      return true;
+    }
+
+  /* Check flag compatibility.  */
 
+  if (new_flags == old_flags)
+    return true;
+
+  if ((new_flags & EF_V850_ARCH) != (old_flags & EF_V850_ARCH))
+    {
+      _bfd_error_handler ("%s: Architecture mismatch with previous modules",
+	     bfd_get_filename (ibfd));
+      bfd_set_error (bfd_error_bad_value);
+      return false;
+    }
+
+  return true;
+}
+/* Display the flags field */
+
+static boolean
+v850_elf_print_private_bfd_data (abfd, ptr)
+     bfd *   abfd;
+     PTR     ptr;
+{
+  FILE * file = (FILE *) ptr;
+  
+  BFD_ASSERT (abfd != NULL && ptr != NULL)
+  
+  fprintf (file, "private flags = %x", elf_elfheader (abfd)->e_flags);
+  
+  switch (elf_elfheader (abfd)->e_flags & EF_V850_ARCH)
+    {
+    default:
+    case E_V850_ARCH: fprintf (file, ": v850 architecture");
+/* start-sanitize-v850e */
+    case E_V850E_ARCH: fprintf (file, ": v850e architecture");
+/* end-sanitize-v850e */
+/* start-sanitize-v850eq */
+    case E_V850EQ_ARCH: fprintf (file, ": v850eq architecture");
+/* end-sanitize-v850eq */
+    }
+  
+  fputc ('\n', file);
+  
+  return true;
+}
+
+#define TARGET_LITTLE_SYM			bfd_elf32_v850_vec
+#define TARGET_LITTLE_NAME			"elf32-v850"
+#define ELF_ARCH				bfd_arch_v850
+#define ELF_MACHINE_CODE			EM_CYGNUS_V850
 #define ELF_MAXPAGESIZE				0x1000
 	
 #define elf_info_to_howto			0
@@ -1504,8 +1622,13 @@ v850_elf_object_p (abfd)
 #define elf_backend_check_relocs		v850_elf_check_relocs
 #define elf_backend_relocate_section    	v850_elf_relocate_section
 #define elf_backend_object_p			v850_elf_object_p
+#define elf_backend_final_write_processing 	v850_elf_final_write_processing
 #define bfd_elf32_bfd_is_local_label_name	v850_elf_is_local_label_name
 #define bfd_elf32_bfd_reloc_type_lookup		v850_elf_reloc_type_lookup
+#define bfd_elf32_bfd_copy_private_bfd_data 	v850_elf_copy_private_bfd_data
+#define bfd_elf32_bfd_merge_private_bfd_data 	v850_elf_merge_private_bfd_data
+#define bfd_elf32_bfd_set_private_flags		v850_elf_set_private_flags
+#define bfd_elf32_bfd_print_private_bfd_data	v850_elf_print_private_bfd_data
 
 #define elf_symbol_leading_char			'_'