aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2005-09-29 00:31:14 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-29 08:46:27 -0700
commit9fcdfcd90526c8c5c2bd117fd3713f8f0f1a46a8 (patch)
tree6bccc18ad2349ef8471f25a4c1b99827f96873d4 /arch/ppc
parent[PATCH] ppc64 get_user annotations (diff)
downloadlinux-dev-9fcdfcd90526c8c5c2bd117fd3713f8f0f1a46a8.tar.xz
linux-dev-9fcdfcd90526c8c5c2bd117fd3713f8f0f1a46a8.zip
[PATCH] ppc32 ld.script fix for building on ppc64
In arch/ppc/boot/ld.script we need OUTPUT_ARCH(powerpc:common) for the same reasons why we need it in vmlinux.lds.S; when we build on ppc64 box, we need to be explicit about the target. See http://linus.bkbits.net:8080/linux-2.5/cset@1.1784.8.10 for the corresponding fix in vmlinux.lds.S. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/boot/ld.script2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/boot/ld.script b/arch/ppc/boot/ld.script
index 9362193742ac..d4dd8f15395e 100644
--- a/arch/ppc/boot/ld.script
+++ b/arch/ppc/boot/ld.script
@@ -1,4 +1,4 @@
-OUTPUT_ARCH(powerpc)
+OUTPUT_ARCH(powerpc:common)
SECTIONS
{
/* Read-only sections, merged into text segment: */