29 May, 2012
1 commit
-
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
10 May, 2012
1 commit
-
ia64 build failed like this:
CC init/version.o
LD init/built-in.o
KSYM .tmp_kallsyms1.o
ld: .tmp_kallsyms1.o: linking constant-gp files with non-constant-gp files
ld: failed to merge target specific data of file .tmp_kallsyms1.o
make: *** [vmlinux] Error 1This was introduced when link of vmlinux was migrated to a script.
Add missing option to as to fix this.Reported-by: Tony Luck
Tested-by: Tony Luck
Signed-off-by: Sam Ravnborg
Signed-off-by: Michal Marek
06 May, 2012
1 commit
-
Move the final link of vmlinux to a script to improve
readability and maintainability of the code.The Makefile fragments used to link vmlinux has over the
years seen far too many changes and the logic had become
hard to follow.As the process by nature is serialized there was
nothing gained including this in the Makefile."um" has special link requirments - and the
only way to handle this was to hard-code the linking
of "um" in the script.
This was better than trying to modularize it only for the
benefit of "um" anyway.The shell script has been improved after input from:
Arnaud Lacombe
Nick BowlerSigned-off-by: Sam Ravnborg
Cc: Arnaud Lacombe
Cc: Nick Bowler
Cc: Richard Weinberger
Signed-off-by: Michal Marek