diff options
| author | Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> | 2008-12-19 14:59:42 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2008-12-19 14:59:42 +0000 |
| commit | 4d3d40782b52309b18aa2ae7f99a82d58044d5ad (patch) | |
| tree | 0015f236039dc18cb0d69c465abfae9a5714bac7 /libffi/src/x86 | |
| parent | fda2cea18b1db62338a5868bdf5ee2c9509a1752 (diff) | |
| download | gcc-4d3d40782b52309b18aa2ae7f99a82d58044d5ad.zip gcc-4d3d40782b52309b18aa2ae7f99a82d58044d5ad.tar.gz gcc-4d3d40782b52309b18aa2ae7f99a82d58044d5ad.tar.bz2 | |
re PR libffi/26048 (libffi doesn't build on Solaris 10/x86 with native assembler)
PR libffi/26048
* configure.ac (HAVE_AS_X86_PCREL): New test.
* configure: Regenerate.
* fficonfig.h.in: Regenerate.
* src/x86/sysv.S [!FFI_NO_RAW_API]: Precalculate
RAW_CLOSURE_CIF_OFFSET, RAW_CLOSURE_FUN_OFFSET,
RAW_CLOSURE_USER_DATA_OFFSET for the Solaris 10/x86 assembler.
(.eh_frame): Only use SYMBOL-. iff HAVE_AS_X86_PCREL.
* src/x86/unix64.S (.Lstore_table): Move to .text section.
(.Lload_table): Likewise.
(.eh_frame): Only use SYMBOL-. iff HAVE_AS_X86_PCREL.
From-SVN: r142835
Diffstat (limited to 'libffi/src/x86')
| -rw-r--r-- | libffi/src/x86/sysv.S | 28 | ||||
| -rw-r--r-- | libffi/src/x86/unix64.S | 14 |
2 files changed, 32 insertions, 10 deletions
diff --git a/libffi/src/x86/sysv.S b/libffi/src/x86/sysv.S index 4e65220..04564db 100644 --- a/libffi/src/x86/sysv.S +++ b/libffi/src/x86/sysv.S @@ -1,5 +1,6 @@ /* ----------------------------------------------------------------------- - sysv.S - Copyright (c) 1996, 1998, 2001, 2002, 2003, 2005 Red Hat, Inc. + sysv.S - Copyright (c) 1996, 1998, 2001, 2002, 2003, 2005, 2008 + Red Hat, Inc. X86 Foreign Function Interface @@ -241,9 +242,20 @@ ffi_closure_SYSV: #if !FFI_NO_RAW_API +/* Precalculate for e.g. the Solaris 10/x86 assembler. */ +#if FFI_TRAMPOLINE_SIZE == 10 +#define RAW_CLOSURE_CIF_OFFSET 12 +#define RAW_CLOSURE_FUN_OFFSET 16 +#define RAW_CLOSURE_USER_DATA_OFFSET 20 +#elif FFI_TRAMPOLINE_SIZE == 24 +#define RAW_CLOSURE_CIF_OFFSET 24 +#define RAW_CLOSURE_FUN_OFFSET 28 +#define RAW_CLOSURE_USER_DATA_OFFSET 32 +#else #define RAW_CLOSURE_CIF_OFFSET ((FFI_TRAMPOLINE_SIZE + 3) & ~3) #define RAW_CLOSURE_FUN_OFFSET (RAW_CLOSURE_CIF_OFFSET + 4) #define RAW_CLOSURE_USER_DATA_OFFSET (RAW_CLOSURE_FUN_OFFSET + 4) +#endif #define CIF_FLAGS_OFFSET 20 .align 4 @@ -342,10 +354,12 @@ ffi_closure_raw_SYSV: .long .LEFDE1-.LASFDE1 /* FDE Length */ .LASFDE1: .long .LASFDE1-.Lframe1 /* FDE CIE offset */ -#ifdef __PIC__ +#if defined __PIC__ && defined HAVE_AS_X86_PCREL .long .LFB1-. /* FDE initial location */ +#elif defined __PIC__ + .long .LFB1@rel #else - .long .LFB1 /* FDE initial location */ + .long .LFB1 #endif .long .LFE1-.LFB1 /* FDE address range */ #ifdef __PIC__ @@ -367,8 +381,10 @@ ffi_closure_raw_SYSV: .long .LEFDE2-.LASFDE2 /* FDE Length */ .LASFDE2: .long .LASFDE2-.Lframe1 /* FDE CIE offset */ -#ifdef __PIC__ +#if defined __PIC__ && defined HAVE_AS_X86_PCREL .long .LFB2-. /* FDE initial location */ +#elif defined __PIC__ + .long .LFB2@rel #else .long .LFB2 #endif @@ -401,8 +417,10 @@ ffi_closure_raw_SYSV: .long .LEFDE3-.LASFDE3 /* FDE Length */ .LASFDE3: .long .LASFDE3-.Lframe1 /* FDE CIE offset */ -#ifdef __PIC__ +#if defined __PIC__ && defined HAVE_AS_X86_PCREL .long .LFB3-. /* FDE initial location */ +#elif defined __PIC__ + .long .LFB3@rel #else .long .LFB3 #endif diff --git a/libffi/src/x86/unix64.S b/libffi/src/x86/unix64.S index a338881..ec60304 100644 --- a/libffi/src/x86/unix64.S +++ b/libffi/src/x86/unix64.S @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - unix64.S - Copyright (c) 2002 Bo Thorsen <bo@suse.de> + unix64.S - Copyright (c) 2002, 2008 Bo Thorsen <bo@suse.de> x86-64 Foreign Function Interface @@ -87,7 +87,6 @@ ffi_call_unix64: addq %r11, %r10 jmp *%r10 - .section .rodata .Lstore_table: .long .Lst_void-.Lstore_table /* FFI_TYPE_VOID */ .long .Lst_sint32-.Lstore_table /* FFI_TYPE_INT */ @@ -105,7 +104,6 @@ ffi_call_unix64: .long .Lst_struct-.Lstore_table /* FFI_TYPE_STRUCT */ .long .Lst_int64-.Lstore_table /* FFI_TYPE_POINTER */ - .text .align 2 .Lst_void: ret @@ -238,7 +236,6 @@ ffi_closure_unix64: addq %r11, %r10 jmp *%r10 - .section .rodata .Lload_table: .long .Lld_void-.Lload_table /* FFI_TYPE_VOID */ .long .Lld_int32-.Lload_table /* FFI_TYPE_INT */ @@ -256,7 +253,6 @@ ffi_closure_unix64: .long .Lld_struct-.Lload_table /* FFI_TYPE_STRUCT */ .long .Lld_int64-.Lload_table /* FFI_TYPE_POINTER */ - .text .align 2 .Lld_void: ret @@ -349,7 +345,11 @@ ffi_closure_unix64: .long .LEFDE1-.LASFDE1 /* FDE Length */ .LASFDE1: .long .LASFDE1-.Lframe1 /* FDE CIE offset */ +#if HAVE_AS_X86_PCREL .long .LUW0-. /* FDE initial location */ +#else + .long .LUW0@rel +#endif .long .LUW4-.LUW0 /* FDE address range */ .uleb128 0x0 /* Augmentation size */ @@ -387,7 +387,11 @@ ffi_closure_unix64: .long .LEFDE3-.LASFDE3 /* FDE Length */ .LASFDE3: .long .LASFDE3-.Lframe1 /* FDE CIE offset */ +#if HAVE_AS_X86_PCREL .long .LUW5-. /* FDE initial location */ +#else + .long .LUW5@rel +#endif .long .LUW9-.LUW5 /* FDE address range */ .uleb128 0x0 /* Augmentation size */ |