Fix the evaluation of RL78 complex relocs, by making immediate values be computed...

gas	* config/tc-rl78.c (rl78_abs_sym): New local variable.
	(md_begin): Initialise the new symbol.
	(OPIMM): Define the value to be relative to the new symbol and not
	the absolute section symbol.

ld	* emulparams/elf32rl78.sh (OTHER_SECTIONS): Provide a value for
	the _-rl78_abs__ symbol.

tests	* gas/all/struct.d: Allow for extra symbols in the output.
	* gas/macros/test1.d: Likewise.
	* gas/elf/elf.exp: Add an rl78 machine.
	* gas/elf/sections2e-rl78: New file.

tests	* binutils-all/localize-hidden-1.d: Allow for extra symbols in the
	output.
        * binutils-all/strip-11.d: Skip for the RL78.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 5f4fbc3a9250a78adc48d96b36532ad7bc4236b3..a0fb9620d21b1bb6df261a603b602fd4a4a0a6a4 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-24  Nick Clifton  <nickc@redhat.com>
+
+       * binutils-all/localize-hidden-1.d: Allow for extra symbols in the
+       output.
+        * binutils-all/strip-11.d: Skip for the RL78.
+
 2015-07-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        * binutils-all/compress.exp: Update.

diff --git a/binutils/testsuite/binutils-all/localize-hidden-1.d b/binutils/testsuite/binutils-all/localize-hidden-1.d
index a5286ed1e814211cf8b3873f985567321caa5874..60dc556e46517f1b40ec095d42d1a53a76df9e0a 100644 (file)
--- a/binutils/testsuite/binutils-all/localize-hidden-1.d
+++ b/binutils/testsuite/binutils-all/localize-hidden-1.d
@@ -12,6 +12,7 @@
 0+2300 l .*\*ABS\*     0+ \.internal Ginternal
 0+3200 l .*\*ABS\*     0+ \.hidden Whidden
 0+3300 l .*\*ABS\*     0+ \.internal Winternal
+#...
 0+2100 g .*\*ABS\*     0+ Gdefault
 0+2400 g .*\*ABS\*     0+ \.protected Gprotected
 0+3100  w.*\*ABS\*     0+ Wdefault

diff --git a/binutils/testsuite/binutils-all/strip-11.d b/binutils/testsuite/binutils-all/strip-11.d
index 04c47ab17c91bcc635dc4946288263428aed33f1..92a6b6b7231efdff161d01c587e61127f0dc62bd 100644 (file)
--- a/binutils/testsuite/binutils-all/strip-11.d
+++ b/binutils/testsuite/binutils-all/strip-11.d
@@ -3,6 +3,8 @@
 #strip: -g
 #readelf: -S --wide
 #name: strip -g empty file
+# The RL78 linker scripts always PROVIDE a __rl78_abs__ symbol so the stripped symbol table is never empty.
+#not-target: rl78-*-*
 
 #...
   \[ 0\] +NULL +0+ .*

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 27d1ce01b2a203cdba1a6d73a4656bbaf13fcaf7..49fd6c537a7af4dae1bdf4ccb58a8b733ca028ab 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-24  Nick Clifton  <nickc@redhat.com>
+
+       * config/tc-rl78.c (rl78_abs_sym): New local variable.
+       (md_begin): Initialise the new symbol.
+       (OPIMM): Define the value to be relative to the new symbol and not
+       the absolute section symbol.
+
 2015-07-22  Alan Modra  <amodra@gmail.com>
 
        PR gas/18687

diff --git a/gas/config/tc-rl78.c b/gas/config/tc-rl78.c
index 3a14fc087689aa09d787501393b036632c427dba..c9d5c9791d899c7269ba6cfaa675535904626bcf 100644 (file)
--- a/gas/config/tc-rl78.c
+++ b/gas/config/tc-rl78.c
@@ -402,9 +402,12 @@ const pseudo_typeS md_pseudo_table[] =
   { NULL,      NULL,           0 }
 };
 
+static symbolS * rl78_abs_sym = NULL;
+
 void
 md_begin (void)
 {
+  rl78_abs_sym = symbol_make ("__rl78_abs__");
 }
 
 void
@@ -1240,7 +1243,17 @@ tc_gen_reloc (asection * seg ATTRIBUTE_UNUSED, fixS * fixp)
   reloc[rp]->address       = fixp->fx_frag->fr_address + fixp->fx_where;       \
   reloc[++rp] = NULL
 #define OPSYM(SYM) OPX(BFD_RELOC_RL78_SYM, SYM, 0)
