Commit c7fb1692 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux 

Pull ARM fix from Russell King:

 - Fix a build issue with older binutils with LD dead code elimination
   disabled

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux:
  ARM: 9414/1: Fix build issue with LD_DEAD_CODE_DATA_ELIMINATION
parents 962da4d1 0d437918

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ config ARM 
	select HAVE_KERNEL_XZ

	select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M

	select HAVE_KRETPROBES if HAVE_KPROBES

	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION

	select HAVE_LD_DEAD_CODE_DATA_ELIMINATION if (LD_VERSION >= 23600 || LD_IS_LLD)

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI

	select HAVE_OPTPROBES if !THUMB2_KERNEL

arch/arm/kernel/entry-armv.S

+9 −3
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ 
#include "entry-header.S"

#include <asm/probes.h>



#ifdef CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION

#define RELOC_TEXT_NONE .reloc  .text, R_ARM_NONE, .

#else

#define RELOC_TEXT_NONE

#endif



/*

 * Interrupt handling.

 */
@@ -1065,7 +1071,7 @@ vector_addrexcptn: 
	.globl	vector_fiq



	.section .vectors, "ax", %progbits

	.reloc  .text, R_ARM_NONE, .

	RELOC_TEXT_NONE

	W(b)	vector_rst

	W(b)	vector_und

ARM(	.reloc	., R_ARM_LDR_PC_G0, .L__vector_swi		)
@@ -1079,7 +1085,7 @@ THUMB( .reloc ., R_ARM_THM_PC12, .L__vector_swi ) 


#ifdef CONFIG_HARDEN_BRANCH_HISTORY

	.section .vectors.bhb.loop8, "ax", %progbits

	.reloc  .text, R_ARM_NONE, .

	RELOC_TEXT_NONE

	W(b)	vector_rst

	W(b)	vector_bhb_loop8_und

ARM(	.reloc	., R_ARM_LDR_PC_G0, .L__vector_bhb_loop8_swi	)
@@ -1092,7 +1098,7 @@ THUMB( .reloc ., R_ARM_THM_PC12, .L__vector_bhb_loop8_swi ) 
	W(b)	vector_bhb_loop8_fiq



	.section .vectors.bhb.bpiall, "ax", %progbits

	.reloc  .text, R_ARM_NONE, .

	RELOC_TEXT_NONE

	W(b)	vector_rst

	W(b)	vector_bhb_bpiall_und

ARM(	.reloc	., R_ARM_LDR_PC_G0, .L__vector_bhb_bpiall_swi	)