tic6x: Call _bfd_elf_add_dynamic_tags

Message ID 20200623121612.213092-1-hjl.tools@gmail.com
State New
Headers show
Series
  • tic6x: Call _bfd_elf_add_dynamic_tags
Related show

Commit Message

David Faust via Binutils June 23, 2020, 12:16 p.m.
Update tic6x linker tests to expect C6000_DSBT_BASE, C6000_DSBT_SIZE and
C6000_DSBT_INDEX dynamic tags immediately before NULL dynamic tag.

bfd/

	* elf32-tic6x.c (elf32_tic6x_size_dynamic_sections): Call
	_bfd_elf_add_dynamic_tags.

ld/

	* testsuite/ld-tic6x/shlib-1.rd: Move C6000_DSBT_BASE,
	C6000_DSBT_SIZE and C6000_DSBT_INDEX dynamic tags to the last.
	* testsuite/ld-tic6x/shlib-1b.rd: Likewise.
	* testsuite/ld-tic6x/shlib-1r.rd: Likewise.
	* testsuite/ld-tic6x/shlib-1rb.rd: Likewise.
	* testsuite/ld-tic6x/shlib-app-1.rd: Likewise.
	* testsuite/ld-tic6x/shlib-app-1b.rd: Likewise.
	* testsuite/ld-tic6x/shlib-app-1r.rd: Likewise.
	* testsuite/ld-tic6x/shlib-app-1rb.rd: Likewise.
	* testsuite/ld-tic6x/shlib-noindex.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1b.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1r.rd: Likewise.
	* testsuite/ld-tic6x/static-app-1rb.rd: Likewise.
---
 bfd/elf32-tic6x.c                       | 35 ++-----------------------
 ld/testsuite/ld-tic6x/shlib-1.rd        |  6 ++---
 ld/testsuite/ld-tic6x/shlib-1b.rd       |  6 ++---
 ld/testsuite/ld-tic6x/shlib-1r.rd       |  6 ++---
 ld/testsuite/ld-tic6x/shlib-1rb.rd      |  6 ++---
 ld/testsuite/ld-tic6x/shlib-app-1.rd    |  6 ++---
 ld/testsuite/ld-tic6x/shlib-app-1b.rd   |  6 ++---
 ld/testsuite/ld-tic6x/shlib-app-1r.rd   |  6 ++---
 ld/testsuite/ld-tic6x/shlib-app-1rb.rd  |  6 ++---
 ld/testsuite/ld-tic6x/shlib-noindex.rd  |  6 ++---
 ld/testsuite/ld-tic6x/static-app-1.rd   |  6 ++---
 ld/testsuite/ld-tic6x/static-app-1b.rd  |  6 ++---
 ld/testsuite/ld-tic6x/static-app-1r.rd  |  6 ++---
 ld/testsuite/ld-tic6x/static-app-1rb.rd |  6 ++---
 14 files changed, 41 insertions(+), 72 deletions(-)

-- 
2.26.2

Comments

David Faust via Binutils June 29, 2020, 11:44 a.m. | #1
Hi H.J.

> bfd/

> 

> 	* elf32-tic6x.c (elf32_tic6x_size_dynamic_sections): Call

> 	_bfd_elf_add_dynamic_tags.

> 

> ld/

> 

> 	* testsuite/ld-tic6x/shlib-1.rd: Move C6000_DSBT_BASE,

> 	C6000_DSBT_SIZE and C6000_DSBT_INDEX dynamic tags to the last.

> 	* testsuite/ld-tic6x/shlib-1b.rd: Likewise.

> 	* testsuite/ld-tic6x/shlib-1r.rd: Likewise.

> 	* testsuite/ld-tic6x/shlib-1rb.rd: Likewise.

> 	* testsuite/ld-tic6x/shlib-app-1.rd: Likewise.

> 	* testsuite/ld-tic6x/shlib-app-1b.rd: Likewise.

> 	* testsuite/ld-tic6x/shlib-app-1r.rd: Likewise.

> 	* testsuite/ld-tic6x/shlib-app-1rb.rd: Likewise.

> 	* testsuite/ld-tic6x/shlib-noindex.rd: Likewise.

> 	* testsuite/ld-tic6x/static-app-1.rd: Likewise.

