diff options
author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-07-21 07:37:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:49:16 -0400 |
commit | 24ed8559c7e8205eb94088532b9dbdf2e290dfa2 (patch) | |
tree | 3deaa849e3112e3b2a32ebf279a71f52556cff10 | |
parent | f96526354bb0824f3ce550a028606d2f94435b92 (diff) |
PS3: Fix build with 32-bit toolchains
The PS3 bootwrapper files use instructions only available on 64-bit CPUs.
Add the code generation directive '.machine "ppc64"' for toolchains
configured for 32-bit CPUs.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/powerpc/boot/ps3-head.S | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/ps3-hvcall.S | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/boot/ps3-head.S b/arch/powerpc/boot/ps3-head.S index 1a6d64a68df5..a55c2735f759 100644 --- a/arch/powerpc/boot/ps3-head.S +++ b/arch/powerpc/boot/ps3-head.S | |||
@@ -20,6 +20,8 @@ | |||
20 | 20 | ||
21 | #include "ppc_asm.h" | 21 | #include "ppc_asm.h" |
22 | 22 | ||
23 | .machine "ppc64" | ||
24 | |||
23 | .text | 25 | .text |
24 | 26 | ||
25 | /* | 27 | /* |
diff --git a/arch/powerpc/boot/ps3-hvcall.S b/arch/powerpc/boot/ps3-hvcall.S index c8b7df3210d1..585965f7e6a8 100644 --- a/arch/powerpc/boot/ps3-hvcall.S +++ b/arch/powerpc/boot/ps3-hvcall.S | |||
@@ -20,6 +20,8 @@ | |||
20 | 20 | ||
21 | #include "ppc_asm.h" | 21 | #include "ppc_asm.h" |
22 | 22 | ||
23 | .machine "ppc64" | ||
24 | |||
23 | /* | 25 | /* |
24 | * The PS3 hypervisor uses a 64 bit "C" language calling convention. | 26 | * The PS3 hypervisor uses a 64 bit "C" language calling convention. |
25 | * The routines here marshal arguments between the 32 bit wrapper | 27 | * The routines here marshal arguments between the 32 bit wrapper |