[multiple changes]

2008-03-26  Daniel Jacobowitz  <dan@debian.org>

        * src/arm/sysv.S: Fix ARM comment marker.

2008-03-26  Jakub Jelinek  <jakub@redhat.com>

        * 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

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 61599c7b7201ccc4403fcc39c5768af76835c0d9..b6f0b691e5cc788b05c31535af177696a0fc0ed3 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,20 @@
+2008-03-26  Daniel Jacobowitz  <dan@debian.org>
+
+       * src/arm/sysv.S: Fix ARM comment marker.
+
+2008-03-26  Jakub Jelinek  <jakub@redhat.com>
+
+       * 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  <Ralf.Wildenhues@gmx.de>
 
        * aclocal.m4: Regenerate.

diff --git a/libffi/src/alpha/osf.S b/libffi/src/alpha/osf.S
index aba6782e7947a4fbed887a3d389d3543d5cc17fe..a6a7b1fc24968a78b0d42d578dc4d333d3c45ad5 100644 (file)
--- 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 12876d1205435f6348e24a0c1ff186b44f5903bb..7062addef180320b25b85febfec589766052c2d5 100644 (file)
--- 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 d2a4ff1c64a756686c0427ce936f9728aaf5b610..3face83837c68913290fd0435dab376a898ae056 100644 (file)
--- 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 c9f5742f5aa33fe72124b71c277839f9e718cdaf..f65784bab1fe2b9c98610a42a1863a10e1957ce9 100644 (file)
--- 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 21367145eb954d0faa3bff86b6aafd3f1cdd392b..d402067aab03c8f434e7dad22339dcdfe615eda5 100644 (file)
--- 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 e9cbed977a9c5740092fd729dd2a2ee7522f94cd..09cdec14ac4925e0dcf02586989394b8a426a495 100644 (file)
--- 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 709423ce906aed2a7c7bf1bd16e529a78f3e8989..1d7bfa51daa7c7cdb8e451b00f6f23a62ffdaa17 100644 (file)
--- 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 d640e0232d5cd1e9b63bee966a756f56c9900f85..a8e8bf98d1e6343b3d2b1b2b85ad73be0240d3a4 100644 (file)
--- 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 a0daf1dca94867544a24c1f412431e2dd0b21fe8..4e652207edf58539babd2a473179fc0dde7f75ac 100644 (file)
--- 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 831e1d7132fe8c2f8b7873d5bda46c9051d3f326..a33888180bd336ffacc6cc435646711ade9fadd6 100644 (file)
--- 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