From 2e93abb858ae4ff2b8605b4a94988068869c0ff1 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 9 Jan 2024 06:30:28 -0800
Subject: x86: Don't check R_386_NONE nor R_X86_64_NONE

Update x86 ELF linker to skip R_386_NONE/R_X86_64_NONE when scanning
relocations.

bfd/

	* PR ld/31047
	* elf32-i386.c (elf_i386_scan_relocs): Don't check R_386_NONE.
	* elf64-x86-64.c (elf_x86_64_scan_relocs): Don't check
	R_X86_64_NONE.

ld/

	* PR ld/31047
	* testsuite/ld-i386/i386.exp: Run PR ld/31047 test.
	* testsuite/ld-x86-64/x86-64.exp: Likewise.
	* testsuite/ld-i386/pr31047.d: New file.
	* testsuite/ld-x86-64/pr31047-x32.d: Likewise.
	* testsuite/ld-x86-64/pr31047.d: Likewise.
	* testsuite/ld-x86-64/pr31047a.s: Likewise.
	* testsuite/ld-x86-64/pr31047b.s: Likewise.
---
 ld/testsuite/ld-i386/i386.exp        |  1 +
 ld/testsuite/ld-i386/pr31047.d       | 13 +++++++++++++
 ld/testsuite/ld-x86-64/pr31047-x32.d | 13 +++++++++++++
 ld/testsuite/ld-x86-64/pr31047.d     | 13 +++++++++++++
 ld/testsuite/ld-x86-64/pr31047a.s    |  3 +++
 ld/testsuite/ld-x86-64/pr31047b.s    |  6 ++++++
 ld/testsuite/ld-x86-64/x86-64.exp    |  2 ++
 7 files changed, 51 insertions(+)
 create mode 100644 ld/testsuite/ld-i386/pr31047.d
 create mode 100644 ld/testsuite/ld-x86-64/pr31047-x32.d
 create mode 100644 ld/testsuite/ld-x86-64/pr31047.d
 create mode 100644 ld/testsuite/ld-x86-64/pr31047a.s
 create mode 100644 ld/testsuite/ld-x86-64/pr31047b.s

(limited to 'ld')

diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index c7df773..18d1c91 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -512,6 +512,7 @@ run_dump_test "dt-relr-1b"
 run_dump_test "pr28870"
 run_dump_test "pr28894"
 run_dump_test "pr30787"
+run_dump_test "pr31047"
 
 if { !([istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
diff --git a/ld/testsuite/ld-i386/pr31047.d b/ld/testsuite/ld-i386/pr31047.d
new file mode 100644
index 0000000..9c96d82
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr31047.d
@@ -0,0 +1,13 @@
+#source: ../ld-x86-64/pr31047a.s
+#source: ../ld-x86-64/pr31047b.s
+#as: --32
+#ld: -pie -melf_i386
+#objdump: -dw
+
+.*: +file format .*
+
+
+Disassembly of section .text:
+
+[a-f0-9]+ <_start>:
+ +[a-f0-9]+:	90                   	nop
diff --git a/ld/testsuite/ld-x86-64/pr31047-x32.d b/ld/testsuite/ld-x86-64/pr31047-x32.d
new file mode 100644
index 0000000..87bb92c
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr31047-x32.d
@@ -0,0 +1,13 @@
+#source: pr31047a.s
+#source: pr31047b.s
+#as: --x32
+#ld: -pie -melf32_x86_64
+#objdump: -dw
+
+.*: +file format .*
+
+
+Disassembly of section .text:
+
+[a-f0-9]+ <_start>:
+ +[a-f0-9]+:	90                   	nop
diff --git a/ld/testsuite/ld-x86-64/pr31047.d b/ld/testsuite/ld-x86-64/pr31047.d
new file mode 100644
index 0000000..5c3047c
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr31047.d
@@ -0,0 +1,13 @@
+#source: pr31047a.s
+#source: pr31047b.s
+#as: --64
+#ld: -pie -melf_x86_64
+#objdump: -dw
+
+.*: +file format .*
+
+
+Disassembly of section .text:
+
+[a-f0-9]+ <_start>:
+ +[a-f0-9]+:	90                   	nop
diff --git a/ld/testsuite/ld-x86-64/pr31047a.s b/ld/testsuite/ld-x86-64/pr31047a.s
new file mode 100644
index 0000000..9d4777e
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr31047a.s
@@ -0,0 +1,3 @@
+	.globl foo
+	foo = 0x1000
+	.section .note.GNU-stack,"",@progbits
diff --git a/ld/testsuite/ld-x86-64/pr31047b.s b/ld/testsuite/ld-x86-64/pr31047b.s
new file mode 100644
index 0000000..1f0169a
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr31047b.s
@@ -0,0 +1,6 @@
+	.text
+	.globl _start
+_start:
+	.nop
+	.reloc 0, BFD_RELOC_NONE, foo
+	.section .note.GNU-stack,"",@progbits
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 0af9f04..03266cb 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -511,6 +511,8 @@ run_dump_test "dt-relr-1a-x32"
 run_dump_test "dt-relr-1b"
 run_dump_test "dt-relr-1b-x32"
 run_dump_test "pr30787"
+run_dump_test "pr31047"
+run_dump_test "pr31047-x32"
 
 if { ![skip_sframe_tests] } {
     run_dump_test "sframe-simple-1"
-- 
cgit v1.1