svn commit: r351044 - head/sys/conf

[Warner Losh]

Author: imp
Date: Wed Aug 14 20:58:01 2019
New Revision: 351044
URL: https://svnweb.freebsd.org/changeset/base/351044

Log:
  Move all the hp* drivers too files.x86
  
  The HPT drivers are all x86 only. Move them to files.x86. Because of the way we
  run uudecode, we can use $M instead of needing entries for them in separate
  files.
  
  Reviewed by: jhb (verbal OK on irc)
  Differential Revision: https://reviews.freebsd.org/D21248

Modified:
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/conf/files.x86

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64	Wed Aug 14 20:57:54 2019	(r351043)
+++ head/sys/conf/files.amd64	Wed Aug 14 20:58:01 2019	(r351044)
@@ -82,26 +82,6 @@ atkbdmap.h			optional	atkbd_dflt_keymap	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 #
-hpt27xx_lib.o			optional	hpt27xx			\
-	dependency	"$S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu"	\
-	compile-with	"uudecode < $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \
-	no-implicit-rule
-#
-hptmvraid.o			optional	hptmv			\
-	dependency	"$S/dev/hptmv/amd64-elf.raid.o.uu"	\
-	compile-with	"uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
-	no-implicit-rule
-#
-hptnr_lib.o			optional	hptnr			\
-	dependency	"$S/dev/hptnr/amd64-elf.hptnr_lib.o.uu"	\
-	compile-with	"uudecode < $S/dev/hptnr/amd64-elf.hptnr_lib.o.uu" \
-	no-implicit-rule
-#
-hptrr_lib.o			optional	hptrr			\
-	dependency	"$S/dev/hptrr/amd64-elf.hptrr_lib.o.uu"		\
-	compile-with	"uudecode < $S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \
-	no-implicit-rule
-#
 amd64/acpica/acpi_machdep.c	optional	acpi
 acpi_wakecode.o			optional	acpi			\
 	dependency	"$S/amd64/acpica/acpi_wakecode.S assym.inc"	\
@@ -290,20 +270,6 @@ dev/ixl/i40e_dcb.c		optional	ixl pci \
 	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/gpio/bytgpio.c		optional	bytgpio
 dev/gpio/chvgpio.c		optional	chvgpio
-dev/hpt27xx/hpt27xx_os_bsd.c	optional	hpt27xx
-dev/hpt27xx/hpt27xx_osm_bsd.c	optional	hpt27xx
-dev/hpt27xx/hpt27xx_config.c	optional	hpt27xx
-dev/hptmv/entry.c		optional	hptmv
-dev/hptmv/mv.c			optional	hptmv
-dev/hptmv/gui_lib.c		optional	hptmv
-dev/hptmv/hptproc.c		optional	hptmv
-dev/hptmv/ioctl.c		optional	hptmv
-dev/hptnr/hptnr_os_bsd.c	optional	hptnr
-dev/hptnr/hptnr_osm_bsd.c	optional	hptnr
-dev/hptnr/hptnr_config.c	optional	hptnr
-dev/hptrr/hptrr_os_bsd.c	optional	hptrr
-dev/hptrr/hptrr_osm_bsd.c	optional	hptrr
-dev/hptrr/hptrr_config.c	optional	hptrr
 dev/hwpmc/hwpmc_amd.c		optional	hwpmc
 dev/hwpmc/hwpmc_intel.c		optional	hwpmc
 dev/hwpmc/hwpmc_core.c		optional	hwpmc

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386	Wed Aug 14 20:57:54 2019	(r351043)
+++ head/sys/conf/files.i386	Wed Aug 14 20:58:01 2019	(r351044)
@@ -57,26 +57,6 @@ atkbdmap.h			optional	atkbd_dflt_keymap	\
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 #
-hpt27xx_lib.o			optional	hpt27xx			\
-	dependency	"$S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu"	\
-	compile-with	"uudecode < $S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu" \
-	no-implicit-rule
-#
-hptmvraid.o			optional	hptmv			\
-	dependency	"$S/dev/hptmv/i386-elf.raid.o.uu"		\
-	compile-with	"uudecode < $S/dev/hptmv/i386-elf.raid.o.uu"	\
-	no-implicit-rule
-#
-hptnr_lib.o			optional	hptnr			\
-	dependency	"$S/dev/hptnr/i386-elf.hptnr_lib.o.uu"	\
-	compile-with	"uudecode < $S/dev/hptnr/i386-elf.hptnr_lib.o.uu" \
-	no-implicit-rule
-#
-hptrr_lib.o			optional	hptrr			\
-	dependency	"$S/dev/hptrr/i386-elf.hptrr_lib.o.uu"		\
-	compile-with	"uudecode < $S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
-	no-implicit-rule
-#
 cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S	optional zfs | dtrace compile-with "${ZFS_S}"
 cddl/dev/dtrace/i386/dtrace_asm.S			optional dtrace compile-with "${DTRACE_S}"
 cddl/dev/dtrace/i386/dtrace_subr.c			optional dtrace compile-with "${DTRACE_C}"
