From ee52d6dae0823582960e9712e23c15628caa8c80 Mon Sep 17 00:00:00 2001
From: Roland Lezuo <rlezuo@complang.tuwien.ac.at>
Date: Thu, 3 Mar 2011 22:49:02 +0100
Subject: [PATCH] Fixes build for newer gcc (at least 4.4), breaks older gcc.
 We don't care.

---
 src/vm/jit/powerpc64/asmpart.S      |  6 +--
 src/vm/jit/powerpc64/linux/md-asm.h | 70 ++++++++++++++---------------
 2 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/src/vm/jit/powerpc64/asmpart.S b/src/vm/jit/powerpc64/asmpart.S
index 37da5a685..ea399dc7f 100644
--- a/src/vm/jit/powerpc64/asmpart.S
+++ b/src/vm/jit/powerpc64/asmpart.S
@@ -125,7 +125,7 @@
 
 
 	SAVE_TEMPORARY_REGISTERS(15)     
-	mr	s0, r1			/* save stack pointer */
+	mr	s0, sp			/* save stack pointer */
 
 	/* a1 contains a pointer to a unit64_t structure filled with all INT_ARG_REG,
 	followed by ADR_ARG_CNT and FLT_ARG_CNT, afterwards what else needs to be copied onto
@@ -203,9 +203,9 @@ L_asm_vm_call_method_return:
 
 	RESTORE_TEMPORARY_REGISTERS(15) 
 
-	ld     r0,40*8+LA_LR_OFFSET(r1)
+	ld     r0,40*8+LA_LR_OFFSET(sp)
 	mtlr   r0
-	addi   r1,r1,40*8
+	addi   sp,sp,40*8
 	blr
 
 asm_vm_call_method_exception_handler:
diff --git a/src/vm/jit/powerpc64/linux/md-asm.h b/src/vm/jit/powerpc64/linux/md-asm.h
index 19ac100bf..715928598 100644
--- a/src/vm/jit/powerpc64/linux/md-asm.h
+++ b/src/vm/jit/powerpc64/linux/md-asm.h
@@ -34,13 +34,11 @@
 #ifndef _MD_ASM_H
 #define _MD_ASM_H
 
-#include <asm/ppc_asm.h>
-
+#include <ppc-asm.h>
 
 /* register defines ***********************************************************/
 
 #define zero  r0
-#define sp    r1
 
 /* #define XXX   r2  -  system reserved register */
 
@@ -89,39 +87,39 @@
 
 #define ftmp3 fr0
 
-#define fa0   fr1
-#define fa1   fr2
-#define fa2   fr3
-#define fa3   fr4
-#define fa4   fr5
-#define fa5   fr6
-#define fa6   fr7
-#define fa7   fr8
-#define fa8   fr9
-#define fa9   fr10
-#define fa10  fr11
-#define fa11  fr12
-#define fa12  fr13
-
-#define ftmp1 fr14
-#define ftmp2 fr15
-
-#define fs0   fr16
-#define fs1   fr17
-#define fs2   fr18
-#define fs3   fr19
-#define fs4   fr20
-#define fs5   fr21
-#define fs6   fr22
-#define fs7   fr23
-#define fs8   fr24
-#define fs9   fr25
-#define fs10  fr26
-#define fs11  fr27
-#define fs12  fr28
-#define fs13  fr29
-#define fs14  fr30
-#define fs15  fr31
+#define fa0   f1
+#define fa1   f2
+#define fa2   f3
+#define fa3   f4
+#define fa4   f5
+#define fa5   f6
+#define fa6   f7
+#define fa7   f8
+#define fa8   f9
+#define fa9   f10
+#define fa10  f11
+#define fa11  f12
+#define fa12  f13
+
+#define ftmp1 f14
+#define ftmp2 f15
+
+#define fs0   f16
+#define fs1   f17
+#define fs2   f18
+#define fs3   f19
+#define fs4   f20
+#define fs5   f21
+#define fs6   f22
+#define fs7   f23
+#define fs8   f24
+#define fs9   f25
+#define fs10  f26
+#define fs11  f27
+#define fs12  f28
+#define fs13  f29
+#define fs14  f30
+#define fs15  f31
 
 #define fv0   fa0
 
-- 
2.25.1