svn commit: r363644 - in head: cddl/lib cddl/lib/libdtrace cddl/lib/libzpool etc/mtree release/sparc64 rescue/rescue sbin/init sys/kern sys/modules/esp sys/modules/uart usr.sbin/bsdinstall/partedit...

Takahashi Yoshihiro nyan at FreeBSD.org
Tue Jul 28 10:58:39 UTC 2020 

Author: nyan
Date: Tue Jul 28 10:58:37 2020
New Revision: 363644
URL: https://svnweb.freebsd.org/changeset/base/363644

Log:
  - Cleanups related to sparc64 removal.
  - Remove remains of sparc64 files.
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D25831

Deleted:
  head/release/sparc64/
  head/sbin/init/ttys.sparc64
  head/usr.sbin/bsdinstall/partedit/partedit_sparc64.c
  head/usr.sbin/kldxref/ef_sparc64.c
Modified:
  head/cddl/lib/Makefile
  head/cddl/lib/libdtrace/Makefile
  head/cddl/lib/libzpool/Makefile
  head/etc/mtree/BSD.usr.dist
  head/rescue/rescue/Makefile
  head/sys/kern/kern_dump.c
  head/sys/modules/esp/Makefile
  head/sys/modules/uart/Makefile

Modified: head/cddl/lib/Makefile
==============================================================================
--- head/cddl/lib/Makefile	Tue Jul 28 10:45:29 2020	(r363643)
+++ head/cddl/lib/Makefile	Tue Jul 28 10:58:37 2020	(r363644)
@@ -2,10 +2,10 @@
 
 .include <src.opts.mk>
 
-SUBDIR=	${_drti} \
+SUBDIR=	drti \
 	libavl \
 	libctf \
-	${_libdtrace} \
+	libdtrace \
 	libnvpair \
 	libumem \
 	libuutil \
@@ -21,11 +21,6 @@ _libzfs=	libzfs
 .if ${MK_LIBTHR} != "no"
 _libzpool=	libzpool
 .endif
-.endif
-
-.if ${MACHINE_CPUARCH} != "sparc64"
-_drti=		drti
-_libdtrace=	libdtrace
 .endif
 
 SUBDIR_DEPEND_libdtrace=	libctf

Modified: head/cddl/lib/libdtrace/Makefile
==============================================================================
--- head/cddl/lib/libdtrace/Makefile	Tue Jul 28 10:45:29 2020	(r363643)
+++ head/cddl/lib/libdtrace/Makefile	Tue Jul 28 10:58:37 2020	(r363644)
@@ -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

Modified: head/cddl/lib/libzpool/Makefile
==============================================================================
--- head/cddl/lib/libzpool/Makefile	Tue Jul 28 10:45:29 2020	(r363643)
+++ head/cddl/lib/libzpool/Makefile	Tue Jul 28 10:58:37 2020	(r363644)
@@ -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

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Tue Jul 28 10:45:29 2020	(r363643)
+++ head/etc/mtree/BSD.usr.dist	Tue Jul 28 10:58:37 2020	(r363644)
@@ -864,8 +864,6 @@
                 ..
                 powerpc
                 ..
-                sparc64
-                ..
             ..
             man5
             ..
@@ -879,8 +877,6 @@
                 i386
                 ..
                 powerpc
-                ..
-                sparc64
                 ..
             ..
             man9

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Tue Jul 28 10:45:29 2020	(r363643)
+++ head/rescue/rescue/Makefile	Tue Jul 28 10:58:37 2020	(r363644)
@@ -147,10 +147,6 @@ CRUNCH_ALIAS_bsdlabel= disklabel
 #CRUNCH_LIBS+= -lsmb
 .endif
 
-.if ${MACHINE_CPUARCH} == "sparc64"
-CRUNCH_PROGS_sbin+= bsdlabel sunlabel
-.endif
-
 .if ${MACHINE_CPUARCH} == "amd64"
 CRUNCH_PROGS_sbin+= bsdlabel fdisk
 CRUNCH_ALIAS_bsdlabel= disklabel

Modified: head/sys/kern/kern_dump.c
==============================================================================
--- head/sys/kern/kern_dump.c	Tue Jul 28 10:45:29 2020	(r363643)
+++ head/sys/kern/kern_dump.c	Tue Jul 28 10:58:37 2020	(r363644)
@@ -54,7 +54,7 @@ static size_t fragsz;
 
 struct dump_pa dump_map[DUMPSYS_MD_PA_NPAIRS];
 
-#if !defined(__powerpc__) && !defined(__sparc__)
+#if !defined(__powerpc__)
 void
 dumpsys_gen_pa_init(void)
 {
@@ -97,14 +97,12 @@ dumpsys_gen_unmap_chunk(vm_paddr_t pa __unused, size_t
 
 }
 
-#if !defined(__sparc__)
 int
 dumpsys_gen_write_aux_headers(struct dumperinfo *di)
 {
 
 	return (0);
 }
-#endif
 
 int
 dumpsys_buf_seek(struct dumperinfo *di, size_t sz)
@@ -240,7 +238,6 @@ dumpsys_foreach_chunk(dumpsys_callback_t cb, void *arg
 	return (seqnr);
 }
 
-#if !defined(__sparc__)
 static off_t fileofs;
 
 static int
@@ -387,4 +384,3 @@ dumpsys_generic(struct dumperinfo *di)
 		printf("\n** DUMP FAILED (ERROR %d) **\n", error);
 	return (error);
 }
-#endif

Modified: head/sys/modules/esp/Makefile
==============================================================================
--- head/sys/modules/esp/Makefile	Tue Jul 28 10:45:29 2020	(r363643)
+++ head/sys/modules/esp/Makefile	Tue Jul 28 10:58:37 2020	(r363644)
@@ -3,7 +3,7 @@
 .PATH: ${SRCTOP}/sys/dev/esp
 
 KMOD=	esp
-SRCS=	device_if.h esp_pci.c ${esp_sbus} bus_if.h ncr53c9x.c ${ofw_bus_if}
+SRCS=	device_if.h esp_pci.c bus_if.h ncr53c9x.c
 SRCS+=	opt_cam.h pci_if.h
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/uart/Makefile
==============================================================================
--- head/sys/modules/uart/Makefile	Tue Jul 28 10:45:29 2020	(r363643)
+++ head/sys/modules/uart/Makefile	Tue Jul 28 10:58:37 2020	(r363644)
@@ -28,7 +28,7 @@ uart_dev_mu=uart_dev_mu.c
 .endif
 
 KMOD=	uart
-SRCS=	${uart_bus_acpi} ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
+SRCS=	${uart_bus_acpi} uart_bus_isa.c uart_bus_pccard.c \
 	uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \
 	uart_core.c ${uart_cpu_acpi} ${uart_cpu_machine} uart_dbg.c \
 	${uart_dev_mvebu} uart_dev_ns8250.c ${uart_dev_mu} \

More information about the svn-src-head mailing list