> 	* testsuite/ld-tic6x/static-app-1b.rd: Likewise.

> 	* testsuite/ld-tic6x/static-app-1r.rd: Likewise.

> 	* testsuite/ld-tic6x/static-app-1rb.rd: Likewise.

 
Approved - please apply.

Cheers
  Nick

Patch

diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 1de4a57d5f..d5fe06e7ea 100644
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -3352,11 +3352,8 @@  elf32_tic6x_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
 #define add_dynamic_entry(TAG, VAL) \
   _bfd_elf_add_dynamic_entry (info, TAG, VAL)
 
-      if (bfd_link_executable (info))
-	{
-	  if (!add_dynamic_entry (DT_DEBUG, 0))
-	    return FALSE;
-	}
+      if (!_bfd_elf_add_dynamic_tags (output_bfd, info, relocs))
+	return FALSE;
 
       if (!add_dynamic_entry (DT_C6000_DSBT_BASE, 0)
 	  || !add_dynamic_entry (DT_C6000_DSBT_SIZE, htab->params.dsbt_size)
@@ -3364,34 +3361,6 @@  elf32_tic6x_size_dynamic_sections (bfd *output_bfd, struct bfd_link_info *info)
 				 htab->params.dsbt_index))
 	return FALSE;
 
-      if (htab->elf.splt->size != 0)
-	{
-	  if (!add_dynamic_entry (DT_PLTGOT, 0)
-	      || !add_dynamic_entry (DT_PLTRELSZ, 0)
-	      || !add_dynamic_entry (DT_PLTREL, DT_RELA)
-	      || !add_dynamic_entry (DT_JMPREL, 0))
-	    return FALSE;
-	}
-
-      if (relocs)
-	{
-	  if (!add_dynamic_entry (DT_RELA, 0)
-	      || !add_dynamic_entry (DT_RELASZ, 0)
-	      || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela)))
-	    return FALSE;
-
-	  /* If any dynamic relocs apply to a read-only section,
-	     then we need a DT_TEXTREL entry.  */
-	  if ((info->flags & DF_TEXTREL) == 0)
-	    elf_link_hash_traverse (&htab->elf,
-				    _bfd_elf_maybe_set_textrel, info);
-
-	  if ((info->flags & DF_TEXTREL) != 0)
-	    {
-	      if (!add_dynamic_entry (DT_TEXTREL, 0))
-		return FALSE;
-	    }
-	}
     }
 #undef add_dynamic_entry
 
diff --git a/ld/testsuite/ld-tic6x/shlib-1.rd b/ld/testsuite/ld-tic6x/shlib-1.rd
index 469bce9e34..af3815c16c 100644
--- a/ld/testsuite/ld-tic6x/shlib-1.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1.rd
@@ -47,9 +47,6 @@  Dynamic section at offset 0x1154 contains 16 entries:
  0x00000006 \(SYMTAB\)                     0x8044
  0x0000000a \(STRSZ\)                      18 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
- 0x70000000 \(C6000_DSBT_BASE\)            0x10000100
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x2
  0x00000003 \(PLTGOT\)                     0x1000010c
  0x00000002 \(PLTRELSZ\)                   24 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
@@ -57,6 +54,9 @@  Dynamic section at offset 0x1154 contains 16 entries:
  0x00000007 \(RELA\)                       0x8118
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x10000100
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x2
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x1118 contains 3 entries:
diff --git a/ld/testsuite/ld-tic6x/shlib-1b.rd b/ld/testsuite/ld-tic6x/shlib-1b.rd
index 469bce9e34..af3815c16c 100644
--- a/ld/testsuite/ld-tic6x/shlib-1b.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1b.rd
@@ -47,9 +47,6 @@  Dynamic section at offset 0x1154 contains 16 entries:
  0x00000006 \(SYMTAB\)                     0x8044
  0x0000000a \(STRSZ\)                      18 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
- 0x70000000 \(C6000_DSBT_BASE\)            0x10000100
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x2
  0x00000003 \(PLTGOT\)                     0x1000010c
  0x00000002 \(PLTRELSZ\)                   24 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