@@ -204,20 +184,6 @@ dev/glxsb/glxsb.c		optional glxsb
 dev/glxsb/glxsb_hash.c		optional glxsb
 dev/gpio/bytgpio.c		optional	bytgpio
 dev/gpio/chvgpio.c		optional	chvgpio
-dev/hpt27xx/hpt27xx_os_bsd.c	optional hpt27xx
-dev/hpt27xx/hpt27xx_osm_bsd.c	optional hpt27xx
-dev/hpt27xx/hpt27xx_config.c	optional hpt27xx
-dev/hptmv/entry.c		optional hptmv
-dev/hptmv/mv.c			optional hptmv
-dev/hptmv/gui_lib.c		optional hptmv
-dev/hptmv/hptproc.c		optional hptmv
-dev/hptmv/ioctl.c		optional hptmv
-dev/hptnr/hptnr_os_bsd.c	optional hptnr
-dev/hptnr/hptnr_osm_bsd.c	optional hptnr
-dev/hptnr/hptnr_config.c	optional hptnr
-dev/hptrr/hptrr_os_bsd.c	optional hptrr
-dev/hptrr/hptrr_osm_bsd.c	optional hptrr
-dev/hptrr/hptrr_config.c	optional hptrr
 dev/hwpmc/hwpmc_amd.c		optional hwpmc
 dev/hwpmc/hwpmc_intel.c		optional hwpmc
 dev/hwpmc/hwpmc_core.c		optional hwpmc

Modified: head/sys/conf/files.x86
==============================================================================
--- head/sys/conf/files.x86	Wed Aug 14 20:57:54 2019	(r351043)
+++ head/sys/conf/files.x86	Wed Aug 14 20:58:01 2019	(r351044)
@@ -8,6 +8,11 @@
 # any other architecture we support.
 #
 
+# The long compile-with and dependency lines are required because of
+# limitations in config: backslash-newline doesn't work in strings, and
+# dependency lines other than the first are silently ignored.
+
+#
 cddl/dev/fbt/x86/fbt_isa.c				optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
 cddl/dev/dtrace/x86/dis_tables.c			optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}"
 cddl/dev/dtrace/x86/instr_size.c			optional dtrace_fbt | dtraceall compile-with "${DTRACE_C}"
@@ -15,6 +20,36 @@ dev/fdc/fdc.c			optional	fdc
 dev/fdc/fdc_acpi.c		optional	fdc
 dev/fdc/fdc_isa.c		optional	fdc isa
 dev/fdc/fdc_pccard.c		optional	fdc pccard
+dev/hpt27xx/hpt27xx_os_bsd.c	optional	hpt27xx
+dev/hpt27xx/hpt27xx_osm_bsd.c	optional	hpt27xx
+dev/hpt27xx/hpt27xx_config.c	optional	hpt27xx
+hpt27xx_lib.o			optional	hpt27xx			\
+	dependency	"$S/dev/hpt27xx/$M-elf.hpt27xx_lib.o.uu"	\
+	compile-with	"uudecode < $S/dev/hpt27xx/$M-elf.hpt27xx_lib.o.uu" \
+	no-implicit-rule
+dev/hptmv/entry.c		optional	hptmv
+dev/hptmv/mv.c			optional	hptmv
+dev/hptmv/gui_lib.c		optional	hptmv
+dev/hptmv/hptproc.c		optional	hptmv
+dev/hptmv/ioctl.c		optional	hptmv
+hptmvraid.o			optional	hptmv			\
+	dependency	"$S/dev/hptmv/$M-elf.raid.o.uu"			\
+	compile-with	"uudecode < $S/dev/hptmv/$M-elf.raid.o.uu"	\
+	no-implicit-rule
+dev/hptnr/hptnr_os_bsd.c	optional	hptnr
+dev/hptnr/hptnr_osm_bsd.c	optional	hptnr
+dev/hptnr/hptnr_config.c	optional	hptnr
+hptnr_lib.o			optional	hptnr			\
+	dependency	"$S/dev/hptnr/$M-elf.hptnr_lib.o.uu"		\
+	compile-with	"uudecode < $S/dev/hptnr/$M-elf.hptnr_lib.o.uu" \
+	no-implicit-rule
+dev/hptrr/hptrr_os_bsd.c	optional	hptrr
+dev/hptrr/hptrr_osm_bsd.c	optional	hptrr
+dev/hptrr/hptrr_config.c	optional	hptrr
+hptrr_lib.o			optional	hptrr			\
+	dependency	"$S/dev/hptrr/$M-elf.hptrr_lib.o.uu"		\
+	compile-with	"uudecode < $S/dev/hptrr/$M-elf.hptrr_lib.o.uu" \
+	no-implicit-rule
 libkern/x86/crc32_sse42.c	standard
 #
 # x86 shared code between IA32 and AMD64 architectures