[PATCH, ld, Aarch64] Fix name of aarch64 reloc test to match reloc number

Thomas Preud'homme thomas.preudhomme@arm.com
Fri Jul 24 09:02:00 GMT 2015


The name of the test added in GNU ld for GNUTOOLS-4952 is inconsistent with
the relocation being tested (bad copy paste). This patch fix that.

ChangeLog entry is as follows:

*** ld/testsuite/ChangeLog ***

2015-07-10  Thomas Preud'homme <thomas.preudhomme@arm.com>

        * ld-aarch64/aarch64-elf.exp: Rename relocs-257-symbolic-func to
        relocs-1027-symbolic-func.
        * ld-aarch64/relocs-257-symbolic-func.d: Rename to ...
        * ld-aarch64/relocs-1027-symbolic-func.d: ... this.
        * ld-aarch64/relocs-257-symbolic-func.s: Rename to ...
        * ld-aarch64/relocs-1027-symbolic-func.s: ... this.


diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
index 021343b..0ffbaa3 100644
--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
+++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
@@ -193,7 +193,7 @@ run_dump_test "ifunc-21"
 run_dump_test "ifunc-22"
 
 run_dump_test "relasz"
-run_dump_test "relocs-257-symbolic-func"
+run_dump_test "relocs-1027-symbolic-func"
 
 set aarch64elflinktests {
   {"ld-aarch64/so with global symbol" "-shared" "" "" {copy-reloc-so.s}
diff --git a/ld/testsuite/ld-aarch64/relocs-1027-symbolic-func.d b/ld/testsuite/ld-aarch64/relocs-1027-symbolic-func.d
new file mode 100644
index 0000000..19b81f3
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/relocs-1027-symbolic-func.d
@@ -0,0 +1,5 @@
+#source: relocs-1027-symbolic-func.s
+#ld: -shared -Bsymbolic-functions
+#readelf: -r --wide
+#...
+.* +R_AARCH64_RELATIVE +.*
diff --git a/ld/testsuite/ld-aarch64/relocs-1027-symbolic-func.s b/ld/testsuite/ld-aarch64/relocs-1027-symbolic-func.s
new file mode 100644
index 0000000..35d5ba8
--- /dev/null
+++ b/ld/testsuite/ld-aarch64/relocs-1027-symbolic-func.s
@@ -0,0 +1,11 @@
+	.text
+	.global tempy
+	.type   tempy, %function
+tempy:
+	.size   tempy, .-tempy
+	.section	.data.rel
+	.align 3
+	.type   tempy_ptr, %object
+	.size   tempy_ptr, 8
+tempy_ptr:
+	.xword	tempy
diff --git a/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.d b/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.d
deleted file mode 100644
index 810fd43..0000000
--- a/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.d
+++ /dev/null
@@ -1,5 +0,0 @@
-#source: relocs-257-symbolic-func.s
-#ld: -shared -Bsymbolic-functions
-#readelf: -r --wide
-#...
-.* +R_AARCH64_RELATIVE +.*
diff --git a/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.s b/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.s
deleted file mode 100644
index 35d5ba8..0000000
--- a/ld/testsuite/ld-aarch64/relocs-257-symbolic-func.s
+++ /dev/null
@@ -1,11 +0,0 @@
-	.text
-	.global tempy
-	.type   tempy, %function
-tempy:
-	.size   tempy, .-tempy
-	.section	.data.rel
-	.align 3
-	.type   tempy_ptr, %object
-	.size   tempy_ptr, 8
-tempy_ptr:
-	.xword	tempy

No regression was observed when running the testsuite for aarch64-none-linux-gnu.

Is this ok for master?

Best regards,

Thomas




More information about the Binutils mailing list