@@ -57,6 +54,9 @@  Dynamic section at offset 0x1154 contains 16 entries:
  0x00000007 \(RELA\)                       0x8118
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x10000100
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x2
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x1118 contains 3 entries:
diff --git a/ld/testsuite/ld-tic6x/shlib-1r.rd b/ld/testsuite/ld-tic6x/shlib-1r.rd
index 469bce9e34..af3815c16c 100644
--- a/ld/testsuite/ld-tic6x/shlib-1r.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1r.rd
@@ -47,9 +47,6 @@  Dynamic section at offset 0x1154 contains 16 entries:
  0x00000006 \(SYMTAB\)                     0x8044
  0x0000000a \(STRSZ\)                      18 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
- 0x70000000 \(C6000_DSBT_BASE\)            0x10000100
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x2
  0x00000003 \(PLTGOT\)                     0x1000010c
  0x00000002 \(PLTRELSZ\)                   24 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
@@ -57,6 +54,9 @@  Dynamic section at offset 0x1154 contains 16 entries:
  0x00000007 \(RELA\)                       0x8118
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x10000100
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x2
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x1118 contains 3 entries:
diff --git a/ld/testsuite/ld-tic6x/shlib-1rb.rd b/ld/testsuite/ld-tic6x/shlib-1rb.rd
index 469bce9e34..af3815c16c 100644
--- a/ld/testsuite/ld-tic6x/shlib-1rb.rd
+++ b/ld/testsuite/ld-tic6x/shlib-1rb.rd
@@ -47,9 +47,6 @@  Dynamic section at offset 0x1154 contains 16 entries:
  0x00000006 \(SYMTAB\)                     0x8044
  0x0000000a \(STRSZ\)                      18 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
- 0x70000000 \(C6000_DSBT_BASE\)            0x10000100
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x2
  0x00000003 \(PLTGOT\)                     0x1000010c
  0x00000002 \(PLTRELSZ\)                   24 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
@@ -57,6 +54,9 @@  Dynamic section at offset 0x1154 contains 16 entries:
  0x00000007 \(RELA\)                       0x8118
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x10000100
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x2
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x1118 contains 3 entries:
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1.rd b/ld/testsuite/ld-tic6x/shlib-app-1.rd
index ad181eb036..4725356d09 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1.rd
@@ -50,9 +50,6 @@  Dynamic section at offset 0x1150 contains 18 entries:
  0x0000000a \(STRSZ\)                      34 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000003 \(PLTGOT\)                     0x100000ac
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
@@ -60,6 +57,9 @@  Dynamic section at offset 0x1150 contains 18 entries:
  0x00000007 \(RELA\)                       0x8114
  0x00000008 \(RELASZ\)                     72 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x1114 contains 2 entries:
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1b.rd b/ld/testsuite/ld-tic6x/shlib-app-1b.rd
index 6390a5da8e..4564ffeecb 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1b.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1b.rd
@@ -50,9 +50,6 @@  Dynamic section at offset 0x1150 contains 18 entries:
  0x0000000a \(STRSZ\)                      35 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000003 \(PLTGOT\)                     0x100000ac
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
@@ -60,6 +57,9 @@  Dynamic section at offset 0x1150 contains 18 entries:
  0x00000007 \(RELA\)                       0x8114
  0x00000008 \(RELASZ\)                     72 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x1114 contains 2 entries:
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1r.rd b/ld/testsuite/ld-tic6x/shlib-app-1r.rd
index 4a38da9dba..797b8aad1c 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1r.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1r.rd
@@ -49,9 +49,6 @@  Dynamic section at offset 0x110c contains 18 entries:
  0x0000000a \(STRSZ\)                      29 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000003 \(PLTGOT\)                     0x100000ac
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
@@ -59,6 +56,9 @@  Dynamic section at offset 0x110c contains 18 entries:
  0x00000007 \(RELA\)                       0x80e8
  0x00000008 \(RELASZ\)                     48 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x10e8 contains 2 entries:
diff --git a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
index 2ad86cb187..d23eb2aa28 100644
--- a/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
+++ b/ld/testsuite/ld-tic6x/shlib-app-1rb.rd
@@ -49,9 +49,6 @@  Dynamic section at offset 0x110c contains 18 entries:
  0x0000000a \(STRSZ\)                      30 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000003 \(PLTGOT\)                     0x100000ac
  0x00000002 \(PLTRELSZ\)                   12 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
