Patch 14922

Patch 14922
	* src/powerpc/darwin.S: Go through a non-lazy pointer for initial
	FDE location.
	* src/powerpc/darwin_closure.S: Likewise.

From-SVN: r81209

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 0abac2aaa0d2c1b8cf4a013d83c78a597ee84793..1a33143e8a59485db62012f0453ff9c52f6d3875 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-26  Matt Austern  <austern@apple.com>
+
+       * src/powerpc/darwin.S: Go through a non-lazy pointer for initial
+       FDE location.
+       * src/powerpc/darwin_closure.S: Likewise.
+       
 2004-04-24  Andreas Tobler  <a.tobler@schweiz.ch>
 
        * testsuite/libffi.call/cls_multi_schar.c (main): Fix initialization

diff --git a/libffi/src/powerpc/darwin.S b/libffi/src/powerpc/darwin.S
index ad4824e2762b1c8cfea65e5271266ca4f2bd644c..cbbac960d4a6c382673377aa2de486f9c4cea8d7 100644 (file)
--- a/libffi/src/powerpc/darwin.S
+++ b/libffi/src/powerpc/darwin.S
@@ -187,7 +187,7 @@ LSFDE1:
        .long   L$set$1 ; FDE Length
 LASFDE1:
        .long   LASFDE1-EH_frame1 ; FDE CIE offset
-       .long   LFB0-.  ; FDE initial location
+       .long   LLFB0$non_lazy_ptr-.    ; FDE initial location
        .set    L$set$3,LFE1-LFB0
        .long   L$set$3 ; FDE address range
        .byte   0x0     ; uleb128 0x0; Augmentation size
@@ -217,3 +217,7 @@ LASFDE1:
        .byte   0x1c    ; uleb128 0x1c
        .align 2
 LEFDE1:
+.data
+        .align 2
+LLFB0$non_lazy_ptr:
+        .long   LFB0

diff --git a/libffi/src/powerpc/darwin_closure.S b/libffi/src/powerpc/darwin_closure.S
index 13ee81d6049cd6b8da8d8519a6785b2f321e085e..f608e6d0b9d447534b8b9f6c9644e9ca77942e0f 100644 (file)
--- a/libffi/src/powerpc/darwin_closure.S
+++ b/libffi/src/powerpc/darwin_closure.S
@@ -260,7 +260,7 @@ LSFDE1:
 
 LASFDE1:
        .long   LASFDE1-EH_frame1       ; FDE CIE offset
-       .long   LFB1-.  ; FDE initial location
+       .long   LLFB1$non_lazy_ptr-.    ; FDE initial location
        .set    L$set$3,LFE1-LFB1
        .long   L$set$3 ; FDE address range
        .byte   0x0     ; uleb128 0x0; Augmentation size
@@ -298,3 +298,7 @@ LO$ffi_closure_helper_DARWIN:
 L_ffi_closure_helper_DARWIN$lazy_ptr:
        .indirect_symbol _ffi_closure_helper_DARWIN
        .long   dyld_stub_binding_helper
+.data
+       .align 2
+LLFB1$non_lazy_ptr:
+        .long LFB1