| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 |
- From 2a83e03f3415c542956fac4f7c43ea75a44aba1d Mon Sep 17 00:00:00 2001
- From: Josh Poimboeuf <[email protected]>
- 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 <[email protected]>
- Reported-by: Stephen Rothwell <[email protected]>
- Signed-off-by: Josh Poimboeuf <[email protected]>
- Cc: Linus Torvalds <[email protected]>
- Cc: Linux-Next Mailing List <[email protected]>
- Cc: Peter Zijlstra <[email protected]>
- Cc: Thomas Gleixner <[email protected]>
- Link: http://lkml.kernel.org/r/20171108030152.bd76eahiwjwjt3kp@treble
- Signed-off-by: Ingo Molnar <[email protected]>
- (backported from commit 26bda786fb129698d96c9bc6d243f7a3cd3fc668)
- Signed-off-by: Andy Whitcroft <[email protected]>
- Signed-off-by: Kleber Sacilotto de Souza <[email protected]>
- (cherry picked from commit fbe7b2a70b2949ec3ba359c04fb60d8f31f74e04)
- Signed-off-by: Fabian Grünbichler <[email protected]>
- ---
- 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
|