unsanitize v9

2 files changed, 8 insertions, 105 deletions

diff --git a/bfd/config.bfd b/bfd/config.bfd
index 13473f5..2e63430 100755
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -60,7 +60,7 @@ case "${canon}" in
   m68*-apollo-*)	bfd_name=apollo ;;
   m68*-bull-sysv*)	bfd_name=u68k-coff ;;
   m68*-hp-bsd*)		bfd_name=hp300bsd ;;
-  m68*-*-aout*)		bfd_name=m68k-aout ;;
+  m68*-*-aout*)		bfd_name=m68k-0aout ;;
   m68*-*-coff*)		bfd_name=m68k-coff ;;
   m68*-*-hpux*)		bfd_name=hp300hpux ;;
   m68*-*-lynxos*)	bfd_name=m68k-lynx ;;
@@ -69,7 +69,7 @@ case "${canon}" in
   m68*-*-sysv4*)	bfd_name=m68k-elf ;;
   m68*-*-sysv*)		bfd_name=m68k-coff ;;
   m68*-*-vxworks*)	bfd_name=m68k-aout ;;
-  m68*-ericsson-*)	bfd_name=m68k-aout ;;
+  m68*-ericsson-*)	bfd_name=m68k-ose ;;
   m68*-netx-*)		bfd_name=m68k-aout ;;
 
   m88*-*-sysv4*)	bfd_name=m88k-elf ;;
@@ -94,17 +94,13 @@ case "${canon}" in
   ns32*-*-mach*)	bfd_name=i386-mach3 ;;
   powerpc-*-aix*)	bfd_name=rs6000 ;;
   powerpc-*-sysv4*)	bfd_name=ppc-elf ;;
-#	start-sanitize-powerpc-netware
   powerpc-*-netware*)	bfd_name=ppc-nlm ;;
-#	end-sanitize-powerpc-netware
   rs6000-*-*)		bfd_name=rs6000 ;;
   sparc-*-lynxos*)	bfd_name=sparc-lynx ;;
   sparc-*-solaris2*)	bfd_name=sparc-elf ;;
   sparc-*-sysv4*)	bfd_name=sparc-elf ;;
-#	start-sanitize-v9
   sparc64-*-aout*)	bfd_name=sparc-aout ;;
   sparc64-*-elf*)	bfd_name=sparc64-elf ;;
-#	end-sanitize-v9
   sparc-*-netware*)	bfd_name=sparc-nlm ;;
   sparc*-*-coff*)	bfd_name=sparc-coff ;;
   sparc*-*-*)		bfd_name=sparc-aout ;;
diff --git a/bfd/reloc.c b/bfd/reloc.c
index b719ff7..6275cb3 100644
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -1275,7 +1275,8 @@ CODE_FRAGMENT
 .  BFD_RELOC_SPARC_BASE13,
 .  BFD_RELOC_SPARC_BASE22,
 .
-.  {* start-sanitize-v9 *}
+.  {* some relocations we're using for sparc v9
+.     -- subject to change *}
 .  BFD_RELOC_SPARC_10,
 .  BFD_RELOC_SPARC_11,
 .#define  BFD_RELOC_SPARC_64 BFD_RELOC_64
@@ -1290,7 +1291,6 @@ CODE_FRAGMENT
 .  BFD_RELOC_SPARC_WDISP19,
 .  BFD_RELOC_SPARC_GLOB_JMP,
 .  BFD_RELOC_SPARC_LO7,
-.  {* end-sanitize-v9 *}
 .
 .  {* Alpha ECOFF relocations.  Some of these treat the symbol or "addend"
 .     in some special way.  *}
@@ -1345,6 +1345,10 @@ CODE_FRAGMENT
 .  BFD_RELOC_HI16_S,
 .  {* Low 16 bits.  *}
 .  BFD_RELOC_LO16,
+.  {* Like BFD_RELOC_HI16_S, but PC relative.  *}
+.  BFD_RELOC_PCREL_HI16_S,
+.  {* Like BFD_RELOC_LO16, but PC relative.  *}
+.  BFD_RELOC_PCREL_LO16,
 .
 .  {* relocation relative to the global pointer.  *}
 .#define BFD_RELOC_MIPS_GPREL BFD_RELOC_GPREL16
@@ -1357,103 +1361,6 @@ CODE_FRAGMENT
 .  BFD_RELOC_MIPS_CALL16,
 .#define BFD_RELOC_MIPS_GPREL32 BFD_RELOC_GPREL32
 .