@@ -59,6 +56,9 @@  Dynamic section at offset 0x110c contains 18 entries:
  0x00000007 \(RELA\)                       0x80e8
  0x00000008 \(RELASZ\)                     48 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x100000a0
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x10e8 contains 2 entries:
diff --git a/ld/testsuite/ld-tic6x/shlib-noindex.rd b/ld/testsuite/ld-tic6x/shlib-noindex.rd
index ea515be556..bca8810fa5 100644
--- a/ld/testsuite/ld-tic6x/shlib-noindex.rd
+++ b/ld/testsuite/ld-tic6x/shlib-noindex.rd
@@ -48,9 +48,6 @@  Dynamic section at offset 0x1160 contains 17 entries:
  0x00000006 \(SYMTAB\)                     0x8044
  0x0000000a \(STRSZ\)                      18 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
- 0x70000000 \(C6000_DSBT_BASE\)            0x10000100
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000003 \(PLTGOT\)                     0x1000010c
  0x00000002 \(PLTRELSZ\)                   24 \(bytes\)
  0x00000014 \(PLTREL\)                     RELA
@@ -59,6 +56,9 @@  Dynamic section at offset 0x1160 contains 17 entries:
  0x00000008 \(RELASZ\)                     96 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
  0x00000016 \(TEXTREL\)                    0x0
+ 0x70000000 \(C6000_DSBT_BASE\)            0x10000100
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.text' at offset 0x1118 contains 1 entry:
diff --git a/ld/testsuite/ld-tic6x/static-app-1.rd b/ld/testsuite/ld-tic6x/static-app-1.rd
index 8fa34377e3..ba0006512e 100644
--- a/ld/testsuite/ld-tic6x/static-app-1.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1.rd
@@ -46,12 +46,12 @@  Dynamic section at offset 0x1128 contains 13 entries:
  0x0000000a \(STRSZ\)                      10 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000007 \(RELA\)                       0x80d4
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
diff --git a/ld/testsuite/ld-tic6x/static-app-1b.rd b/ld/testsuite/ld-tic6x/static-app-1b.rd
index 8fa34377e3..ba0006512e 100644
--- a/ld/testsuite/ld-tic6x/static-app-1b.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1b.rd
@@ -46,12 +46,12 @@  Dynamic section at offset 0x1128 contains 13 entries:
  0x0000000a \(STRSZ\)                      10 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000007 \(RELA\)                       0x80d4
  0x00000008 \(RELASZ\)                     84 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
diff --git a/ld/testsuite/ld-tic6x/static-app-1r.rd b/ld/testsuite/ld-tic6x/static-app-1r.rd
index 9b05b466ed..c0f934b987 100644
--- a/ld/testsuite/ld-tic6x/static-app-1r.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1r.rd
@@ -46,12 +46,12 @@  Dynamic section at offset 0x1110 contains 13 entries:
  0x0000000a \(STRSZ\)                      10 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000007 \(RELA\)                       0x80d4
  0x00000008 \(RELASZ\)                     60 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries:
diff --git a/ld/testsuite/ld-tic6x/static-app-1rb.rd b/ld/testsuite/ld-tic6x/static-app-1rb.rd
index 9b05b466ed..c0f934b987 100644
--- a/ld/testsuite/ld-tic6x/static-app-1rb.rd
+++ b/ld/testsuite/ld-tic6x/static-app-1rb.rd
@@ -46,12 +46,12 @@  Dynamic section at offset 0x1110 contains 13 entries:
  0x0000000a \(STRSZ\)                      10 \(bytes\)
  0x0000000b \(SYMENT\)                     16 \(bytes\)
  0x00000015 \(DEBUG\)                      0x0
- 0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
- 0x70000001 \(C6000_DSBT_SIZE\)            0x3
- 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000007 \(RELA\)                       0x80d4
  0x00000008 \(RELASZ\)                     60 \(bytes\)
  0x00000009 \(RELAENT\)                    12 \(bytes\)
+ 0x70000000 \(C6000_DSBT_BASE\)            0x100000c0
+ 0x70000001 \(C6000_DSBT_SIZE\)            0x3
+ 0x70000003 \(C6000_DSBT_INDEX\)           0x0
  0x00000000 \(NULL\)                       0x0
 
 Relocation section '\.rela\.got' at offset 0x10d4 contains 3 entries: