summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-17 16:24:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-17 16:24:13 -0800
commit41e0e24b450fadc079dfb659d81f3076afcfbd8a (patch)
tree74ae1884d7f3765650c6ddda0c51115882ea761b /samples
parent0aaf2146ecf00f7932f472ec5aa30d999c89530c (diff)
parent334bb773876403eae3457d81be0b8ea70f8e4ccc (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 'samples')
-rw-r--r--samples/bpf/Makefile4
-rw-r--r--samples/connector/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
index f2219c1489e5..13315ff1193c 100644
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@ -141,10 +141,10 @@ CLANG ?= clang
# Trick to allow make to be run from this directory
all:
- $(MAKE) -C ../../ $$PWD/
+ $(MAKE) -C ../../ $(CURDIR)/
clean:
- $(MAKE) -C ../../ M=$$PWD clean
+ $(MAKE) -C ../../ M=$(CURDIR) clean
@rm -f *~
# Verify LLVM compiler tools are available and bpf target is supported by llc
diff --git a/samples/connector/Makefile b/samples/connector/Makefile
index 04b9622b6f51..91762d946a53 100644
--- a/samples/connector/Makefile
+++ b/samples/connector/Makefile
@@ -13,4 +13,4 @@ HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include
all: modules
modules clean:
- $(MAKE) -C ../.. SUBDIRS=$(PWD) $@
+ $(MAKE) -C ../.. SUBDIRS=$(CURDIR) $@