-#define OPIMM(IMM) OPX(BFD_RELOC_RL78_SYM, abs_symbol.bsym, IMM)
+
+  /* FIXME: We cannot do the normal thing for an immediate value reloc,
+     ie creating a RL78_SYM reloc in the *ABS* section with an offset
+     equal to the immediate value we want to store.  This fails because
+     the reloc processing in bfd_perform_relocation and bfd_install_relocation
+     will short circuit such relocs and never pass them on to the special
+     reloc processing code.  So instead we create a RL78_SYM reloc against
+     the __rl78_abs__ symbol and arrange for the linker scripts to place
+     this symbol at address 0.  */
+#define OPIMM(IMM) OPX (BFD_RELOC_RL78_SYM, symbol_get_bfdsym (rl78_abs_sym), IMM)
+      
 #define OP(OP) OPX(BFD_RELOC_RL78_##OP, *reloc[0]->sym_ptr_ptr, 0)
 #define SYM0() reloc[0]->howto = bfd_reloc_type_lookup (stdoutput, BFD_RELOC_RL78_SYM)
 

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 19b8266bad7816e86f27e65adb84a656a9c1f0f5..909c2156c8fae2b4ebb8b3ced6765c8328c4a87e 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-24  Nick Clifton  <nickc@redhat.com>
+
+       * gas/all/struct.d: Allow for extra symbols in the output.
+       * gas/macros/test1.d: Likewise.
+       * gas/elf/elf.exp: Add an rl78 machine.
+       * gas/elf/sections2e-rl78: New file.
+
 2015-07-22  Alexander Fomin  <alexander.fomin@intel.com>
 
        PR binutils/18631

diff --git a/gas/testsuite/gas/all/struct.d b/gas/testsuite/gas/all/struct.d
index 8dc5dd48c1093fb703cbcbc7b8e983ac7c6e9b76..d59a8dd5b1f1e6d7addc31449d9476c67f364a4f 100644 (file)
--- a/gas/testsuite/gas/all/struct.d
+++ b/gas/testsuite/gas/all/struct.d
@@ -2,7 +2,7 @@
 #name: struct
 
 # Test the .struct pseudo-op.
-
+#...
 0+00 A w1
 0+02 A w2
 0+04 A w3

diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index ff19badefb836955bf878830cc7e4199f389efc0..496e01a4ff31a6be8187aee64bfc3360c707997f 100644 (file)
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -79,6 +79,9 @@ if { [is_elf_format] } then {
     if {[istarget "v850*-*-*"]} then {
        set target_machine -v850
     }
+    if {[istarget "rl78-*-*"]} then {
+       set target_machine -rl78
+    }
     if {[istarget "arm*-*-*"]} {
        set target_machine -arm
     }

diff --git a/gas/testsuite/gas/elf/section2.e-rl78 b/gas/testsuite/gas/elf/section2.e-rl78
new file mode 100644 (file)
index 0000000..3863b6d
--- /dev/null
+++ b/gas/testsuite/gas/elf/section2.e-rl78
@@ -0,0 +1,9 @@
+
+Symbol table '.symtab' contains 6 entries:
+ +Num: +Value +Size +Type +Bind +Vis +Ndx +Name
+ +0: 0+0 +0 +NOTYPE +LOCAL +DEFAULT +UND 
+ +1: 0+0 +0 +SECTION +LOCAL +DEFAULT +1 
+ +2: 0+0 +0 +SECTION +LOCAL +DEFAULT +2 
+ +3: 0+0 +0 +SECTION +LOCAL +DEFAULT +3 
+ +4: 0+0 +0 +SECTION +LOCAL +DEFAULT +4 
+ +5: 0+0 +0 +NOTYPE +GLOBAL +DEFAULT +UND __rl78_abs__

diff --git a/gas/testsuite/gas/macros/test1.d b/gas/testsuite/gas/macros/test1.d
index f6d7fa4506e603698f3bbbdbb6d63adc1c6af183..fe1643472ab9c0c5de0d816e960aa4aa1f186247 100644 (file)
--- a/gas/testsuite/gas/macros/test1.d
+++ b/gas/testsuite/gas/macros/test1.d
@@ -1,5 +1,6 @@
 #nm: --extern-only
 #name: macro test 1
 
+#...
 0+01 A s_not_a_reg_1
 0+02 A s_not_a_reg_2

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 15137e245672db1814d43cee82682fba7c21cd56..6df6a860df0d2c9adef2b2a141fc1801ee65db20 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-24  Nick Clifton  <nickc@redhat.com>
+
+       * emulparams/elf32rl78.sh (OTHER_SECTIONS): Provide a value for
+       the _-rl78_abs__ symbol.
+
 2015-07-20  Alan Modra  <amodra@gmail.com>
 
        * emulparams/criself.sh (INIT_ADDR, FINI_ADDR): Define.

diff --git a/ld/emulparams/elf32rl78.sh b/ld/emulparams/elf32rl78.sh
index e305aa1fc4b38bbae68edd171983c1de76eb021e..7073efb04315180e401847161e3d5d4c138d7194 100644 (file)
--- a/ld/emulparams/elf32rl78.sh
+++ b/ld/emulparams/elf32rl78.sh
@@ -8,7 +8,7 @@ ENTRY=_start
 EMBEDDED=yes
 TEMPLATE_NAME=elf32
 ELFSIZE=32
-EXTRA_EM_FILE=needrelax
+# EXTRA_EM_FILE=needrelax
 MAXPAGESIZE=256
 # This is like setting STACK_ADDR to 0xffedc, except that the setting can
 # be overridden, e.g. --defsym _stack=0x0f00, and that we put an extra
@@ -21,6 +21,7 @@ test -z "$CREATE_SHLIB" && OTHER_SECTIONS="  .stack        ${RELOCATING-0}${RELO
     ${RELOCATING+__stack = .;}
     *(.stack)
     LONG(0xdead)
-  }"
+  }
+  ${RELOCATING+PROVIDE (__rl78_abs__ = 0);}"
 # We do not need .stack for shared library.
 test -n "$CREATE_SHLIB" && OTHER_SECTIONS=""