diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-02 14:58:12 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-02 14:58:12 -0700 |
commit | e965b8ce4215ac2b22b23ffc8a8dfbae964b9496 (patch) | |
tree | 9f7d23f14655c214d4e1f54760a841df2c987459 /lib/Makefile | |
parent | a95cb3cd55c208372ca68d5e8a9923611fed7235 (diff) | |
parent | 50ab9a69275dca588cb5ad5038657f069bbdeb56 (diff) | |
download | linux-stable-e965b8ce4215ac2b22b23ffc8a8dfbae964b9496.tar.gz linux-stable-e965b8ce4215ac2b22b23ffc8a8dfbae964b9496.tar.bz2 linux-stable-e965b8ce4215ac2b22b23ffc8a8dfbae964b9496.zip |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild updates from Michal Marek:
"Just a few kbuild core commits this time:
- kallsyms fix for CONFIG_XIP_KERNEL
- bashisms in scripts/link-vmlinux.sh fixed
- workaround to make DEBUG_INFO_REDUCED more useful yet still space
efficient
- clang is not wrongly detected when cross-compiling"
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: include core debug info when DEBUG_INFO_REDUCED
scripts: link-vmlinux: Don't pass page offset to kallsyms if XIP Kernel
scripts: fix link-vmlinux.sh bash-ism
Makefile: Fix detection of clang when cross-compiling
Diffstat (limited to 'lib/Makefile')
-rw-r--r-- | lib/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Makefile b/lib/Makefile index ff37c8c2f7b2..6897b527581a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -45,6 +45,9 @@ CFLAGS_kobject.o += -DDEBUG CFLAGS_kobject_uevent.o += -DDEBUG endif +obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o +CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any) + obj-$(CONFIG_GENERIC_IOMAP) += iomap.o obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o |