-.  {* These are, so far, specific to HPPA processors.  I'm not sure that some
-.     don't duplicate other reloc types, such as BFD_RELOC_32 and _32_PCREL.
-.     Also, many more were in the list I got that don't fit in well in the
-.     model BFD uses, so I've omitted them for now.  If we do make this reloc
-.     type get used for code that really does implement the funky reloc types,
-.     they'll have to be added to this list.  *}
-.  BFD_RELOC_HPPA_32,
-.  BFD_RELOC_HPPA_11,
-.  BFD_RELOC_HPPA_14,
-.  BFD_RELOC_HPPA_17,
-.
-.  BFD_RELOC_HPPA_L21,
-.  BFD_RELOC_HPPA_R11,
-.  BFD_RELOC_HPPA_R14,
-.  BFD_RELOC_HPPA_R17,
-.  BFD_RELOC_HPPA_LS21,
-.  BFD_RELOC_HPPA_RS11,
-.  BFD_RELOC_HPPA_RS14,
-.  BFD_RELOC_HPPA_RS17,
-.  BFD_RELOC_HPPA_LD21,
-.  BFD_RELOC_HPPA_RD11,
-.  BFD_RELOC_HPPA_RD14,
-.  BFD_RELOC_HPPA_RD17,
-.  BFD_RELOC_HPPA_LR21,
-.  BFD_RELOC_HPPA_RR14,
-.  BFD_RELOC_HPPA_RR17,
-.
-.  BFD_RELOC_HPPA_GOTOFF_11,
-.  BFD_RELOC_HPPA_GOTOFF_14,
-.  BFD_RELOC_HPPA_GOTOFF_L21,
-.  BFD_RELOC_HPPA_GOTOFF_R11,
-.  BFD_RELOC_HPPA_GOTOFF_R14,
-.  BFD_RELOC_HPPA_GOTOFF_LS21,
-.  BFD_RELOC_HPPA_GOTOFF_RS11,
-.  BFD_RELOC_HPPA_GOTOFF_RS14,
-.  BFD_RELOC_HPPA_GOTOFF_LD21,
-.  BFD_RELOC_HPPA_GOTOFF_RD11,
-.  BFD_RELOC_HPPA_GOTOFF_RD14,
-.  BFD_RELOC_HPPA_GOTOFF_LR21,
-.  BFD_RELOC_HPPA_GOTOFF_RR14,
-.
-.  BFD_RELOC_HPPA_DLT_32,
-.  BFD_RELOC_HPPA_DLT_11,
-.  BFD_RELOC_HPPA_DLT_14,
-.  BFD_RELOC_HPPA_DLT_L21,
-.  BFD_RELOC_HPPA_DLT_R11,
-.  BFD_RELOC_HPPA_DLT_R14,
-.
-.  BFD_RELOC_HPPA_ABS_CALL_11,
-.  BFD_RELOC_HPPA_ABS_CALL_14,
-.  BFD_RELOC_HPPA_ABS_CALL_17,
-.  BFD_RELOC_HPPA_ABS_CALL_L21,
-.  BFD_RELOC_HPPA_ABS_CALL_R11,
-.  BFD_RELOC_HPPA_ABS_CALL_R14,
-.  BFD_RELOC_HPPA_ABS_CALL_R17,
-.  BFD_RELOC_HPPA_ABS_CALL_LS21,
-.  BFD_RELOC_HPPA_ABS_CALL_RS11,
-.  BFD_RELOC_HPPA_ABS_CALL_RS14,
-.  BFD_RELOC_HPPA_ABS_CALL_RS17,
-.  BFD_RELOC_HPPA_ABS_CALL_LD21,
-.  BFD_RELOC_HPPA_ABS_CALL_RD11,
-.  BFD_RELOC_HPPA_ABS_CALL_RD14,
-.  BFD_RELOC_HPPA_ABS_CALL_RD17,
-.  BFD_RELOC_HPPA_ABS_CALL_LR21,
-.  BFD_RELOC_HPPA_ABS_CALL_RR14,
-.  BFD_RELOC_HPPA_ABS_CALL_RR17,
-.
-.  BFD_RELOC_HPPA_PCREL_CALL_11,
-.  BFD_RELOC_HPPA_PCREL_CALL_12,
-.  BFD_RELOC_HPPA_PCREL_CALL_14,
-.  BFD_RELOC_HPPA_PCREL_CALL_17,
-.  BFD_RELOC_HPPA_PCREL_CALL_L21,
-.  BFD_RELOC_HPPA_PCREL_CALL_R11,
-.  BFD_RELOC_HPPA_PCREL_CALL_R14,
-.  BFD_RELOC_HPPA_PCREL_CALL_R17,
-.  BFD_RELOC_HPPA_PCREL_CALL_LS21,
-.  BFD_RELOC_HPPA_PCREL_CALL_RS11,
-.  BFD_RELOC_HPPA_PCREL_CALL_RS14,
-.  BFD_RELOC_HPPA_PCREL_CALL_RS17,
-.  BFD_RELOC_HPPA_PCREL_CALL_LD21,
-.  BFD_RELOC_HPPA_PCREL_CALL_RD11,
-.  BFD_RELOC_HPPA_PCREL_CALL_RD14,
-.  BFD_RELOC_HPPA_PCREL_CALL_RD17,
-.  BFD_RELOC_HPPA_PCREL_CALL_LR21,
-.  BFD_RELOC_HPPA_PCREL_CALL_RR14,
-.  BFD_RELOC_HPPA_PCREL_CALL_RR17,
-.
-.  BFD_RELOC_HPPA_PLABEL_32,
-.  BFD_RELOC_HPPA_PLABEL_11,
-.  BFD_RELOC_HPPA_PLABEL_14,
-.  BFD_RELOC_HPPA_PLABEL_L21,
-.  BFD_RELOC_HPPA_PLABEL_R11,
-.  BFD_RELOC_HPPA_PLABEL_R14,
-.
-.  BFD_RELOC_HPPA_UNWIND_ENTRY,
-.  BFD_RELOC_HPPA_UNWIND_ENTRIES,
-.
 .  {* i386/elf relocations *}
 .  BFD_RELOC_386_GOT32,
 .  BFD_RELOC_386_PLT32,