diff options
author | Daniel Santos <daniel.santos@pobox.com> | 2017-07-24 21:59:57 +0000 |
---|---|---|
committer | Daniel Santos <dansan@gcc.gnu.org> | 2017-07-24 21:59:57 +0000 |
commit | 9cbc07ccffa3403f4f18baf615bb1fe955b3a20e (patch) | |
tree | e297b5bb11ee15fc43734a7566a4d8f7dfa20944 /libgcc/config | |
parent | 1993098939aa6033abb75961127c25e316864501 (diff) | |
download | gcc-9cbc07ccffa3403f4f18baf615bb1fe955b3a20e.zip gcc-9cbc07ccffa3403f4f18baf615bb1fe955b3a20e.tar.gz gcc-9cbc07ccffa3403f4f18baf615bb1fe955b3a20e.tar.bz2 |
PR testsuite/80759 Fix -mcall-ms2sysv-xlogues on Darwin and Solaris
2017-07-24 Daniel Santos <daniel.santos@pobox.com>
PR testsuite/80759
* config.host: include i386/t-msabi for darwin and solaris.
* config/i386/i386-asm.h
(ELFFN): Rename to FN_TYPE.
(FN_SIZE): New macro.
(FN_HIDDEN): Likewise.
(ASMNAME): Likewise.
(FUNC_START): Rename to FUNC_BEGIN, use ASMNAME, replace .global with
.globl.
(HIDDEN_FUNC): Use ASMNAME and .globl instead of .global.
(SSE_SAVE): Convert to cpp macro, hard-code offset (always 0x60).
* config/i386/resms64.S: Use SSE_SAVE as cpp macro instead of gas
.macro.
* config/i386/resms64f.S: Likewise.
* config/i386/resms64fx.S: Likewise.
* config/i386/resms64x.S: Likewise.
* config/i386/savms64.S: Likewise.
* config/i386/savms64f.S: Likewise.
From-SVN: r250488
Diffstat (limited to 'libgcc/config')
-rw-r--r-- | libgcc/config/i386/i386-asm.h | 89 | ||||
-rw-r--r-- | libgcc/config/i386/resms64.S | 2 | ||||
-rw-r--r-- | libgcc/config/i386/resms64f.S | 2 | ||||
-rw-r--r-- | libgcc/config/i386/resms64fx.S | 2 | ||||
-rw-r--r-- | libgcc/config/i386/resms64x.S | 2 | ||||
-rw-r--r-- | libgcc/config/i386/savms64.S | 2 | ||||
-rw-r--r-- | libgcc/config/i386/savms64f.S | 2 |
7 files changed, 61 insertions, 40 deletions
diff --git a/libgcc/config/i386/i386-asm.h b/libgcc/config/i386/i386-asm.h index c613e9f..1387fd24 100644 --- a/libgcc/config/i386/i386-asm.h +++ b/libgcc/config/i386/i386-asm.h @@ -26,22 +26,45 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #ifndef I386_ASM_H #define I386_ASM_H +#include "auto-host.h" + +/* These macros currently support GNU/Linux, Solaris and Darwin. */ + #ifdef __ELF__ -# define ELFFN(fn) .type fn,@function +# define FN_TYPE(fn) .type fn,@function +# define FN_SIZE(fn) .size fn,.-fn +# ifdef HAVE_GAS_HIDDEN +# define FN_HIDDEN(fn) .hidden fn +# endif +#else +# define FN_TYPE(fn) +# define FN_SIZE(fn) +#endif + +#ifndef FN_HIDDEN +# define FN_HIDDEN(fn) +#endif + +#ifdef __USER_LABEL_PREFIX__ +# define ASMNAME2(prefix, name) prefix ## name +# define ASMNAME1(prefix, name) ASMNAME2(prefix, name) +# define ASMNAME(name) ASMNAME1(__USER_LABEL_PREFIX__, name) #else -# define ELFFN(fn) +# define ASMNAME(name) name #endif -#define FUNC_START(fn) \ - .global fn; \ - ELFFN (fn); \ -fn: +#define FUNC_BEGIN(fn) \ + .globl ASMNAME(fn); \ + FN_TYPE (ASMNAME(fn)); \ +ASMNAME(fn): -#define HIDDEN_FUNC(fn)\ - FUNC_START (fn) \ - .hidden fn; \ +#define HIDDEN_FUNC(fn) \ + .globl ASMNAME(fn); \ + FN_TYPE(ASMNAME(fn)); \ + FN_HIDDEN(ASMNAME(fn)); \ +ASMNAME(fn): -#define FUNC_END(fn) .size fn,.-fn +#define FUNC_END(fn) FN_SIZE(ASMNAME(fn)) #ifdef __SSE2__ # ifdef __AVX__ @@ -51,32 +74,30 @@ fn: # endif /* Save SSE registers 6-15. off is the offset of rax to get to xmm6. */ -.macro SSE_SAVE off=0 - MOVAPS %xmm15,(\off - 0x90)(%rax) - MOVAPS %xmm14,(\off - 0x80)(%rax) - MOVAPS %xmm13,(\off - 0x70)(%rax) - MOVAPS %xmm12,(\off - 0x60)(%rax) - MOVAPS %xmm11,(\off - 0x50)(%rax) - MOVAPS %xmm10,(\off - 0x40)(%rax) - MOVAPS %xmm9, (\off - 0x30)(%rax) - MOVAPS %xmm8, (\off - 0x20)(%rax) - MOVAPS %xmm7, (\off - 0x10)(%rax) - MOVAPS %xmm6, \off(%rax) -.endm +#define SSE_SAVE \ + MOVAPS %xmm15,-0x30(%rax); \ + MOVAPS %xmm14,-0x20(%rax); \ + MOVAPS %xmm13,-0x10(%rax); \ + MOVAPS %xmm12, (%rax); \ + MOVAPS %xmm11, 0x10(%rax); \ + MOVAPS %xmm10, 0x20(%rax); \ + MOVAPS %xmm9, 0x30(%rax); \ + MOVAPS %xmm8, 0x40(%rax); \ + MOVAPS %xmm7, 0x50(%rax); \ + MOVAPS %xmm6, 0x60(%rax) /* Restore SSE registers 6-15. off is the offset of rsi to get to xmm6. */ -.macro SSE_RESTORE off=0 - MOVAPS (\off - 0x90)(%rsi), %xmm15 - MOVAPS (\off - 0x80)(%rsi), %xmm14 - MOVAPS (\off - 0x70)(%rsi), %xmm13 - MOVAPS (\off - 0x60)(%rsi), %xmm12 - MOVAPS (\off - 0x50)(%rsi), %xmm11 - MOVAPS (\off - 0x40)(%rsi), %xmm10 - MOVAPS (\off - 0x30)(%rsi), %xmm9 - MOVAPS (\off - 0x20)(%rsi), %xmm8 - MOVAPS (\off - 0x10)(%rsi), %xmm7 - MOVAPS \off(%rsi), %xmm6 -.endm +#define SSE_RESTORE \ + MOVAPS -0x30(%rsi), %xmm15; \ + MOVAPS -0x20(%rsi), %xmm14; \ + MOVAPS -0x10(%rsi), %xmm13; \ + MOVAPS (%rsi), %xmm12; \ + MOVAPS 0x10(%rsi), %xmm11; \ + MOVAPS 0x20(%rsi), %xmm10; \ + MOVAPS 0x30(%rsi), %xmm9 ; \ + MOVAPS 0x40(%rsi), %xmm8 ; \ + MOVAPS 0x50(%rsi), %xmm7 ; \ + MOVAPS 0x60(%rsi), %xmm6 #endif /* __SSE2__ */ #endif /* I386_ASM_H */ diff --git a/libgcc/config/i386/resms64.S b/libgcc/config/i386/resms64.S index f47e2f0..f842c20 100644 --- a/libgcc/config/i386/resms64.S +++ b/libgcc/config/i386/resms64.S @@ -43,7 +43,7 @@ HIDDEN_FUNC(__resms64_13) mov -0x48(%rsi),%rbx HIDDEN_FUNC(__resms64_12) mov -0x40(%rsi),%rdi - SSE_RESTORE off=0x60 + SSE_RESTORE mov -0x38(%rsi),%rsi ret FUNC_END(__resms64_12) diff --git a/libgcc/config/i386/resms64f.S b/libgcc/config/i386/resms64f.S index 817da60..81946cd 100644 --- a/libgcc/config/i386/resms64f.S +++ b/libgcc/config/i386/resms64f.S @@ -42,7 +42,7 @@ HIDDEN_FUNC(__resms64f_13) mov -0x48(%rsi),%rbx HIDDEN_FUNC(__resms64f_12) mov -0x40(%rsi),%rdi - SSE_RESTORE off=0x60 + SSE_RESTORE mov -0x38(%rsi),%rsi ret FUNC_END(__resms64f_12) diff --git a/libgcc/config/i386/resms64fx.S b/libgcc/config/i386/resms64fx.S index 5dba584..acf34fa 100644 --- a/libgcc/config/i386/resms64fx.S +++ b/libgcc/config/i386/resms64fx.S @@ -43,7 +43,7 @@ HIDDEN_FUNC(__resms64fx_13) mov -0x48(%rsi),%rbx HIDDEN_FUNC(__resms64fx_12) mov -0x40(%rsi),%rdi - SSE_RESTORE off=0x60 + SSE_RESTORE mov -0x38(%rsi),%rsi leaveq ret diff --git a/libgcc/config/i386/resms64x.S b/libgcc/config/i386/resms64x.S index 7770447..e27aab7 100644 --- a/libgcc/config/i386/resms64x.S +++ b/libgcc/config/i386/resms64x.S @@ -44,7 +44,7 @@ HIDDEN_FUNC(__resms64x_13) mov -0x48(%rsi),%rbx HIDDEN_FUNC(__resms64x_12) mov -0x40(%rsi),%rdi - SSE_RESTORE off=0x60 + SSE_RESTORE mov -0x38(%rsi),%rsi mov %r10,%rsp ret diff --git a/libgcc/config/i386/savms64.S b/libgcc/config/i386/savms64.S index 2067dd8..44dda46 100644 --- a/libgcc/config/i386/savms64.S +++ b/libgcc/config/i386/savms64.S @@ -44,7 +44,7 @@ HIDDEN_FUNC(__savms64_13) HIDDEN_FUNC(__savms64_12) mov %rdi,-0x40(%rax) mov %rsi,-0x38(%rax) - SSE_SAVE off=0x60 + SSE_SAVE ret FUNC_END(__savms64_12) FUNC_END(__savms64_13) diff --git a/libgcc/config/i386/savms64f.S b/libgcc/config/i386/savms64f.S index 81583b6..64e91ac 100644 --- a/libgcc/config/i386/savms64f.S +++ b/libgcc/config/i386/savms64f.S @@ -43,7 +43,7 @@ HIDDEN_FUNC(__savms64f_13) HIDDEN_FUNC(__savms64f_12) mov %rdi,-0x40(%rax) mov %rsi,-0x38(%rax) - SSE_SAVE off=0x60 + SSE_SAVE ret FUNC_END(__savms64f_12) FUNC_END(__savms64f_13) |