diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-17 19:24:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-17 19:24:13 -0500 |
| commit | 41e0e24b450fadc079dfb659d81f3076afcfbd8a (patch) | |
| tree | 74ae1884d7f3765650c6ddda0c51115882ea761b /tools/objtool | |
| parent | 0aaf2146ecf00f7932f472ec5aa30d999c89530c (diff) | |
| parent | 334bb773876403eae3457d81be0b8ea70f8e4ccc (diff) | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild updates from Michal Marek:
- prototypes for x86 asm-exported symbols (Adam Borowski) and a warning
about missing CRCs (Nick Piggin)
- asm-exports fix for LTO (Nicolas Pitre)
- thin archives improvements (Nick Piggin)
- linker script fix for CONFIG_LD_DEAD_CODE_DATA_ELIMINATION (Nick
Piggin)
- genksyms support for __builtin_va_list keyword
- misc minor fixes
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
x86/kbuild: enable modversions for symbols exported from asm
kbuild: fix scripts/adjust_autoksyms.sh* for the no modules case
scripts/kallsyms: remove last remnants of --page-offset option
make use of make variable CURDIR instead of calling pwd
kbuild: cmd_export_list: tighten the sed script
kbuild: minor improvement for thin archives build
kbuild: modpost warn if export version crc is missing
kbuild: keep data tables through dead code elimination
kbuild: improve linker compatibility with lib-ksyms.o build
genksyms: Regenerate parser
kbuild/genksyms: handle va_list type
kbuild: thin archives for multi-y targets
kbuild: kallsyms allow 3-pass generation if symbols size has changed
Diffstat (limited to 'tools/objtool')
| -rw-r--r-- | tools/objtool/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile index 041b493ad3ab..27e019c09bd2 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile | |||
| @@ -11,12 +11,12 @@ LD = ld | |||
| 11 | AR = ar | 11 | AR = ar |
| 12 | 12 | ||
| 13 | ifeq ($(srctree),) | 13 | ifeq ($(srctree),) |
| 14 | srctree := $(patsubst %/,%,$(dir $(shell pwd))) | 14 | srctree := $(patsubst %/,%,$(dir $(CURDIR))) |
| 15 | srctree := $(patsubst %/,%,$(dir $(srctree))) | 15 | srctree := $(patsubst %/,%,$(dir $(srctree))) |
| 16 | endif | 16 | endif |
| 17 | 17 | ||
| 18 | SUBCMD_SRCDIR = $(srctree)/tools/lib/subcmd/ | 18 | SUBCMD_SRCDIR = $(srctree)/tools/lib/subcmd/ |
| 19 | LIBSUBCMD_OUTPUT = $(if $(OUTPUT),$(OUTPUT),$(PWD)/) | 19 | LIBSUBCMD_OUTPUT = $(if $(OUTPUT),$(OUTPUT),$(CURDIR)/) |
| 20 | LIBSUBCMD = $(LIBSUBCMD_OUTPUT)libsubcmd.a | 20 | LIBSUBCMD = $(LIBSUBCMD_OUTPUT)libsubcmd.a |
| 21 | 21 | ||
| 22 | OBJTOOL := $(OUTPUT)objtool | 22 | OBJTOOL := $(OUTPUT)objtool |
