diff options
| author | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2007-04-07 23:54:54 +0000 |
|---|---|---|
| committer | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2007-04-07 23:54:54 +0000 |
| commit | 3dc4488c9143fa830701c5d0e69a83eaa9efa124 (patch) | |
| tree | a8aaa46f67d2a8aee91b83acdb75dfc221d708d3 /sys | |
| parent | e321494eca782acead0a01007d4f58d103d87a01 (diff) | |
Notes
Diffstat (limited to 'sys')
| -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 | ||||
| -rw-r--r-- | sys/contrib/opensolaris/common/atomic/amd64/atomic.S (renamed from sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S) | 6 | ||||
| -rw-r--r-- | sys/contrib/opensolaris/common/atomic/i386/atomic.S (renamed from sys/contrib/opensolaris/uts/common/arch/i386/atomic.S) | 6 | ||||
| -rw-r--r-- | sys/modules/zfs/Makefile | 2 |
5 files changed, 5 insertions, 21 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 1fa3c05b3317..1c34b5313529 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 4a1d37521119..afbd11f59ee6 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 diff --git a/sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S b/sys/contrib/opensolaris/common/atomic/amd64/atomic.S index 1fa3c05b3317..1c34b5313529 100644 --- a/sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S +++ b/sys/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/contrib/opensolaris/uts/common/arch/i386/atomic.S b/sys/contrib/opensolaris/common/atomic/i386/atomic.S index 4a1d37521119..afbd11f59ee6 100644 --- a/sys/contrib/opensolaris/uts/common/arch/i386/atomic.S +++ b/sys/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 diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 46f7d39b4724..1f3fbbfaaf8b 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -20,7 +20,7 @@ SRCS+= opensolaris_string.c SRCS+= opensolaris_vfs.c SRCS+= opensolaris_zone.c -.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/arch/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../contrib/opensolaris/common/atomic/${MACHINE_ARCH} SRCS+= atomic.S .PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/fs |