From 78cfc08d9cd15de79da69f766d8f064fa9b1a2c9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Apr 2018 17:39:25 +0100 Subject: arm: fix thumb2 mode with binutils 2.30 --- target/linux/patches/4.14.34/arm-thumb2.patch | 16 ++++++++++++++++ target/linux/patches/4.15.17/arm-thumb2.patch | 16 ++++++++++++++++ target/linux/patches/4.9.94/arm-thumb2.patch | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 target/linux/patches/4.14.34/arm-thumb2.patch create mode 100644 target/linux/patches/4.15.17/arm-thumb2.patch create mode 100644 target/linux/patches/4.9.94/arm-thumb2.patch (limited to 'target/linux/patches') diff --git a/target/linux/patches/4.14.34/arm-thumb2.patch b/target/linux/patches/4.14.34/arm-thumb2.patch new file mode 100644 index 000000000..d8d1f4984 --- /dev/null +++ b/target/linux/patches/4.14.34/arm-thumb2.patch @@ -0,0 +1,16 @@ +diff -Nur linux-4.14.34.orig/arch/arm/include/asm/assembler.h linux-4.14.34/arch/arm/include/asm/assembler.h +--- linux-4.14.34.orig/arch/arm/include/asm/assembler.h 2018-04-12 11:32:27.000000000 +0100 ++++ linux-4.14.34/arch/arm/include/asm/assembler.h 2018-04-21 17:29:06.424606334 +0100 +@@ -194,10 +194,9 @@ + */ + .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo + .macro badr\c, rd, sym +-#ifdef CONFIG_THUMB2_KERNEL +- adr\c \rd, \sym + 1 +-#else + adr\c \rd, \sym ++#ifdef CONFIG_THUMB2_KERNEL ++ orr\c \rd, \rd, 1 + #endif + .endm + .endr diff --git a/target/linux/patches/4.15.17/arm-thumb2.patch b/target/linux/patches/4.15.17/arm-thumb2.patch new file mode 100644 index 000000000..a5ae3d260 --- /dev/null +++ b/target/linux/patches/4.15.17/arm-thumb2.patch @@ -0,0 +1,16 @@ +diff -Nur linux-4.15.17.orig/arch/arm/include/asm/assembler.h linux-4.15.17/arch/arm/include/asm/assembler.h +--- linux-4.15.17.orig/arch/arm/include/asm/assembler.h 2018-04-12 11:31:21.000000000 +0100 ++++ linux-4.15.17/arch/arm/include/asm/assembler.h 2018-04-22 02:14:24.155580474 +0100 +@@ -194,10 +194,9 @@ + */ + .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo + .macro badr\c, rd, sym +-#ifdef CONFIG_THUMB2_KERNEL +- adr\c \rd, \sym + 1 +-#else + adr\c \rd, \sym ++#ifdef CONFIG_THUMB2_KERNEL ++ orr\c \rd, \rd, 1 + #endif + .endm + .endr diff --git a/target/linux/patches/4.9.94/arm-thumb2.patch b/target/linux/patches/4.9.94/arm-thumb2.patch new file mode 100644 index 000000000..6a42899b6 --- /dev/null +++ b/target/linux/patches/4.9.94/arm-thumb2.patch @@ -0,0 +1,16 @@ +diff -Nur linux-4.9.94.orig/arch/arm/include/asm/assembler.h linux-4.9.94/arch/arm/include/asm/assembler.h +--- linux-4.9.94.orig/arch/arm/include/asm/assembler.h 2018-04-13 18:48:37.000000000 +0100 ++++ linux-4.9.94/arch/arm/include/asm/assembler.h 2018-04-22 10:51:50.317450040 +0100 +@@ -192,10 +192,9 @@ + */ + .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo + .macro badr\c, rd, sym +-#ifdef CONFIG_THUMB2_KERNEL +- adr\c \rd, \sym + 1 +-#else + adr\c \rd, \sym ++#ifdef CONFIG_THUMB2_KERNEL ++ orr\c \rd, \rd, 1 + #endif + .endm + .endr -- cgit v1.2.3