Commit ae842a515b6e2a486d73ce8f9dbe5fee6c3fd1ff
2014-11-25T11:43:40
x86: More Darwin unwind fixups EHFrame{N} IIRC is a special cue to ld64 that it should treat the unwind in the object as "special/legacy" .. [these days everything is .cfi_xxxx (except, cctools-as, as you noted)] .. without that much confusion arises with ld64's atom-isation of the eh_frame section. xxxx.eh labels are not needed for darwin ld64 >= 85.2.1 (i.e. darwin9, xcode 3.1.4) to all intents and purposes, that's all that matters now, since I think that anyone trying to build on 10.4/darwin8/xcode2.5 would have to use a later ld64 (from odcctools) for other reasons.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
diff --git a/src/x86/unix64.S b/src/x86/unix64.S
index fc18eb2..f9f9163 100644
--- a/src/x86/unix64.S
+++ b/src/x86/unix64.S
@@ -431,17 +431,13 @@ ENDF(C(ffi_go_closure_unix64))
#ifdef __APPLE__
.section __TEXT,__eh_frame,coalesced,no_toc+strip_static_syms+live_support
+EHFrame0:
#elif defined(HAVE_AS_X86_64_UNWIND_SECTION_TYPE)
.section .eh_frame,"a",@unwind
#else
.section .eh_frame,"a",@progbits
#endif
-#ifdef __APPLE__
-# define FDE_NAME(X) .globl X; X:
-#else
-# define FDE_NAME(X)
-#endif
#ifdef HAVE_AS_X86_PCREL
# define PCREL(X) X - .
#else
@@ -469,7 +465,6 @@ L(SCIE):
.balign 8
L(ECIE):
-FDE_NAME(_ffi_call_unix64.eh)
.set L(set1),L(EFDE1)-L(SFDE1)
.long L(set1) /* FDE Length */
L(SFDE1):
@@ -489,7 +484,6 @@ L(SFDE1):
.balign 8
L(EFDE1):
-FDE_NAME(_ffi_closure_unix64_sse.eh)
.set L(set2),L(EFDE2)-L(SFDE2)
.long L(set2) /* FDE Length */
L(SFDE2):
@@ -503,7 +497,6 @@ L(SFDE2):
.balign 8
L(EFDE2):
-FDE_NAME(_ffi_closure_unix64.eh)
.set L(set3),L(EFDE3)-L(SFDE3)
.long L(set3) /* FDE Length */
L(SFDE3):
@@ -518,7 +511,6 @@ L(SFDE3):
.byte 0xe, 8 /* DW_CFA_def_cfa_offset 8 */
L(EFDE3):
-FDE_NAME(_ffi_go_closure_unix64_sse.eh)
.set L(set4),L(EFDE4)-L(SFDE4)
.long L(set4) /* FDE Length */
L(SFDE4):
@@ -532,7 +524,6 @@ L(SFDE4):
.balign 8
L(EFDE4):
-FDE_NAME(_ffi_go_closure_unix64.eh)
.set L(set5),L(EFDE5)-L(SFDE5)
.long L(set5) /* FDE Length */
L(SFDE5):