summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-22 09:48:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-22 09:48:13 -0700
commit18de45a925c905d086cd2db2d3d7e7a653e08003 (patch)
treee4aa1ffa07b6f996a4cbc06b650041e5cdd44876
parent285848b0f4074f04ab606f1e5dca296482033d54 (diff)
parent596a9f6768af58d7034f6ebe559a0d489ae61467 (diff)
downloadlinux-18de45a925c905d086cd2db2d3d7e7a653e08003.tar.gz
linux-18de45a925c905d086cd2db2d3d7e7a653e08003.tar.bz2
linux-18de45a925c905d086cd2db2d3d7e7a653e08003.zip
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fix from Thomas Gleixner: "A single fix for objtool so it uses the host C and LD flags and not the target ones" * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: objtool: Support HOSTCFLAGS and HOSTLDFLAGS
-rw-r--r--tools/objtool/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
index 8ae824dbfca3..f76d9914686a 100644
--- a/tools/objtool/Makefile
+++ b/tools/objtool/Makefile
@@ -31,8 +31,8 @@ INCLUDES := -I$(srctree)/tools/include \
-I$(srctree)/tools/arch/$(HOSTARCH)/include/uapi \
-I$(srctree)/tools/objtool/arch/$(ARCH)/include
WARNINGS := $(EXTRA_WARNINGS) -Wno-switch-default -Wno-switch-enum -Wno-packed
-CFLAGS += -Wall -Werror $(WARNINGS) -fomit-frame-pointer -O2 -g $(INCLUDES)
-LDFLAGS += -lelf $(LIBSUBCMD)
+CFLAGS += -Werror $(WARNINGS) $(HOSTCFLAGS) -g $(INCLUDES)
+LDFLAGS += -lelf $(LIBSUBCMD) $(HOSTLDFLAGS)
# Allow old libelf to be used:
elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr)