* elf.c, elfcode.h, libelf.h: Serious reorganization.

Deleted `thunk' structure, merged into tdata, duplicate data eliminated.
Rearranged functions, grouping by function.
Broke up many functions in elfcode.h, re-ordered many parts of file writing
to handle unpredictable state of section relocation table as provided by
various applications.
Still needs cleanup: Merge functions back together, split out data structure
with only data that is used only when writing out object file.

* elf.c (bfd_elf_generic_reloc): New function, taken from coff-mips.c.
* elf32-sparc.c (elf_sparc_howto_table): Use it, to work around
bfd_perform_relocation lossage.

1 files changed, 151 insertions, 0 deletions

diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c
new file mode 100644
index 0000000..78c7eaa
--- /dev/null
+++ b/bfd/elf32-sparc.c
@@ -0,0 +1,151 @@
+/* SPARC-specific support for 32-bit ELF
+   Copyright 1993 Free Software Foundation, Inc.
+
+This file is part of BFD, the Binary File Descriptor library.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#include "bfd.h"
+#include "sysdep.h"
+#include "libbfd.h"
+#include "libelf.h"
+
+enum reloc_type
+  {
+    R_SPARC_NONE = 0,
+    R_SPARC_8,		R_SPARC_16,		R_SPARC_32, 
+    R_SPARC_DISP8,	R_SPARC_DISP16,		R_SPARC_DISP32, 
+    R_SPARC_WDISP30,	R_SPARC_WDISP22,
+    R_SPARC_HI22,	R_SPARC_22,
+    R_SPARC_13,		R_SPARC_LO10,
+    R_SPARC_GOT10,	R_SPARC_GOT13,		R_SPARC_GOT22,
+    R_SPARC_PC10,	R_SPARC_PC22,
+    R_SPARC_WPLT30,
+    R_SPARC_COPY,
+    R_SPARC_GLOB_DAT,	R_SPARC_JMP_SLOT,
+    R_SPARC_RELATIVE,
+    R_SPARC_UA32,
+    R_SPARC_max
+  };
+
+#if 0
+static CONST char *CONST reloc_type_names[] =
+{
+  "R_SPARC_NONE",
+  "R_SPARC_8",		"R_SPARC_16",		"R_SPARC_32",
+  "R_SPARC_DISP8",	"R_SPARC_DISP16",	"R_SPARC_DISP32",
+  "R_SPARC_WDISP30",	"R_SPARC_WDISP22",
+  "R_SPARC_HI22",	"R_SPARC_22",
+  "R_SPARC_13",		"R_SPARC_LO10",
+  "R_SPARC_GOT10",	"R_SPARC_GOT13",	"R_SPARC_GOT22",
+  "R_SPARC_PC10",	"R_SPARC_PC22",
+  "R_SPARC_WPLT30",
+  "R_SPARC_COPY",
+  "R_SPARC_GLOB_DAT",	"R_SPARC_JMP_SLOT",
+  "R_SPARC_RELATIVE",
+  "R_SPARC_UA32",
+};
+#endif
+
+static reloc_howto_type elf_sparc_howto_table[] = 
+{
+  HOWTO(R_SPARC_NONE,   0,0, 0,false,0,false,false, &bfd_elf_generic_reloc,"R_SPARC_NONE",   false,0,0x00000000,false),
+  HOWTO(R_SPARC_8,      0,0, 8,false,0,true,  true, &bfd_elf_generic_reloc,"R_SPARC_8",      false,0,0x000000ff,false),
+  HOWTO(R_SPARC_16,     0,1,16,false,0,true,  true, &bfd_elf_generic_reloc,"R_SPARC_16",     false,0,0x0000ffff,false),
+  HOWTO(R_SPARC_32,     0,2,32,false,0,true,  true, &bfd_elf_generic_reloc,"R_SPARC_32",     false,0,0xffffffff,false),
+  HOWTO(R_SPARC_DISP8,  0,0, 8,true, 0,false, true, &bfd_elf_generic_reloc,"R_SPARC_DISP8",  false,0,0x000000ff,false),
+  HOWTO(R_SPARC_DISP16, 0,1,16,true, 0,false, true, &bfd_elf_generic_reloc,"R_SPARC_DISP16", false,0,0x0000ffff,false),
+  HOWTO(R_SPARC_DISP32, 0,2,32,true, 0,false, true, &bfd_elf_generic_reloc,"R_SPARC_DISP32", false,0,0x00ffffff,false),
+  HOWTO(R_SPARC_WDISP30,2,2,30,true, 0,false, true, &bfd_elf_generic_reloc,"R_SPARC_WDISP30",false,0,0x3fffffff,false),
+  HOWTO(R_SPARC_WDISP22,2,2,22,true, 0,false, true, &bfd_elf_generic_reloc,"R_SPARC_WDISP22",false,0,0x003fffff,false),
+  HOWTO(R_SPARC_HI22,  10,2,22,false,0,true, false, &bfd_elf_generic_reloc,"R_SPARC_HI22",   false,0,0x003fffff,false),
+  HOWTO(R_SPARC_22,     0,2,22,false,0,true,  true, &bfd_elf_generic_reloc,"R_SPARC_22",     false,0,0x003fffff,false),
+  HOWTO(R_SPARC_13,     0,1,13,false,0,true,  true, &bfd_elf_generic_reloc,"R_SPARC_13",     false,0,0x00001fff,false),
+  HOWTO(R_SPARC_LO10,   0,1,10,false,0,true, false, &bfd_elf_generic_reloc,"R_SPARC_LO10",   false,0,0x000003ff,false),
+  HOWTO(R_SPARC_GOT10,  0,1,10,false,0,false, true, &bfd_elf_generic_reloc,"R_SPARC_GOT10",  false,0,0x000003ff,false),
+  HOWTO(R_SPARC_GOT13,  0,1,13,false,0,false, true, &bfd_elf_generic_reloc,"R_SPARC_GOT13",  false,0,0x00001fff,false),
+  HOWTO(R_SPARC_GOT22, 10,2,22,false,0,false, true, &bfd_elf_generic_reloc,"R_SPARC_GOT22",  false,0,0x003fffff,false),
+  HOWTO(R_SPARC_PC10,   0,1,10,false,0,true,  true, &bfd_elf_generic_reloc,"R_SPARC_PC10",   false,0,0x000003ff,false),
+  HOWTO(R_SPARC_PC22,   0,2,22,false,0,true,  true, &bfd_elf_generic_reloc,"R_SPARC_PC22",   false,0,0x003fffff,false),
+  HOWTO(R_SPARC_WPLT30, 0,0,00,false,0,false,false, &bfd_elf_generic_reloc,"R_SPARC_WPLT30", false,0,0x00000000,false),
+  HOWTO(R_SPARC_COPY,   0,0,00,false,0,false,false, &bfd_elf_generic_reloc,"R_SPARC_COPY",   false,0,0x00000000,false),
+  HOWTO(R_SPARC_GLOB_DAT,0,0,00,false,0,false,false,&bfd_elf_generic_reloc,"R_SPARC_GLOB_DAT",false,0,0x00000000,false),
+  HOWTO(R_SPARC_JMP_SLOT,0,0,00,false,0,false,false,&bfd_elf_generic_reloc,"R_SPARC_JMP_SLOT",false,0,0x00000000,false),
+  HOWTO(R_SPARC_RELATIVE,0,0,00,false,0,false,false,&bfd_elf_generic_reloc,"R_SPARC_RELATIVE",false,0,0x00000000,false),
+  HOWTO(R_SPARC_UA32,    0,0,00,false,0,false,false,&bfd_elf_generic_reloc,"R_SPARC_UA32",    false,0,0x00000000,false),
+};
+
+struct elf_reloc_map {
+  unsigned char bfd_reloc_val;
+  unsigned char elf_reloc_val;
+};
+
+static CONST struct elf_reloc_map sparc_reloc_map[] =
+{
+  { BFD_RELOC_NONE, R_SPARC_NONE, },
+  { BFD_RELOC_16, R_SPARC_16, },
+  { BFD_RELOC_8, R_SPARC_8 },
+  { BFD_RELOC_8_PCREL, R_SPARC_DISP8 },
+  { BFD_RELOC_CTOR, R_SPARC_32 }, /* @@ Assumes 32 bits.  */
+  { BFD_RELOC_32, R_SPARC_32 },
+  { BFD_RELOC_32_PCREL, R_SPARC_DISP32 },
+  { BFD_RELOC_HI22, R_SPARC_HI22 },
+  { BFD_RELOC_LO10, R_SPARC_LO10, },
+  { BFD_RELOC_32_PCREL_S2, R_SPARC_WDISP30 },
+  { BFD_RELOC_SPARC22, R_SPARC_22 },
+  { BFD_RELOC_SPARC13, R_SPARC_13 },
+  { BFD_RELOC_SPARC_GOT10, R_SPARC_GOT10 },
+  { BFD_RELOC_SPARC_GOT13, R_SPARC_GOT13 },
+  { BFD_RELOC_SPARC_GOT22, R_SPARC_GOT22 },
+  { BFD_RELOC_SPARC_PC10, R_SPARC_PC10 },
+  { BFD_RELOC_SPARC_PC22, R_SPARC_PC22 },
+  { BFD_RELOC_SPARC_WPLT30, R_SPARC_WPLT30 },
+  { BFD_RELOC_SPARC_COPY, R_SPARC_COPY },
+  { BFD_RELOC_SPARC_GLOB_DAT, R_SPARC_GLOB_DAT },
+  { BFD_RELOC_SPARC_JMP_SLOT, R_SPARC_JMP_SLOT },
+  { BFD_RELOC_SPARC_RELATIVE, R_SPARC_RELATIVE },
+  { BFD_RELOC_SPARC_WDISP22, R_SPARC_WDISP22 },
+  /*  { BFD_RELOC_SPARC_UA32, R_SPARC_UA32 }, not used?? */
+};
+
+static CONST struct reloc_howto_struct *
+DEFUN (bfd_elf32_bfd_reloc_type_lookup, (abfd, code),
+       bfd *abfd AND
+       bfd_reloc_code_real_type code)
+{
+  int i;
+  for (i = 0; i < sizeof (sparc_reloc_map) / sizeof (struct elf_reloc_map); i++)
+    {
+      if (sparc_reloc_map[i].bfd_reloc_val == code)
+	return &elf_sparc_howto_table[(int) sparc_reloc_map[i].elf_reloc_val];
+    }
+  return 0;
+}
+
+static void
+DEFUN (elf_info_to_howto, (abfd, cache_ptr, dst),
+       bfd *abfd AND
+       arelent *cache_ptr AND
+       Elf32_Internal_Rela *dst)
+{
+  BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_SPARC_max);
+  cache_ptr->howto = &elf_sparc_howto_table[ELF32_R_TYPE(dst->r_info)];
+}
+
+#define TARGET_BIG_SYM	bfd_elf32_sparc_vec
+#define TARGET_BIG_NAME	"elf32-sparc"
+#define ELF_ARCH	bfd_arch_sparc
+
+#include "elf32-target.h"