[jffi-next] 34/49: Fix up MacOS powerpc compilation on 10.6

[Tim Potter]

This is an automated email from the git hooks/post-receive script.

tpot-guest pushed a commit to annotated tag upstream/1.0.10
in repository jffi-next.

commit b9cd1376515b4b38949be5218fbef1a3ad2e5a60
Author: Wayne Meissner <wmeissner at gmail.com>
Date:   Mon Apr 25 15:38:50 2011 +1000

    Fix up MacOS powerpc compilation on 10.6
---
 jni/GNUmakefile                         | 2 +-
 jni/libffi/src/powerpc/darwin.S         | 2 +-
 jni/libffi/src/powerpc/darwin_closure.S | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jni/GNUmakefile b/jni/GNUmakefile
index efe6230..ff6c36c 100755
--- a/jni/GNUmakefile
+++ b/jni/GNUmakefile
@@ -140,7 +140,7 @@ ifeq ($(OS), darwin)
   PLATFORM = darwin
   ARCHES = ppc
   ifneq ($(findstring $(CPU), i386 x86_64),)
-    ARCHES = i386 x86_64
+    ARCHES = ppc i386 x86_64
   endif
   CC = gcc-4.0
 
diff --git a/jni/libffi/src/powerpc/darwin.S b/jni/libffi/src/powerpc/darwin.S
index d8a1df5..53e368b 100644
--- a/jni/libffi/src/powerpc/darwin.S
+++ b/jni/libffi/src/powerpc/darwin.S
@@ -196,7 +196,7 @@ LSCIE1:
 	.byte	0x7c	; sleb128 -4; CIE Data Alignment Factor
 	.byte	0x41	; CIE RA Column
 	.byte	0x1	; uleb128 0x1; Augmentation size
-	.byte	0x90	; FDE Encoding (indirect pcrel)
+	.byte	0x10	; FDE Encoding (pcrel)
 	.byte	0xc	; DW_CFA_def_cfa
 	.byte	0x1	; uleb128 0x1
 	.byte	0x0	; uleb128 0x0
diff --git a/jni/libffi/src/powerpc/darwin_closure.S b/jni/libffi/src/powerpc/darwin_closure.S
index 7959838..54d97ad 100644
--- a/jni/libffi/src/powerpc/darwin_closure.S
+++ b/jni/libffi/src/powerpc/darwin_closure.S
@@ -258,7 +258,7 @@ LSCIE1:
 	.byte	0x7c	; sleb128 -4; CIE Data Alignment Factor
 	.byte	0x41	; CIE RA Column
 	.byte	0x1	; uleb128 0x1; Augmentation size
-	.byte	0x90	; FDE Encoding (indirect pcrel)
+	.byte	0x10	; FDE Encoding (pcrel)
 	.byte	0xc	; DW_CFA_def_cfa
 	.byte	0x1	; uleb128 0x1
 	.byte	0x0	; uleb128 0x0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jffi-next.git