elf2flt: sync with buildroot

3 files changed, 30 insertions, 2156 deletions

diff --git a/toolchain/elf2flt/patches/v2021.08/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch b/toolchain/elf2flt/patches/v2021.08/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch
index 278709cb1..616bbc891 100644
--- a/toolchain/elf2flt/patches/v2021.08/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch
+++ b/toolchain/elf2flt/patches/v2021.08/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch
@@ -1,8 +1,7 @@
-From 65ac5f9e69cfb989d970da74c41e478774d29be5 Mon Sep 17 00:00:00 2001
+From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001
 From: Niklas Cassel <niklas.cassel@wdc.com>
 Date: Tue, 9 Aug 2022 21:06:05 +0200
-Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa,
- riscv64
+Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64
 
 Commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs")
 changed the condition of which input sections that should be included
@@ -12,16 +11,15 @@ to:
 ((a->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
 (SEC_DATA | SEC_READONLY | SEC_RELOC))
 
-On ARM, the .eh_frame input section does not have the SEC_RELOC flag
-set, so this specific change had no effect on ARM.
+On ARM, the .eh_frame input section does not have the SEC_RELOC flag set,
+so on ARM, this change caused .eh_frame to move from .text to .data.
 
-However, on e.g. m68k and riscv64, the .eh_frame input section does
-have the SEC_RELOC flag set, which means that after commit ba379d08bb78
-("elf2flt: fix for segfault on some ARM ELFs"), read-only relocation
-data sections were placed in .text output section, instead of .data
-output section.
+However, on e.g. m68k, xtensa and riscv64, the .eh_frame input section
+does have the SEC_RELOC flag set, which means that the change in
+commit ba379d08bb78 ("elf2flt: fix for segfault on some ARM ELFs")
+caused .eh_frame to move in an opposite way, i.e. from .data to .text.
 
-This will result in a fatal error on m68k, xtensa and riscv64:
+This resulted in a fatal error on m68k, xtensa and riscv64:
 ERROR: text=0x3bab8 overlaps data=0x33f60 ?
 
 This is because elf2flt cannot append to .text after .data has been
@@ -36,21 +34,26 @@ to .text after .data has been appended to (which will require elf2flt
 to move/relocate everything that has already been appended to .data,
 since the virtual addresses are contiguous).
 
-However, for now, add an exception for m68k, xtensa and riscv64
-(specifically for the problematic input section, .eh_frame), so that we
-get the same behavior as older elf2flt releases, where we put read-only
-relocation data in .data, which was working perfectly fine.
+However, for now, add an exception for input sections which have all
+three flags SEC_DATA, SEC_READONLY, and SEC_RELOC set, and which have a
+name equal to a problematic input section (.eh_frame, .gcc_except_table).
+That way, we get the same behavior as older elf2flt releases for m68k,
+xtensa and riscv64, where we put read-only relocation data in .data,
+which was working perfectly fine.
+
+This exception will not change any behavior on ARM, as the .eh_frame
+input section does not have flag SEC_RELOC set.
 
 Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
 ---
- elf2flt.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
+ elf2flt.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/elf2flt.c b/elf2flt.c
-index 9c32f9a..a680c89 100644
+index e0d7891..39d035f 100644
 --- a/elf2flt.c
 +++ b/elf2flt.c
-@@ -340,8 +340,15 @@ compare_relocs (const void *pa, const void *pb)
+@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb)
  static bool
  ro_reloc_data_section_should_be_in_text(asection *s)
  {
@@ -58,10 +61,8 @@ index 9c32f9a..a680c89 100644
 -	  (SEC_DATA | SEC_READONLY | SEC_RELOC);
 +  if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
 +      (SEC_DATA | SEC_READONLY | SEC_RELOC)) {
-+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa)
-+    if (!strcmp(".eh_frame", s->name))
++    if (!strcmp(".eh_frame", s->name) || !strcmp(".gcc_except_table", s->name))
 +      return false;
-+#endif
 +    return true;
 +  }
 +  return false;
@@ -69,5 +70,5 @@ index 9c32f9a..a680c89 100644
  
  static uint32_t *
 -- 
-2.37.1
+2.39.0
 
diff --git a/toolchain/elf2flt/patches/v2021.08/0007-riscv32.patch b/toolchain/elf2flt/patches/v2021.08/0007-riscv32.patch
index dad501482..b3c4677be 100644
--- a/toolchain/elf2flt/patches/v2021.08/0007-riscv32.patch
+++ b/toolchain/elf2flt/patches/v2021.08/0007-riscv32.patch
@@ -1,6 +1,6 @@
 diff -Nur elf2flt-v2021.08.orig/elf2flt.c elf2flt-v2021.08/elf2flt.c
---- elf2flt-v2021.08.orig/elf2flt.c	2023-01-09 11:08:28.637676113 +0100
-+++ elf2flt-v2021.08/elf2flt.c	2023-01-09 11:16:05.447182514 +0100
+--- elf2flt-v2021.08.orig/elf2flt.c	2023-02-26 11:31:48.758810872 +0100
++++ elf2flt-v2021.08/elf2flt.c	2023-02-26 11:32:05.714465277 +0100
 @@ -81,7 +81,7 @@
  #include <elf/v850.h>
  #elif defined(TARGET_xtensa)
