diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2012-05-08 19:53:46 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-05-10 14:09:21 +0200 |
| commit | 00e6c28c6808c0ef6a3f25bb420d037fbb724d84 (patch) | |
| tree | d0a8479c2ec02e1cc43c8a47fca685e52e6c1665 /scripts/link-vmlinux.sh | |
| parent | kbuild: document KBUILD_LDS, KBUILD_VMLINUX_{INIT,MAIN} and LDFLAGS_vmlinux (diff) | |
| download | linux-00e6c28c6808c0ef6a3f25bb420d037fbb724d84.tar.xz linux-00e6c28c6808c0ef6a3f25bb420d037fbb724d84.zip | |
kbuild: fix ia64 link
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 1
This was introduced when link of vmlinux was migrated to a script.
Add missing option to as to fix this.
Reported-by: Tony Luck <tony.luck@gmail.com>
Tested-by: Tony Luck <tony.luck@gmail.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/link-vmlinux.sh')
| -rw-r--r-- | scripts/link-vmlinux.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 26c5b658c2d5..1f4c27bd5d2a 100644 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -78,8 +78,8 @@ kallsyms() kallsymopt=--all-symbols fi - local aflags="${KBUILD_AFLAGS} ${NOSTDINC_FLAGS} \ - ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}" + local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL} \ + ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}" ${NM} -n ${1} | \ scripts/kallsyms ${kallsymopt} | \ |