diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-28 13:32:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-28 13:32:28 -0400 |
| commit | 1347a2cebcb4cd6ca94eda0ebc8c5c6825bc4544 (patch) | |
| tree | 495eb1b7071a0890c1fa58c12139ebd6305e0e82 /arch | |
| parent | 90324cc1b11a211e37eabd8cb863e1a1561d6b1d (diff) | |
| parent | f7fc237e330deaaea4ba6726b603d4058d1e6b38 (diff) | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild updates from Michal Marek.
Fixed up nontrivial merge conflict in Makefile as per Stephen Rothwell
and linux-next (and trivial arch/sparc/Makefile changes due to removed
sparc32 logic).
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
mips: Fix KBUILD_CPPFLAGS definition
kbuild: fix ia64 link
kbuild: document KBUILD_LDS, KBUILD_VMLINUX_{INIT,MAIN} and LDFLAGS_vmlinux
kbuild: link of vmlinux moved to a script
kbuild: refactor final link of sparc32
kbuild: drop unused KBUILD_VMLINUX_OBJS from top-level Makefile
kbuild: Makefile: remove unnecessary check for m68knommu ARCH
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/Makefile | 4 | ||||
| -rw-r--r-- | arch/um/Makefile | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 76017c25a9e6..764e37a9dbb3 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
| @@ -219,8 +219,8 @@ endif | |||
| 219 | 219 | ||
| 220 | KBUILD_AFLAGS += $(cflags-y) | 220 | KBUILD_AFLAGS += $(cflags-y) |
| 221 | KBUILD_CFLAGS += $(cflags-y) | 221 | KBUILD_CFLAGS += $(cflags-y) |
| 222 | KBUILD_CPPFLAGS += -D"VMLINUX_LOAD_ADDRESS=$(load-y)" | 222 | KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) |
| 223 | KBUILD_CPPFLAGS += -D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)" | 223 | KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) |
| 224 | 224 | ||
| 225 | LDFLAGS += -m $(ld-emul) | 225 | LDFLAGS += -m $(ld-emul) |
| 226 | 226 | ||
diff --git a/arch/um/Makefile b/arch/um/Makefile index 55c0661e2b5d..097091059aaa 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
| @@ -121,15 +121,8 @@ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc | |||
| 121 | 121 | ||
| 122 | LD_FLAGS_CMDLINE = $(foreach opt,$(LDFLAGS),-Wl,$(opt)) | 122 | LD_FLAGS_CMDLINE = $(foreach opt,$(LDFLAGS),-Wl,$(opt)) |
| 123 | 123 | ||
| 124 | CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE) | 124 | # Used by link-vmlinux.sh which has special support for um link |
| 125 | define cmd_vmlinux__ | 125 | export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE) |
| 126 | $(CC) $(CFLAGS_vmlinux) -o $@ \ | ||
| 127 | -Wl,-T,$(vmlinux-lds) $(vmlinux-init) \ | ||
| 128 | -Wl,--start-group $(vmlinux-main) -Wl,--end-group \ | ||
| 129 | -lutil \ | ||
| 130 | $(filter-out $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o \ | ||
| 131 | FORCE ,$^) ; rm -f linux | ||
| 132 | endef | ||
| 133 | 126 | ||
| 134 | # When cleaning we don't include .config, so we don't include | 127 | # When cleaning we don't include .config, so we don't include |
| 135 | # TT or skas makefiles and don't clean skas_ptregs.h. | 128 | # TT or skas makefiles and don't clean skas_ptregs.h. |