From 3e9608a53fad38713e2b8f52be7121e460f1627a Mon Sep 17 00:00:00 2001 From: Kaz Kojima Date: Thu, 27 Mar 2008 00:07:40 +0000 Subject: [PATCH] sysv.S: Add .note.GNU-stack on Linux. * src/sh/sysv.S: Add .note.GNU-stack on Linux. * src/sh64/sysv.S: Likewise. From-SVN: r133623 --- libffi/ChangeLog | 5 +++++ libffi/src/sh/sysv.S | 6 +++++- libffi/src/sh64/sysv.S | 6 +++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index b6f0b691e5c..b1e08f767e8 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2008-03-26 Kaz Kojima + + * src/sh/sysv.S: Add .note.GNU-stack on Linux. + * src/sh64/sysv.S: Likewise. + 2008-03-26 Daniel Jacobowitz * src/arm/sysv.S: Fix ARM comment marker. diff --git a/libffi/src/sh/sysv.S b/libffi/src/sh/sysv.S index 6628f2d1e5f..80df0061d4f 100644 --- a/libffi/src/sh/sysv.S +++ b/libffi/src/sh/sysv.S @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - sysv.S - Copyright (c) 2002, 2003, 2004, 2006 Kaz Kojima + sysv.S - Copyright (c) 2002, 2003, 2004, 2006, 2008 Kaz Kojima SuperH Foreign Function Interface @@ -701,6 +701,10 @@ L_case_v: .ffi_closure_SYSV_end: .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV) +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits +#endif + .section ".eh_frame","aw",@progbits __FRAME_BEGIN__: .4byte .LECIE1-.LSCIE1 /* Length of Common Information Entry */ diff --git a/libffi/src/sh64/sysv.S b/libffi/src/sh64/sysv.S index bdee4188ec1..5bf6101bbbc 100644 --- a/libffi/src/sh64/sysv.S +++ b/libffi/src/sh64/sysv.S @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - sysv.S - Copyright (c) 2003, 2004, 2006 Kaz Kojima + sysv.S - Copyright (c) 2003, 2004, 2006, 2008 Kaz Kojima SuperH SHmedia Foreign Function Interface @@ -437,6 +437,10 @@ ENTRY(ffi_closure_SYSV) .ffi_closure_SYSV_end: .size CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV) +#if defined __ELF__ && defined __linux__ + .section .note.GNU-stack,"",@progbits +#endif + .section ".eh_frame","aw",@progbits __FRAME_BEGIN__: .4byte .LECIE1-.LSCIE1 /* Length of Common Information Entry */