Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18de45a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 285848b0 596a9f67

tools/objtool/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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)