diff options
| author | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2020-07-28 10:58:37 +0000 |
|---|---|---|
| committer | Yoshihiro Takahashi <nyan@FreeBSD.org> | 2020-07-28 10:58:37 +0000 |
| commit | 8f11c997150d17d72a801874bd486aad1ef7c239 (patch) | |
| tree | 6146be3af20a48c2d14aa933faea9785df928090 /cddl | |
| parent | 7413ae0ee548a888e3a62f8d5c8332302fad9fc1 (diff) | |
| download | src-test-8f11c997150d17d72a801874bd486aad1ef7c239.tar.gz src-test-8f11c997150d17d72a801874bd486aad1ef7c239.zip | |
- Cleanups related to sparc64 removal.
- Remove remains of sparc64 files.
Reviewed by: imp
Differential Revision: https://reviews.freebsd.org/D25831
Notes
Notes:
svn path=/head/; revision=363644
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/Makefile | 9 | ||||
| -rw-r--r-- | cddl/lib/libdtrace/Makefile | 3 | ||||
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index 69a0e381dfecb..b65983dd64a7f 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -2,10 +2,10 @@ .include <src.opts.mk> -SUBDIR= ${_drti} \ +SUBDIR= drti \ libavl \ libctf \ - ${_libdtrace} \ + libdtrace \ libnvpair \ libumem \ libuutil \ @@ -23,11 +23,6 @@ _libzpool= libzpool .endif .endif -.if ${MACHINE_CPUARCH} != "sparc64" -_drti= drti -_libdtrace= libdtrace -.endif - SUBDIR_DEPEND_libdtrace= libctf SUBDIR_DEPEND_libzfs_core= libnvpair SUBDIR_DEPEND_libzfs= libavl libnvpair libumem libuutil libzfs_core diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index bc58855ffc5d0..11565b03b0ac3 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -103,9 +103,6 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/riscv .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/riscv .PATH: ${SRCTOP}/sys/cddl/dev/dtrace/riscv -.elif ${MACHINE_CPUARCH} == "sparc64" -CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc -.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/sparc .else # temporary hack CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 1c545e0260d1a..576b89b7725a8 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -18,9 +18,7 @@ .if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} ATOMIC_SRCS= opensolaris_atomic.S -.if ${MACHINE_ARCH} != "sparc64" ACFLAGS+= -Wa,--noexecstack -.endif .else .PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern ATOMIC_SRCS= opensolaris_atomic.c |