Skip to content

Commit

Permalink
kbuild: fix ia64 link
Browse files Browse the repository at this point in the history
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 <[email protected]>
Tested-by: Tony Luck <[email protected]>
Signed-off-by: Sam Ravnborg <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
  • Loading branch information
sravnborg authored and michal42 committed May 10, 2012
1 parent d27579a commit 00e6c28
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/link-vmlinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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} | \
Expand Down

0 comments on commit 00e6c28

Please sign in to comment.