@@ -19,18 +19,8 @@ diff -Nur elf2flt-v2021.08.orig/elf2flt.c elf2flt-v2021.08/elf2flt.c
  #else
  #error "Don't know how to support your CPU architecture??"
  #endif
-@@ -351,7 +353,8 @@
- {
-   if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
-       (SEC_DATA | SEC_READONLY | SEC_RELOC)) {
--#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa)
-+#if defined(TARGET_m68k) || defined(TARGET_riscv64) || \
-+	  defined(TARGET_xtensa) || defined(TARGET_riscv32)
-     if (!strcmp(".eh_frame", s->name))
-       return false;
- #endif
-@@ -838,12 +841,21 @@
- 					goto good_32bit_resolved_reloc;
+@@ -849,12 +851,21 @@
+ 					break;
  				default:
  					goto bad_resolved_reloc;
 -#elif defined(TARGET_riscv64)
@@ -53,8 +43,8 @@ diff -Nur elf2flt-v2021.08.orig/elf2flt.c elf2flt-v2021.08/elf2flt.c
  				case R_RISCV_32:
  				case R_RISCV_64:
 diff -Nur elf2flt-v2021.08.orig/ld-elf2flt.c elf2flt-v2021.08/ld-elf2flt.c
---- elf2flt-v2021.08.orig/ld-elf2flt.c	2023-01-09 11:08:16.441289072 +0100
-+++ elf2flt-v2021.08/ld-elf2flt.c	2023-01-09 11:16:43.236237537 +0100
+--- elf2flt-v2021.08.orig/ld-elf2flt.c	2023-02-26 11:31:21.047376888 +0100
++++ elf2flt-v2021.08/ld-elf2flt.c	2023-02-26 11:32:05.714465277 +0100
 @@ -327,7 +327,7 @@
  	/* riscv adds a global pointer symbol to the linker file with the
  	   "RISCV_GP:" prefix. Remove the prefix for riscv64 architecture and
diff --git a/toolchain/elf2flt/patches/v2021.08/0008-remove_BFD_VMA_FMT.patch b/toolchain/elf2flt/patches/v2021.08/0008-remove_BFD_VMA_FMT.patch
index abb481186..6367f1383 100644
--- a/toolchain/elf2flt/patches/v2021.08/0008-remove_BFD_VMA_FMT.patch
+++ b/toolchain/elf2flt/patches/v2021.08/0008-remove_BFD_VMA_FMT.patch
@@ -95,2120 +95,3 @@ diff -Nur elf2flt-v2021.08.orig/elf2flt.c elf2flt-v2021.08/elf2flt.c
  						flat_reloc_count,
  						q->address, sym_name, addstr,
  						section_name, sym_reloc_size,
-diff -Nur elf2flt-v2021.08.orig/elf2flt.c.orig elf2flt-v2021.08/elf2flt.c.orig
---- elf2flt-v2021.08.orig/elf2flt.c.orig	2023-01-29 16:47:18.264007463 +0100
-+++ elf2flt-v2021.08/elf2flt.c.orig	1970-01-01 01:00:00.000000000 +0100
-@@ -1,2113 +0,0 @@
--/*
-- * elf2flt.c: Convert ELF (or any BFD format) to FLAT binary format
-- *
-- * (c) 1999-2002, Greg Ungerer <gerg@snapgear.com>
-- * Created elf2flt from coff2flt (see copyrights below). Added all the
-- * ELF format file handling. Extended relocation support for all of
-- * text and data.
-- *
-- * (c) 2008-2009, Xtensa support, Oskar Schirmer <os@emlix.com>
-- * (c) 2006  Support the -a (use_resolved) option for TARGET_arm.
-- *           Shaun Jackman <sjackman@gmail.com>
-- * (c) 2004, Nios II support, Wentao Xu <wentao@microtronix.com>
-- * (c) 2003, H8 support, ktrace <davidm@snapgear.com>
-- * (c) 2003-2004, MicroBlaze support, John Williams <jwilliams@itee.uq.edu.au>
-- * (c) 2001-2003, arm/arm-pic/arm-big-endian support <davidm@snapgear.com>
-- * (c) 2001, v850 changes, Mile Bader <miles@lsi.nec.co.jp>
-- * (c) 2003, SuperH support, Paul Mundt <lethal@linux-sh.org>
-- * (c) 2001, zflat support <davidm@snapgear.com>
-- * (c) 2001, Changes for GOT entries Paul Dale <pauli@snapgear.com> and
-- *           David McCullough <davidm@snapgear.com>
-- *
-- * Now supports PIC with GOT tables.  This works by taking a '.elf' file
-- * and a fully linked elf executable (at address 0) and produces a flat
-- * file that can be loaded with some fixups.  It still supports the old
-- * style fully relocatable elf format files.
-- *
-- * Originally obj-res.c
-- *
-- * (c) 1998, Kenneth Albanowski <kjahds@kjahds.com>
-- * (c) 1998, D. Jeff Dionne
-- * (c) 1998, The Silver Hammer Group Ltd.
-- * (c) 1996, 1997 Dionne & Associates <jeff@ryeham.ee.ryerson.ca>
-- *
-- * This is Free Software, under the GNU Public Licence v2 or greater.
-- *
-- * Relocation added March 1997, Kresten Krab Thorup
-- * krab@california.daimi.aau.dk
-- */
--
--#include <inttypes.h> /* All the standard PRI define times for printf        */
--#include <stdio.h>    /* Userland pieces of the ANSI C standard I/O package  */
--#include <stdlib.h>   /* Userland prototypes of the ANSI C std lib functions */
--#include <stdarg.h>   /* Allows va_list to exist in the these namespaces     */
--#include <string.h>   /* Userland prototypes of the string handling funcs    */
--#include <strings.h>
--#include <unistd.h>   /* Userland prototypes of the Unix std system calls    */
--#include <fcntl.h>    /* Flag value for file handling functions              */
--#include <time.h>
--#include <errno.h>
--
--/* from $(INSTALLDIR)/include       */
--#include <bfd.h>      /* Main header file for the BFD library                */
--#include <libiberty.h>
--
--#include "stubs.h"
--const char *elf2flt_progname;
--
--/* Include the right header file for the R_xxx defines.  */
--#if defined(TARGET_arm)
--#include <elf/arm.h>
--#elif defined(TARGET_bfin)
--#include <elf/bfin.h>
--#elif defined(TARGET_h8300)
--#include <elf/h8.h>
--#elif defined(TARGET_m68k)
--#include <elf/m68k.h>
--#elif defined(TARGET_microblaze)
--#include <elf/microblaze.h>
--#elif defined(TARGET_nios) || defined(TARGET_nios2)
--/* Altera NIOS specific definitions.  */
--#define FLAT_NIOS2_R_32			0 /* Normal 32-bit reloc */
--#define FLAT_NIOS2_R_HI_LO		1
--#define FLAT_NIOS2_R_HIADJ_LO	2
--#define FLAT_NIOS2_R_CALL26		4
--#include <elf/nios2.h>
--#elif defined(TARGET_sh)
--#include <elf/sh.h>
--#elif defined(TARGET_sparc)
--#include <elf/sparc.h>
--#elif defined(TARGET_v850)
--#include <elf/v850.h>
--#elif defined(TARGET_xtensa)
--#include <elf/xtensa.h>
--#elif defined(TARGET_riscv64)
--#include <elf/riscv.h>
--#endif
--
--#if defined(__MINGW32__)
--#include <getopt.h>
--#endif
--
--/* from uClinux-x.x.x/include/linux */
--#include "flat.h"     /* Binary flat header description                      */
--#include "compress.h"
--
--#ifdef TARGET_e1
--#include <e1.h>
--#endif
--
--#ifdef TARGET_v850e
--#define TARGET_v850
--#endif
--
--#if defined(TARGET_m68k)
--#define	ARCH	"m68k/coldfire"
--#elif defined(TARGET_arm)
--#define	ARCH	"arm"
--#elif defined(TARGET_sparc)
--#define	ARCH	"sparc"
--#elif defined(TARGET_v850)
--#define	ARCH	"v850"
--#elif defined(TARGET_sh)
--#define	ARCH	"sh"
--#elif defined(TARGET_h8300)
--#define	ARCH	"h8300"
--#elif defined(TARGET_microblaze)
--#define ARCH	"microblaze"
--#elif defined(TARGET_e1)
--#define ARCH    "e1-coff"
--#elif defined(TARGET_bfin)
--#define ARCH	"bfin"
--#elif defined(TARGET_nios)
--#define ARCH	"nios"
--#elif defined(TARGET_nios2)
--#define ARCH	"nios2"
--#elif defined(TARGET_xtensa)
--#define ARCH	"xtensa"
--#elif defined(TARGET_riscv64)
--#define ARCH	"riscv64"
--#else
--#error "Don't know how to support your CPU architecture??"
--#endif
--
--#if defined(TARGET_m68k) || defined(TARGET_h8300) || defined(TARGET_bfin)
--/*
-- * Define a maximum number of bytes allowed in the offset table.
-- * We'll fail if the table is larger than this.
-- *
-- * This limit may be different for platforms other than m68k, but
-- * 8000 entries is a lot,  trust me :-) (davidm)
-- */
--#define GOT_LIMIT 32767
--/*
-- * we have to mask out the shared library id here and there,  this gives
-- * us the real address bits when needed
-- */
--#define	real_address_bits(x)	(pic_with_got ? ((x) & 0xffffff) : (x))
--#else
--#define	real_address_bits(x)	(x)
--#endif
--
--#ifndef O_BINARY
--#define O_BINARY 0
--#endif
--
--/*
-- * The bfd parameter isn't actually used by any of the bfd_section funcs and
-- * have been removed since binutils 2.34.
-- */
--#ifdef HAVE_BFD_SECTION_API_TAKES_BFD
--#define elf2flt_bfd_section_size(s) bfd_section_size(NULL, s)
--#define elf2flt_bfd_section_vma(s)  bfd_section_vma(NULL, s)
--#else
--#define elf2flt_bfd_section_size(s) bfd_section_size(s)
--#define elf2flt_bfd_section_vma(s)  bfd_section_vma(s)
--#endif
--
--/* Extra output when running.  */
--static int verbose = 0;
--/* Do ELF/GOT processing with PIC code.  */
--static int pic_with_got = 0;
--/* Instruct loader to allocate everything into RAM.  */
--static int load_to_ram = 0;
--/* Instruct kernel loader to output debug/trace info when loading.  */
--static int ktrace = 0;
--/* 1 = compress everything, 2 = compress data only.  */
--static int docompress = 0;
--/* If true, get the value of symbol references from the program contents,
--   not from the relocation table.  In this case, the input ELF file must
--   be already fully resolved (using the `-q' flag with recent versions of
--   GNU ld will give you a fully resolved output file with relocation
--   entries).  */
--static int use_resolved = 0;
--
--/* Set if the text section contains any relocations.  If it does, we must
--   set the load_to_ram flag.  */
--static int text_has_relocs = 0;
--
--static asymbol **
--get_symbols (bfd *abfd, long *num)
--{
--  int32_t storage_needed;
--  asymbol **symbol_table;
--  long number_of_symbols;
--
--  storage_needed = bfd_get_symtab_upper_bound (abfd);
--
--  if (storage_needed < 0)
--    abort ();
--
--  if (storage_needed == 0)
--    return NULL;
--
--  symbol_table = xmalloc (storage_needed);
--
--  number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table);
--
--  if (number_of_symbols < 0)
--    abort ();
--
--  *num = number_of_symbols;
--  return symbol_table;
--}
--
--
--
--static int
--dump_symbols(asymbol **symbol_table, long number_of_symbols)
--{
--  long i;
--  printf("SYMBOL TABLE:\n");
--  for (i=0; i<number_of_symbols; i++) {
--	printf("  NAME=%s  VALUE=0x%"BFD_VMA_FMT"x\n",
--		symbol_table[i]->name, symbol_table[i]->value);
--  }
--  printf("\n");
--  return(0);
--}
--
--
--
--#if !defined TARGET_e1 && !defined TARGET_bfin
--static long
--get_symbol_offset(char *name, asection *sec, asymbol **symbol_table, long number_of_symbols)
--{
--  long i;
--  for (i=0; i<number_of_symbols; i++) {
--    if (symbol_table[i]->section == sec) {
--      if (!strcmp(symbol_table[i]->name, name)) {
--        return symbol_table[i]->value;
--      }
--    }
--  }
--  return -1;
--}
--#endif
--
--
--
--#ifdef TARGET_nios2
--static long
--get_gp_value(asymbol **symbol_table, long number_of_symbols)
--{
--  long i;
--  for (i=0; i<number_of_symbols; i++) {
--      if (!strcmp(symbol_table[i]->name, "_gp"))
--		return symbol_table[i]->value;
--  }
--  return -1;
--}
--#endif
--
--
--
--static int32_t
--add_com_to_bss(asymbol **symbol_table, int32_t number_of_symbols, int32_t bss_len)
--{
--  int32_t i, comsize;
--  int32_t offset;
--
--  comsize = 0;
--  for (i=0; i<number_of_symbols; i++) {
--    if (strcmp("*COM*", symbol_table[i]->section->name) == 0) {
--      offset = bss_len + comsize;
--      comsize += symbol_table[i]->value;
--      symbol_table[i]->value = offset;
--    }
--  }
--  return comsize;
--}
--
--#ifdef TARGET_bfin
--/* FUNCTION : weak_und_symbol
--   ABSTRACT : return true if symbol is weak and undefined.
--*/
--static int
--weak_und_symbol(const char *reloc_section_name,
--                struct bfd_symbol *symbol)
--{
--    if (!(strstr (reloc_section_name, "text")
--	  || strstr (reloc_section_name, "data")
--	  || strstr (reloc_section_name, "bss"))) {
--	if (symbol->flags & BSF_WEAK) {
--#ifdef DEBUG_BFIN
--	    fprintf(stderr, "found weak undefined symbol %s\n", symbol->name);
--#endif
--	    return TRUE;
--	}
--    }
--    return FALSE;
--}
--
--static int
--bfin_set_reloc (uint32_t *reloc,
--		const char *reloc_section_name,
--		const char *sym_name,
--		struct bfd_symbol *symbol,
--		int sp, int32_t offset)
--{
--    unsigned int type = 0;
--    uint32_t val;
--
--    if (strstr (reloc_section_name, "stack")) {
--	    if (verbose)
--		    printf("Stack-relative reloc, offset %08"PRIx32"\n", offset);
--	    /* This must be a stack_start reloc for stack checking.  */
--	    type = 1;
--    }
--    val = (offset & ((1 << 26) - 1));
--    val |= (sp & ((1 << 3) - 1)) << 26;
--    val |= type << 29;
--    *reloc = val;
--    return 0;
--}
--
--static bfd *compare_relocs_bfd;
--
--static int
--compare_relocs (const void *pa, const void *pb)
--{
--	const arelent *const *a = pa, *const *b = pb;
--	const arelent *ra = *a, *rb = *b;
--	unsigned long va, vb;
--	uint32_t a_vma, b_vma;
--
--	if (!ra->sym_ptr_ptr || !*ra->sym_ptr_ptr)
--		return -1;
--	else if (!rb->sym_ptr_ptr || !*rb->sym_ptr_ptr)
--		return 1;
--
--	a_vma = elf2flt_bfd_section_vma((*(ra->sym_ptr_ptr))->section);
--	b_vma = elf2flt_bfd_section_vma((*(rb->sym_ptr_ptr))->section);
--	va = (*(ra->sym_ptr_ptr))->value + a_vma + ra->addend;
--	vb = (*(rb->sym_ptr_ptr))->value + b_vma + rb->addend;
--	return va - vb;
--}
--#endif
--
--static bool
--ro_reloc_data_section_should_be_in_text(asection *s)
--{
--  if ((s->flags & (SEC_DATA | SEC_READONLY | SEC_RELOC)) ==
--      (SEC_DATA | SEC_READONLY | SEC_RELOC)) {
--#if defined(TARGET_m68k) || defined(TARGET_riscv64) || defined(TARGET_xtensa)
--    if (!strcmp(".eh_frame", s->name))
--      return false;
--#endif
--    return true;
--  }
--  return false;
--}
--
--static uint32_t *
--output_relocs (
--  bfd *abs_bfd,
--  asymbol **symbols,
--  int number_of_symbols,
--  uint32_t *n_relocs,
--  unsigned char *text, int text_len, uint32_t text_vma,
--  unsigned char *data, int data_len, uint32_t data_vma,
--  bfd *rel_bfd)
--{
--  uint32_t		*flat_relocs;
--  asection		*a, *sym_section, *r;
--  arelent		**relpp, **p, *q;
--  const char		*sym_name, *section_name;
--  unsigned char		*sectionp;
--  unsigned long		pflags;
--  char			addstr[20];
--  uint32_t		sym_addr, sym_vma, section_vma;
--  int			relsize, relcount;
--  int			flat_reloc_count;
--  int			sym_reloc_size, rc;
--  int			got_size = 0;
--  int			bad_relocs = 0;
--  asymbol		**symb;
--  long			nsymb;
--#ifdef TARGET_bfin
--  unsigned long		persistent_data = 0;
--#endif
--
--#if 0
--  printf("%s(%d): output_relocs(abs_bfd=%d,symbols=0x%x,number_of_symbols=%d,"
--	"n_relocs=0x%x,text=0x%x,text_len=%d,data=0x%x,data_len=%d)\n",
--	__FILE__, __LINE__, abs_bfd, symbols, number_of_symbols, n_relocs,
--	text, text_len, data, data_len);
--#endif
--
--  if (0)
--    dump_symbols(symbols, number_of_symbols);
--
--  *n_relocs = 0;
--  flat_relocs = NULL;
--  flat_reloc_count = 0;
--  sym_reloc_size = 0;
--  rc = 0;
--  pflags = 0;
--  /* Silence gcc warnings */
--  (void) pflags;
--  (void) sym_vma;
--
--  /* Determine how big our offset table is in bytes.
--   * This isn't too difficult as we've terminated the table with -1.
--   * Also note that both the relocatable and absolute versions have this
--   * terminator even though the relocatable one doesn't have the GOT!
--   */
--  if (pic_with_got && !use_resolved) {
--    uint32_t *lp = (uint32_t *)data;
--    /* Should call ntohl(*lp) here but is isn't going to matter */
--    while (*lp != 0xffffffff) lp++;
--    got_size = ((unsigned char *)lp) - data;
--    if (verbose)
--	    printf("GOT table contains %zu entries (%d bytes)\n",
--			    got_size/sizeof(uint32_t), got_size);
--#ifdef TARGET_m68k
--    if (got_size > GOT_LIMIT)
--	    fatal("GOT too large: %d bytes (limit = %d bytes)",
--			got_size, GOT_LIMIT);
--#endif
--  }
--
--  for (a = abs_bfd->sections; (a != (asection *) NULL); a = a->next) {
--	section_vma = elf2flt_bfd_section_vma(a);
--
--	if (verbose)
--		printf("SECTION: %s [%p]: flags=0x%x vma=0x%"PRIx32"\n",
--			a->name, a, a->flags, section_vma);
--
--//	if (bfd_is_abs_section(a))
--//		continue;
--	if (bfd_is_und_section(a))
--		continue;
--	if (bfd_is_com_section(a))
--		continue;
--//	if ((a->flags & SEC_RELOC) == 0)
--//		continue;
--
--	/*
--	 * Only relocate things in the writable data sections if we are PIC/GOT.
--	 * Otherwise do text (and read only data) as well.
--	 */
--	if ((!pic_with_got || ALWAYS_RELOC_TEXT) &&
--	    ((a->flags & SEC_CODE) ||
--	     ro_reloc_data_section_should_be_in_text(a)))
--		sectionp = text + (a->vma - text_vma);
--	else if (a->flags & SEC_DATA)
--		sectionp = data + (a->vma - data_vma);
--	else
--		continue;
--
--	/* Now search for the equivalent section in the relocation binary
--	 * and use that relocation information to build reloc entries
--	 * for this one.
--	 */
--	for (r=rel_bfd->sections; r != NULL; r=r->next)
--		if (strcmp(a->name, r->name) == 0)
--			break;
--	if (r == NULL)
--	  continue;
--	if (verbose)
--	  printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"BFD_VMA_FMT"x\n",
--			r->name, r, r->flags, elf2flt_bfd_section_vma(r));
--  	if ((r->flags & SEC_RELOC) == 0)
--  	  continue;
--	relsize = bfd_get_reloc_upper_bound(rel_bfd, r);
--	if (relsize <= 0) {
--		if (verbose)
--			printf("%s(%d): no relocation entries section=%s\n",
--				__FILE__, __LINE__, r->name);
--		continue;
--	}
--
--	symb = get_symbols(rel_bfd, &nsymb);
--	relpp = xmalloc(relsize);
--
--	relcount = bfd_canonicalize_reloc(rel_bfd, r, relpp, symb);
--	if (relcount <= 0) {
--		if (verbose)
--			printf("%s(%d): no relocation entries section=%s\n",
--			__FILE__, __LINE__, r->name);
--		continue;
--	} else {
--#ifdef TARGET_bfin
--		compare_relocs_bfd = abs_bfd;
--		qsort (relpp, relcount, sizeof *relpp, compare_relocs);
--#endif
--		for (p = relpp; (relcount && (*p != NULL)); p++, relcount--) {
--			unsigned char *r_mem = NULL;
--			int relocation_needed = 0;
--			/* Do we need to update the text segment? By default yes if not pic_with_got */
--			int update_text = !pic_with_got;
--
--#ifdef TARGET_v850
--			/* Skip this relocation entirely if possible (we
--			   do this early, before doing any other
--			   processing on it).  */
--			switch ((*p)->howto->type) {
--			case R_V850_9_PCREL:
--			case R_V850_22_PCREL:
--			case R_V850_SDA_16_16_OFFSET:
--			case R_V850_SDA_15_16_OFFSET:
--			case R_V850_ZDA_15_16_OFFSET:
--			case R_V850_TDA_6_8_OFFSET:
--			case R_V850_TDA_7_8_OFFSET:
--			case R_V850_TDA_7_7_OFFSET:
--			case R_V850_TDA_16_16_OFFSET:
--			case R_V850_TDA_4_5_OFFSET:
--			case R_V850_TDA_4_4_OFFSET:
--			case R_V850_SDA_16_16_SPLIT_OFFSET:
--			case R_V850_CALLT_6_7_OFFSET:
--			case R_V850_CALLT_16_16_OFFSET:
--				/* These are relative relocations, which
--				   have already been fixed up by the
--				   linker at this point, so just ignore
--				   them.  */
--				continue;
--			}
--#endif /* USE_V850_RELOCS */
--
--			q = *p;
--			if (q->sym_ptr_ptr && *q->sym_ptr_ptr) {
--				sym_name = (*(q->sym_ptr_ptr))->name;
--				sym_section = (*(q->sym_ptr_ptr))->section;
--				section_name=(*(q->sym_ptr_ptr))->section->name;
--			} else {
--				printf("ERROR: undefined relocation entry\n");
--				rc = -1;
--				continue;
--			}
--#ifndef TARGET_bfin
--			/* Adjust the address to account for the GOT table which wasn't
--			 * present in the relative file link.
--			 */
--			if (pic_with_got && !use_resolved)
--			  q->address += got_size;
--#endif
--
--			/* A pointer to what's being relocated, used often
--			   below.  */
--			r_mem = sectionp + q->address;
--
--			/*
--			 *	Fixup offset in the actual section.
--			 */
--			addstr[0] = 0;
--#if !defined TARGET_e1 && !defined TARGET_bfin
--  			if ((sym_addr = get_symbol_offset((char *) sym_name,
--			    sym_section, symbols, number_of_symbols)) == -1) {
--				sym_addr = 0;
--			}
--#else
--			sym_addr = (*(q->sym_ptr_ptr))->value;
--#endif
--			if (use_resolved) {
--				/* Use the address of the symbol already in
--				   the program text.  How this is handled may
--				   still depend on the particular relocation
--				   though.  */
--				switch (q->howto->type) {
--#ifdef TARGET_v850
--					int r2_type;
--				case R_V850_HI16_S:
--					/* We specially handle adjacent
--					   HI16_S/ZDA_15_16_OFFSET and
--					   HI16_S/LO16 pairs that reference the
--					   same address (these are usually
--					   movhi/ld and movhi/movea pairs,
--					   respectively).  */
--					if (relcount == 0)
--						r2_type = R_V850_NONE;
--					else
--						r2_type = p[1]->howto->type;
--					if ((r2_type == R_V850_ZDA_15_16_OFFSET
--					     || r2_type == R_V850_LO16)
--					    && (p[0]->sym_ptr_ptr
--						== p[1]->sym_ptr_ptr)
--					    && (p[0]->addend == p[1]->addend))
--					{
--						relocation_needed = 1;
--
--						switch (r2_type) {
--						case R_V850_ZDA_15_16_OFFSET:
--							pflags = 0x10000000;
--							break;
--						case R_V850_LO16:
--							pflags = 0x20000000;
--							break;
--						}
--
--						/* We don't really need the
--						   actual value -- the bits
--						   produced by the linker are
--						   what we want in the final
--						   flat file -- but get it
--						   anyway if useful for
--						   debugging.  */
--						if (verbose) {
--							unsigned char *r2_mem =
--								sectionp
--								+ p[1]->address;
--							/* little-endian */
--							int hi = r_mem[0]
--								+ (r_mem[1] << 8);
--							int lo = r2_mem[0]
--								+ (r2_mem[1] << 8);
--							/* Sign extend LO.  */
--							lo = (lo ^ 0x8000)
--								- 0x8000;
--
--							/* Maybe ignore the LSB
--							   of LO, which is
--							   actually part of the
--							   instruction.  */
--							if (r2_type != R_V850_LO16)
--								lo &= ~1;
--
--							sym_addr =
--								(hi << 16)
--								+ lo;
--						}
--					} else
--						goto bad_resolved_reloc;
--					break;
--
--				case R_V850_LO16:
--					/* See if this is actually the
--					   2nd half of a pair.  */
--					if (p > relpp
--					    && (p[-1]->howto->type
--						== R_V850_HI16_S)
--					    && (p[-1]->sym_ptr_ptr
--						== p[0]->sym_ptr_ptr)
--					    && (p[-1]->addend == p[0]->addend))
--						break; /* not an error */
--					else
--						goto bad_resolved_reloc;
--
--				case R_V850_HI16:
--					goto bad_resolved_reloc;
--				default:
--					goto good_32bit_resolved_reloc;
--#elif defined(TARGET_microblaze)
--				case R_MICROBLAZE_64:
--					sym_addr =
--						(r_mem[2] << 24)
--						+ (r_mem[3] << 16)
--						+ (r_mem[6] << 8)
--						+ r_mem[7];
--					relocation_needed = 1;
--					update_text = 0;
--					pflags = 0x80000000;
--					break;
--				case R_MICROBLAZE_GOTPC_64:
--					/* This is data-relative. We can't support this with bflt */
--					goto bad_resolved_reloc;
--				case R_MICROBLAZE_GOT_64:
--					/* This is a GOT relocation. But it is accessed via the GOT register (r20)
--					 * so doesn't need relocation
--					 */
--					relocation_needed = 0;
--					break;
--				case R_MICROBLAZE_32:
--					goto good_32bit_resolved_reloc;
--				/* These are already relocated for us as text-relative, or are dummy entries */
--				case R_MICROBLAZE_64_PCREL:
--				case R_MICROBLAZE_PLT_64:
--				case R_MICROBLAZE_NONE:
--				case R_MICROBLAZE_64_NONE:
--				case R_MICROBLAZE_32_PCREL_LO:
--					relocation_needed = 0;
--					continue;
--				default:
--					goto bad_resolved_reloc;
--#elif defined(TARGET_arm)
--				case R_ARM_TARGET1:
--				case R_ARM_TARGET2:
--				case R_ARM_ABS32:
--					relocation_needed = 1;
--					break;
--				case R_ARM_REL32:
--				case R_ARM_JUMP24:
--				case R_ARM_CALL:
--				case R_ARM_THM_PC11:
--				case R_ARM_THM_PC22:
--				case R_ARM_THM_JUMP24:
--				case R_ARM_PC24:
--				case R_ARM_PLT32:
--				case R_ARM_GOTPC:
--				case R_ARM_GOT32:
--				case R_ARM_PREL31:
--				case R_ARM_V4BX:
--				case R_ARM_NONE:
--					relocation_needed = 0;
--					break;
--				default:
--					goto bad_resolved_reloc;
--#elif defined(TARGET_m68k)
--				case R_68K_32:
--					goto good_32bit_resolved_reloc;
--				case R_68K_PC32:
--				case R_68K_PC16:
--					/* The linker has already resolved
--					   PC relocs for us.  In PIC links,
--					   the symbol must be in the data
--					   segment.  */
--				case R_68K_NONE:
--					continue;
--				default:
--					goto bad_resolved_reloc;
--#elif defined TARGET_bfin
--				case R_BFIN_RIMM16:
--				case R_BFIN_LUIMM16:
--				case R_BFIN_HUIMM16:
--				    sym_vma = elf2flt_bfd_section_vma(sym_section);
--				    sym_addr += sym_vma + q->addend;
--
--				    if (weak_und_symbol(sym_section->name, (*(q->sym_ptr_ptr))))
--					continue;
--				    if (q->howto->type == R_BFIN_RIMM16 && (0xFFFF0000 & sym_addr)) {
--					fprintf (stderr, "Relocation overflow for rN = %s\n",sym_name);
--					bad_relocs++;
--				    }
--				    if ((0xFFFF0000 & sym_addr) != persistent_data) {
--				    flat_relocs = (uint32_t *)
--					(realloc (flat_relocs, (flat_reloc_count + 1) * sizeof (uint32_t)));
--					    if (verbose)
--						    printf("New persistent data for %08"PRIx32"\n", sym_addr);
--					    persistent_data = 0xFFFF0000 & sym_addr;
--					    flat_relocs[flat_reloc_count++]
--						    = (sym_addr >> 16) | (3 << 26);
--				    }
--
--				    flat_relocs = (uint32_t *)
--					(realloc (flat_relocs, (flat_reloc_count + 1) * sizeof (uint32_t)));
--				    if (bfin_set_reloc (flat_relocs + flat_reloc_count,
--							sym_section->name, sym_name,
--							(*(q->sym_ptr_ptr)),
--							q->howto->type == R_BFIN_HUIMM16 ? 1 : 0,
--							section_vma + q->address))
--					bad_relocs++;
--				    if (a->flags & SEC_CODE)
--					text_has_relocs = 1;
--				    flat_reloc_count++;
--				    break;
--
--				case R_BFIN_BYTE4_DATA:
--				    sym_vma = elf2flt_bfd_section_vma(sym_section);
--				    sym_addr += sym_vma + q->addend;
--
--				    if (weak_und_symbol (sym_section->name, (*(q->sym_ptr_ptr))))
--					continue;
--
--				    flat_relocs = (uint32_t *)
--					(realloc (flat_relocs, (flat_reloc_count + 1) * sizeof (uint32_t)));
--				    if (bfin_set_reloc (flat_relocs + flat_reloc_count,
--							sym_section->name, sym_name,
--							(*(q->sym_ptr_ptr)),
--							2, section_vma + q->address))
--					bad_relocs++;
--				    if (a->flags & SEC_CODE)
--					text_has_relocs = 1;
--
--				    flat_reloc_count++;
--				    break;
--#elif defined (TARGET_h8300)
--				case R_H8_DIR32:
--				case R_H8_DIR32A16:
--				case R_H8_DISP32A16:
--				    r_mem[0] = 0;
--				case R_H8_DIR24A8:
--				case R_H8_DIR24R8:
--				    goto good_32bit_resolved_reloc;
--				case R_H8_PCREL8:
--				case R_H8_PCREL16:
--				    continue;
--#elif defined(TARGET_xtensa)
--				case R_XTENSA_NONE:
--				case R_XTENSA_OP0:
--				case R_XTENSA_OP1:
--				case R_XTENSA_OP2:
--				case R_XTENSA_SLOT0_OP:
--				case R_XTENSA_SLOT1_OP:
--				case R_XTENSA_SLOT2_OP:
--				case R_XTENSA_SLOT3_OP:
--				case R_XTENSA_SLOT4_OP:
--				case R_XTENSA_SLOT5_OP:
--				case R_XTENSA_SLOT6_OP:
--				case R_XTENSA_SLOT7_OP:
--				case R_XTENSA_SLOT8_OP:
--				case R_XTENSA_SLOT9_OP:
--				case R_XTENSA_SLOT10_OP:
--				case R_XTENSA_SLOT11_OP:
--				case R_XTENSA_SLOT12_OP:
--				case R_XTENSA_SLOT13_OP:
--				case R_XTENSA_SLOT14_OP:
--				case R_XTENSA_SLOT0_ALT:
--				case R_XTENSA_SLOT1_ALT:
--				case R_XTENSA_SLOT2_ALT:
--				case R_XTENSA_SLOT3_ALT:
--				case R_XTENSA_SLOT4_ALT:
--				case R_XTENSA_SLOT5_ALT:
--				case R_XTENSA_SLOT6_ALT:
--				case R_XTENSA_SLOT7_ALT:
--				case R_XTENSA_SLOT8_ALT:
--				case R_XTENSA_SLOT9_ALT:
--				case R_XTENSA_SLOT10_ALT:
--				case R_XTENSA_SLOT11_ALT:
--				case R_XTENSA_SLOT12_ALT:
--				case R_XTENSA_SLOT13_ALT:
--				case R_XTENSA_SLOT14_ALT:
--				case R_XTENSA_ASM_EXPAND:
--				case R_XTENSA_ASM_SIMPLIFY:
--				case R_XTENSA_DIFF8:
--				case R_XTENSA_DIFF16:
--				case R_XTENSA_DIFF32:
--#if HAVE_BFD_XTENSA_PDIFF_RELOCS
--				case R_XTENSA_PDIFF8:
--				case R_XTENSA_PDIFF16:
--				case R_XTENSA_PDIFF32:
--				case R_XTENSA_NDIFF8:
--				case R_XTENSA_NDIFF16:
--				case R_XTENSA_NDIFF32:
--#endif
--				case R_XTENSA_32_PCREL:
--					continue;
--				case R_XTENSA_32:
--				case R_XTENSA_PLT:
--					if (bfd_big_endian (abs_bfd))
--						sym_addr =
--							(r_mem[0] << 24)
--							+ (r_mem[1] << 16)
--							+ (r_mem[2] << 8)
--							+ r_mem[3];
--					else
--						sym_addr =
--							r_mem[0]
--							+ (r_mem[1] << 8)
--							+ (r_mem[2] << 16)
--							+ (r_mem[3] << 24);
--					relocation_needed = 1;
--					break;
--				default:
--					goto bad_resolved_reloc;
--#elif defined(TARGET_riscv64)
--				case R_RISCV_32_PCREL:
--				case R_RISCV_ADD32:
--				case R_RISCV_ADD64:
--				case R_RISCV_SUB32:
--				case R_RISCV_SUB64:
--					continue;
--				case R_RISCV_32:
--				case R_RISCV_64:
--					goto good_32bit_resolved_reloc;
--				default:
--					goto bad_resolved_reloc;
--#else
--				default:
--					/* The default is to assume that the
--					   relocation is relative and has
--					   already been fixed up by the
--					   linker (perhaps we ought to make
--					   give an error by default, and
--					   require `safe' relocations to be
--					   enumberated explicitly?).  */
--					goto good_32bit_resolved_reloc;
--#endif
--				good_32bit_resolved_reloc: