diff options
-rw-r--r-- | cddl/lib/libzpool/Makefile | 2 | ||||
-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 |
6 files changed, 6 insertions, 22 deletions
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 686261c..38d347e 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -11,7 +11,7 @@ # LIST_SRCS .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os # ATOMIC_SRCS -.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/arch/${MACHINE_ARCH} +.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH} LIB= zpool SHLIB_MAJOR?=1 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 diff --git a/sys/contrib/opensolaris/uts/common/arch/amd64/atomic.S b/sys/contrib/opensolaris/common/atomic/amd64/atomic.S index 1fa3c05..1c34b53 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 4a1d375..afbd11f 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 46f7d39..1f3fbbf 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 |