From feb5153085fc691a6918122394a5e755691a1560 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Wed, 26 Mar 2008 08:24:42 +0000 Subject: [PATCH] [multiple changes] 2008-03-26 Daniel Jacobowitz * src/arm/sysv.S: Fix ARM comment marker. 2008-03-26 Jakub Jelinek * src/alpha/osf.S: Add .note.GNU-stack on Linux. * src/s390/sysv.S: Likewise. * src/powerpc/ppc_closure.S: Likewise. * src/powerpc/sysv.S: Likewise. * src/x86/unix64.S: Likewise. * src/x86/sysv.S: Likewise. * src/sparc/v8.S: Likewise. * src/sparc/v9.S: Likewise. * src/m68k/sysv.S: Likewise. * src/arm/sysv.S: Likewise. From-SVN: r133594 --- libffi/ChangeLog | 17 +++++++++++++++++ libffi/src/alpha/osf.S | 4 ++++ libffi/src/arm/sysv.S | 3 +++ libffi/src/m68k/sysv.S | 4 ++++ libffi/src/powerpc/ppc_closure.S | 4 ++++ libffi/src/powerpc/sysv.S | 4 ++++ libffi/src/s390/sysv.S | 3 +++ libffi/src/sparc/v8.S | 4 ++++ libffi/src/sparc/v9.S | 4 ++++ libffi/src/x86/sysv.S | 4 ++++ libffi/src/x86/unix64.S | 4 ++++ 11 files changed, 55 insertions(+) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 61599c7b720..b6f0b691e5c 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,20 @@ +2008-03-26 Daniel Jacobowitz + + * src/arm/sysv.S: Fix ARM comment marker. + +2008-03-26 Jakub Jelinek + + * src/alpha/osf.S: Add .note.GNU-stack on Linux. + * src/s390/sysv.S: Likewise. + * src/powerpc/ppc_closure.S: Likewise. + * src/powerpc/sysv.S: Likewise. + * src/x86/unix64.S: Likewise. + * src/x86/sysv.S: Likewise. + * src/sparc/v8.S: Likewise. + * src/sparc/v9.S: Likewise. + * src/m68k/sysv.S: Likewise. + * src/arm/sysv.S: Likewise. + 2008-03-16 Ralf Wildenhues * aclocal.m4: Regenerate. diff --git a/libffi/src/alpha/osf.S b/libffi/src/alpha/osf.S index aba6782e794..a6a7b1fc249 100644 --- a/libffi/src/alpha/osf.S +++ b/libffi/src/alpha/osf.S @@ -358,4 +358,8 @@ $LASFDE3: .byte 16 # uleb128 offset 16*-8 .align 3 $LEFDE3: + +#ifdef __linux__ + .section .note.GNU-stack,"",@progbits +#endif #endif diff --git a/libffi/src/arm/sysv.S b/libffi/src/arm/sysv.S index 12876d12054..7062addef18 100644 --- a/libffi/src/arm/sysv.S +++ b/libffi/src/arm/sysv.S @@ -293,3 +293,6 @@ ARM_FUNC_START ffi_closure_SYSV UNWIND .fnend .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV) +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",%progbits +#endif diff --git a/libffi/src/m68k/sysv.S b/libffi/src/m68k/sysv.S index d2a4ff1c64a..3face83837c 100644 --- a/libffi/src/m68k/sysv.S +++ b/libffi/src/m68k/sysv.S @@ -207,3 +207,7 @@ ffi_closure_struct_SYSV: rts CFI_ENDPROC() .size ffi_closure_struct_SYSV,.-ffi_closure_struct_SYSV + +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits +#endif diff --git a/libffi/src/powerpc/ppc_closure.S b/libffi/src/powerpc/ppc_closure.S index c9f5742f5aa..f65784bab1f 100644 --- a/libffi/src/powerpc/ppc_closure.S +++ b/libffi/src/powerpc/ppc_closure.S @@ -295,3 +295,7 @@ END(ffi_closure_SYSV) .LEFDE1: #endif + +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits +#endif diff --git a/libffi/src/powerpc/sysv.S b/libffi/src/powerpc/sysv.S index 21367145eb9..d402067aab0 100644 --- a/libffi/src/powerpc/sysv.S +++ b/libffi/src/powerpc/sysv.S @@ -223,3 +223,7 @@ END(ffi_call_SYSV) .align 2 .LEFDE1: #endif + +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits +#endif diff --git a/libffi/src/s390/sysv.S b/libffi/src/s390/sysv.S index e9cbed977a9..09cdec14ac4 100644 --- a/libffi/src/s390/sysv.S +++ b/libffi/src/s390/sysv.S @@ -427,3 +427,6 @@ ffi_closure_SYSV: #endif +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits +#endif diff --git a/libffi/src/sparc/v8.S b/libffi/src/sparc/v8.S index 709423ce906..1d7bfa51daa 100644 --- a/libffi/src/sparc/v8.S +++ b/libffi/src/sparc/v8.S @@ -265,3 +265,7 @@ done2: .byte 0x1f ! uleb128 0x1f .align WS .LLEFDE2: + +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits +#endif diff --git a/libffi/src/sparc/v9.S b/libffi/src/sparc/v9.S index d640e0232d5..a8e8bf98d1e 100644 --- a/libffi/src/sparc/v9.S +++ b/libffi/src/sparc/v9.S @@ -300,3 +300,7 @@ longdouble1: .align 8 .LLEFDE2: #endif + +#ifdef __linux__ + .section .note.GNU-stack,"",@progbits +#endif diff --git a/libffi/src/x86/sysv.S b/libffi/src/x86/sysv.S index a0daf1dca94..4e652207edf 100644 --- a/libffi/src/x86/sysv.S +++ b/libffi/src/x86/sysv.S @@ -430,3 +430,7 @@ ffi_closure_raw_SYSV: #endif #endif /* ifndef __x86_64__ */ + +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits +#endif diff --git a/libffi/src/x86/unix64.S b/libffi/src/x86/unix64.S index 831e1d7132f..a33888180bd 100644 --- a/libffi/src/x86/unix64.S +++ b/libffi/src/x86/unix64.S @@ -410,3 +410,7 @@ ffi_closure_unix64: .LEFDE3: #endif /* __x86_64__ */ + +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits +#endif -- 2.30.2