From b59d128a112d441c657195939340698548862cec Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 25 Jun 2020 11:11:51 +0100
Subject: [PATCH] Stop the assembler from generating R_ARM_THM_JMP11
 relocations as these are not supported by the kernel.

	PR 26141
	* config/tc-arm.c (arm_force_relocation): Force resolution of
	BFD_RELOC_THUMB_PCREL_BRANCH12 relocations.
	* testsuite/gas/arm/plt-1.d: Adjust expected disassembly.
---
 gas/ChangeLog                 |  7 +++++++
 gas/config/tc-arm.c           |  1 +
 gas/testsuite/gas/arm/plt-1.d | 12 ++++--------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8fc1d8417c9..038ae0c47b4 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2020-06-25  Nick Clifton  <nickc@redhat.com>
+
+	PR 26141
+	* config/tc-arm.c (arm_force_relocation): Force resolution of
+	BFD_RELOC_THUMB_PCREL_BRANCH12 relocations.
+	* testsuite/gas/arm/plt-1.d: Adjust expected disassembly.
+
 2020-06-25  Jan Beulich  <jbeulich@suse.com>
 
 	* config/tc-i386.c (md_assemble): Move call to process_immext()
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 00fa2c76c83..a7e0ae785b7 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -30369,6 +30369,7 @@ arm_force_relocation (struct fix * fixp)
       || fixp->fx_r_type == BFD_RELOC_ARM_CP_OFF_IMM
       || fixp->fx_r_type == BFD_RELOC_ARM_CP_OFF_IMM_S2
       || fixp->fx_r_type == BFD_RELOC_ARM_THUMB_OFFSET
+      || fixp->fx_r_type == BFD_RELOC_THUMB_PCREL_BRANCH12
       || fixp->fx_r_type == BFD_RELOC_ARM_T32_ADD_IMM
       || fixp->fx_r_type == BFD_RELOC_ARM_T32_IMMEDIATE
       || fixp->fx_r_type == BFD_RELOC_ARM_T32_IMM12
diff --git a/gas/testsuite/gas/arm/plt-1.d b/gas/testsuite/gas/arm/plt-1.d
index 4f1fe9c0c83..1f8046ef2ef 100644
--- a/gas/testsuite/gas/arm/plt-1.d
+++ b/gas/testsuite/gas/arm/plt-1.d
@@ -14,25 +14,21 @@ Disassembly of section \.text:
 			0: R_ARM_THM_JUMP24	Strong2
    4:	f7ff bffe 	b\.w	14 <Strong2>
 			4: R_ARM_THM_JUMP24	Strong2
-   8:	e7fe      	b\.n	14 <Strong2>
-			8: R_ARM_THM_JUMP11	Strong2
+   8:	e004      	b\.n	14 <Strong2>
    a:	f7ff bffe 	b\.w	14 <Strong2>
 			a: R_ARM_THM_JUMP24	Strong2
    e:	f7ff bffe 	b\.w	14 <Strong2>
 			e: R_ARM_THM_JUMP24	Strong2
-  12:	e7fe      	b\.n	14 <Strong2>
-			12: R_ARM_THM_JUMP11	Strong2
+  12:	e7ff      	b\.n	14 <Strong2>
 
 0+014 <Strong2>:
   14:	f7ff bffe 	b\.w	0 <Strong1>
 			14: R_ARM_THM_JUMP24	Strong1
   18:	f7ff bffe 	b\.w	0 <Strong1>
 			18: R_ARM_THM_JUMP24	Strong1
-  1c:	e7fe      	b\.n	0 <Strong1>
-			1c: R_ARM_THM_JUMP11	Strong1
+  1c:	e7f0      	b\.n	0 <Strong1>
   1e:	f7ff bffe 	b\.w	0 <Strong1>
 			1e: R_ARM_THM_JUMP24	Strong1
   22:	f7ff bffe 	b\.w	0 <Strong1>
 			22: R_ARM_THM_JUMP24	Strong1
-  26:	e7fe      	b\.n	0 <Strong1>
-			26: R_ARM_THM_JUMP11	Strong1
+  26:	e7eb      	b\.n	0 <Strong1>
-- 
2.30.2