diff options
Diffstat (limited to 'sys/cddl')
-rw-r--r-- | sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S (renamed from sys/cddl/contrib/opensolaris/uts/common/arch/amd64/atomic.S) | 6 | ||||
-rw-r--r-- | sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S (renamed from sys/cddl/contrib/opensolaris/uts/common/arch/i386/atomic.S) | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/arch/amd64/atomic.S b/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S index 1fa3c05..1c34b53 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/arch/amd64/atomic.S +++ b/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S @@ -28,7 +28,7 @@ .file "%M%" -#define _ASM +#define _ASM #include <sys/asm_linkage.h> #if defined(_KERNEL) @@ -558,7 +558,3 @@ lfence ret SET_SIZE(membar_consumer) - -#ifdef __ELF__ -.section .note.GNU-stack,"",%progbits -#endif diff --git a/sys/cddl/contrib/opensolaris/uts/common/arch/i386/atomic.S b/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S index 4a1d375..afbd11f 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/arch/i386/atomic.S +++ b/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S @@ -28,7 +28,7 @@ .file "%M%" -#define _ASM +#define _ASM #include <sys/asm_linkage.h> #if defined(_KERNEL) @@ -653,7 +653,3 @@ SET_SIZE(membar_producer) SET_SIZE(membar_exit) SET_SIZE(membar_enter) - -#ifdef __ELF__ -.section .note.GNU-stack,"",%progbits -#endif |