57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
|
From 2a83e03f3415c542956fac4f7c43ea75a44aba1d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Josh Poimboeuf <jpoimboe@redhat.com>
|
||
|
|
Date: Tue, 7 Nov 2017 21:01:52 -0600
|
||
|
|
Subject: [PATCH 131/231] objtool: Fix cross-build
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
CVE-2017-5754
|
||
|
|
|
||
|
|
Stephen Rothwell reported this cross-compilation build failure:
|
||
|
|
|
||
|
|
| In file included from orc_dump.c:19:0:
|
||
|
|
| orc.h:21:10: fatal error: asm/orc_types.h: No such file or directory
|
||
|
|
| ...
|
||
|
|
|
||
|
|
Caused by:
|
||
|
|
|
||
|
|
6a77cff819ae ("objtool: Move synced files to their original relative locations")
|
||
|
|
|
||
|
|
Use the proper arch header files location, not the host-arch location.
|
||
|
|
|
||
|
|
Bisected-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
||
|
|
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
||
|
|
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
|
||
|
|
Cc: Linus Torvalds <torvalds@linux-foundation.org>
|
||
|
|
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>
|
||
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
||
|
|
Cc: Thomas Gleixner <tglx@linutronix.de>
|
||
|
|
Link: http://lkml.kernel.org/r/20171108030152.bd76eahiwjwjt3kp@treble
|
||
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
||
|
|
(backported from commit 26bda786fb129698d96c9bc6d243f7a3cd3fc668)
|
||
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
||
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
||
|
|
(cherry picked from commit fbe7b2a70b2949ec3ba359c04fb60d8f31f74e04)
|
||
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||
|
|
---
|
||
|
|
tools/objtool/Makefile | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
|
||
|
|
index 90b0241f3ccc..847e99aa54ea 100644
|
||
|
|
--- a/tools/objtool/Makefile
|
||
|
|
+++ b/tools/objtool/Makefile
|
||
|
|
@@ -26,7 +26,7 @@ all: $(OBJTOOL)
|
||
|
|
|
||
|
|
INCLUDES := -I$(srctree)/tools/include \
|
||
|
|
-I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
|
||
|
|
- -I$(srctree)/tools/objtool/arch/$(HOSTARCH)/include
|
||
|
|
+ -I$(srctree)/tools/objtool/arch/$(ARCH)/include
|
||
|
|
CFLAGS += -Wall -Werror $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -fomit-frame-pointer -O2 -g $(INCLUDES)
|
||
|
|
LDFLAGS += -lelf $(LIBSUBCMD)
|
||
|
|
|
||
|
|
--
|
||
|
|
2.14.2
|
||
|
|
|