linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sam Ravnborg <sam@ravnborg.org>
To: Tony Luck <tony.luck@gmail.com>
Cc: Michal Marek <mmarek@suse.cz>,
	linux arch <linux-arch@vger.kernel.org>,
	lkml <linux-kernel@vger.kernel.org>,
	linux-kbuild <linux-kbuild@vger.kernel.org>,
	Richard Weinberger <richard@nod.at>,
	"David S. Miller" <davem@davemloft.net>,
	Arnaud Lacombe <lacombar@gmail.com>,
	Andi Kleen <andi@firstfloor.org>
Subject: [PATCH] kbuild: fix ia64 link
Date: Tue, 8 May 2012 19:53:46 +0200	[thread overview]
Message-ID: <20120508175346.GA11887@merkur.ravnborg.org> (raw)
In-Reply-To: <CA+8MBbJHH1niHHR7md844UwphmeYczYQBJOB3huGFaxU9AXMTA@mail.gmail.com>

From aca8f5bd71797534ea220b193772946f59ee8125 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Tue, 8 May 2012 19:49:59 +0200
Subject: [PATCH] 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>
---

Hi Michal - please apply.

	Sam

 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 26c5b65..1f4c27b 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} | \
-- 
1.6.0.6

WARNING: multiple messages have this Message-ID (diff)
From: Sam Ravnborg <sam@ravnborg.org>
To: Tony Luck <tony.luck@gmail.com>, Michal Marek <mmarek@suse.cz>
Cc: linux arch <linux-arch@vger.kernel.org>,
	lkml <linux-kernel@vger.kernel.org>,
	linux-kbuild <linux-kbuild@vger.kernel.org>,
	Richard Weinberger <richard@nod.at>,
	"David S. Miller" <davem@davemloft.net>,
	Arnaud Lacombe <lacombar@gmail.com>,
	Andi Kleen <andi@firstfloor.org>
Subject: [PATCH] kbuild: fix ia64 link
Date: Tue, 8 May 2012 19:53:46 +0200	[thread overview]
Message-ID: <20120508175346.GA11887@merkur.ravnborg.org> (raw)
Message-ID: <20120508175346.bMhHjhFq-IHVeyEZ1br2euGqyUvUPadLO6_CUA9Ds0k@z> (raw)
In-Reply-To: <CA+8MBbJHH1niHHR7md844UwphmeYczYQBJOB3huGFaxU9AXMTA@mail.gmail.com>

From aca8f5bd71797534ea220b193772946f59ee8125 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Tue, 8 May 2012 19:49:59 +0200
Subject: [PATCH] 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>
---

Hi Michal - please apply.

	Sam

 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 26c5b65..1f4c27b 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} | \
-- 
1.6.0.6


  parent reply	other threads:[~2012-05-08 17:53 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-28 20:56 [PATCH v2 0/4] kbuild: Move vmlinux link out of top-level Makefile Sam Ravnborg
2012-04-28 20:56 ` Sam Ravnborg
2012-04-28 20:58 ` [PATCH 1/4] kbuild: drop unused KBUILD_VMLINUX_OBJS from " Sam Ravnborg
2012-04-28 20:58 ` [PATCH 2/4] kbuild: refactor final link of sparc32 Sam Ravnborg
2012-04-28 20:58   ` Sam Ravnborg
2012-04-29  8:27   ` Geert Uytterhoeven
2012-04-28 20:59 ` [PATCH 3/4] kbuild: link of vmlinux moved to a script Sam Ravnborg
2012-04-29  8:28   ` Geert Uytterhoeven
2012-04-29  8:28     ` Geert Uytterhoeven
2012-05-04 23:05   ` Michal Marek
2012-05-04 23:05     ` Michal Marek
2012-05-05  8:29     ` Sam Ravnborg
2012-05-05  8:29       ` Sam Ravnborg
2012-05-07 23:15       ` Tony Luck
2012-05-07 23:15         ` Tony Luck
2012-05-08 16:51         ` Sam Ravnborg
2012-05-08 16:51           ` Sam Ravnborg
2012-05-08 17:39           ` Tony Luck
2012-05-08 17:39             ` Tony Luck
2012-05-08 17:53             ` Sam Ravnborg [this message]
2012-05-08 17:53               ` [PATCH] kbuild: fix ia64 link Sam Ravnborg
2012-05-10 12:22               ` Michal Marek
2012-05-10 12:22                 ` Michal Marek
2012-05-09 22:58           ` [PATCH 3/4] kbuild: link of vmlinux moved to a script Paul Gortmaker
2012-05-10  5:16             ` Sam Ravnborg
2012-05-10  5:16               ` Sam Ravnborg
2012-05-10 12:22             ` Michal Marek
2012-05-10 12:22               ` Michal Marek
2012-05-10 14:44               ` Paul Gortmaker
2012-05-10 14:44                 ` Paul Gortmaker
2012-05-15 22:20                 ` Michal Marek
2012-05-15 22:20                   ` Michal Marek
2012-09-06 20:43   ` James Hogan
2012-09-06 20:43     ` James Hogan
2012-04-28 21:00 ` [PATCH 4/4] kbuild: document KBUILD_LDS, KBUILD_VMLINUX_{INIT,MAIN} and LDFLAGS_vmlinux Sam Ravnborg
2012-04-29  8:29   ` Geert Uytterhoeven
2012-04-29  8:29     ` Geert Uytterhoeven
2012-04-29  8:26 ` [PATCH v2 0/4] kbuild: Move vmlinux link out of top-level Makefile Geert Uytterhoeven
2012-04-29  8:26   ` Geert Uytterhoeven
2012-04-29 11:03   ` Sam Ravnborg
2012-04-29 11:03     ` Sam Ravnborg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120508175346.GA11887@merkur.ravnborg.org \
    --to=sam@ravnborg.org \
    --cc=andi@firstfloor.org \
    --cc=davem@davemloft.net \
    --cc=lacombar@gmail.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmarek@suse.cz \
    --cc=richard@nod.at \
    --cc=tony.luck@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).