Skip to content

Commit

Permalink
8685 uts and mdb: do not build 32bit kernel
Browse files Browse the repository at this point in the history
Reviewed by: Yuri Pankov <yuripv@gmx.com>
Reviewed by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Joshua M. Clulow <jmc@joyent.com>
  • Loading branch information
tsoome authored and Dan McDonald committed Jan 25, 2018
1 parent 141fdc8 commit 95cb2e3
Show file tree
Hide file tree
Showing 330 changed files with 97 additions and 4,526 deletions.
32 changes: 29 additions & 3 deletions exception_lists/closed-bins
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,49 @@
./etc/snmp/conf
./etc/snmp/conf/mibiisa.reg
./etc/snmp/conf/snmp.conf
./kernel/drv/cpqary3
./kernel/drv/cpqary3.conf
./kernel/drv/amd64/cpqary3
./kernel/drv/acpi_toshiba
./kernel/drv/adpu320
./kernel/drv/atiatom
./kernel/drv/bcm_sata
./kernel/drv/bnx
./kernel/drv/bnxe
./kernel/drv/bnxe.conf
./kernel/drv/amd64/bnxe
./kernel/drv/cpqary3
./kernel/drv/cpqary3.conf
./kernel/drv/amd64/cpqary3
./kernel/drv/glm
./kernel/drv/intel_nhmex
./kernel/drv/iprb
./kernel/drv/amd64/iprb
./kernel/drv/ixgb
./kernel/drv/lsimega
./kernel/drv/marvell88sx
./kernel/drv/mpt
./kernel/drv/pcn
./kernel/drv/amd64/pcn
./kernel/drv/pcser
./kernel/drv/amd64/pcser
./kernel/drv/sparcv9/pcser
./kernel/drv/sdpib
./kernel/drv/usbser_edge
./kernel/kmdb/mpt
./kernel/kmdb/nfs
./kernel/misc/klmmod
./kernel/misc/amd64/klmmod
./kernel/misc/klmops
./kernel/misc/amd64/klmops
./kernel/misc/scsi_vhci/scsi_vhci_f_asym_emc
./kernel/misc/scsi_vhci/scsi_vhci_f_asym_lsi
./kernel/misc/scsi_vhci/scsi_vhci_f_sym_emc
./kernel/strmod/sdpib
./lib/crypto
./lib/crypto/kcfd
./lib/libc_i18n.a
./lib/amd64/libc_i18n.a
./lib/sparcv9/libc_i18n.a
./platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.46
./platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.47
./platform/sun4v/kernel/drv/ncp.conf
./platform/sun4v/kernel/drv/n2cp.conf
./usr/has
Expand All @@ -56,6 +77,9 @@
./usr/kernel/drv/sparcv9/llc2
./usr/kernel/drv/llc2.conf
./usr/kernel/drv/llc2
./usr/lib/inet/i86
./usr/lib/inet/i86/in.iked
./usr/lib/libike.so
./usr/lib/llc2
./usr/lib/llc2/llc2_config
./usr/lib/llc2/llc2_loop3
Expand All @@ -79,6 +103,8 @@
./usr/lib/localedef/src/iso_8859_1/charmap.src
./usr/lib/localedef/src/iso_8859_1/extension.src
./usr/lib/localedef/src/iso_8859_1/localedef.src
./usr/lib/mdb/kvm/mpt.so
./usr/lib/mdb/kvm/nfs.so
./usr/lib/nfs/lockd
./usr/lib/snmp
./usr/lib/snmp/mibiisa
Expand Down
6 changes: 0 additions & 6 deletions exception_lists/packaging
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ usr/include/libsocket_priv.h
usr/include/errfp.h
usr/include/ikedoor.h
usr/include/ipsec_util.h
usr/lib/libike.so
usr/lib/amd64/libike.so i386
usr/lib/sparcv9/libike.so sparc
usr/lib/libipsecutil.so
Expand Down Expand Up @@ -467,7 +466,6 @@ usr/include/aclutils.h
#
# USB skeleton driver stays in sync with the rest of USB but doesn't ship.
#
kernel/drv/usbskel i386
kernel/drv/amd64/usbskel i386
kernel/drv/sparcv9/usbskel sparc
kernel/drv/usbskel.conf
Expand Down Expand Up @@ -814,16 +812,12 @@ usr/lib/fs/smbfs/lsacl
opt/smbcl-tests
#
# FC related files
kernel/kmdb/fcip i386
kernel/kmdb/amd64/fcip i386
kernel/kmdb/sparcv9/fcip sparc
kernel/kmdb/fcp i386
kernel/kmdb/amd64/fcp i386
kernel/kmdb/sparcv9/fcp sparc
kernel/kmdb/fctl i386
kernel/kmdb/amd64/fctl i386
kernel/kmdb/sparcv9/fctl sparc
kernel/kmdb/qlc i386
kernel/kmdb/amd64/qlc i386
kernel/kmdb/sparcv9/qlc sparc
lib/llib-la5k sparc
Expand Down
1 change: 0 additions & 1 deletion usr/src/Targetdirs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ DIRS= \
/usr/lib/hal \
/usr/lib/inet \
/usr/lib/inet/ilb \
/usr/lib/inet/$(MACH32) \
/usr/lib/inet/wanboot \
/usr/lib/krb5 \
/usr/lib/link_audit \
Expand Down
1 change: 0 additions & 1 deletion usr/src/cmd/mdb/Makefile.kmdb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ CPPFLAGS += -D_MDB -D_KMDB $(INCDIRS:%=-I%) $(ARCHOPTS)

#
# kmdb is a kernel module, so we'll use the kernel's build flags.
CFLAGS += $(STAND_FLAGS_32)
CFLAGS64 += $(STAND_FLAGS_64)

ASFLAGS += -P -D_ASM $(INCDIRS:%=-I%) $(ARCHOPTS)
Expand Down
1 change: 0 additions & 1 deletion usr/src/cmd/mdb/Makefile.libstand
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ CPPFLAGS = $(INCDIRS:%=-I%) -D_KMDB

#
# kmdb is a kernel module, so we'll use the kernel's build flags.
CFLAGS += $(STAND_FLAGS_32)
CFLAGS64 += $(STAND_FLAGS_64)

ASFLAGS += -P -D_ASM
Expand Down
1 change: 0 additions & 1 deletion usr/src/cmd/mdb/Makefile.libstandctf
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ CPPFLAGS += -I$(SRC)/common/ctf -I../../../common -DCTF_OLD_VERSIONS -D_MDB \

#
# kmdb is a kernel module, so we'll use the kernel's build flags.
CFLAGS += $(STAND_FLAGS_32)
CFLAGS64 += $(STAND_FLAGS_64)

LDFLAGS = $(ZNOVERSION) $(BREDUCE) -M $(MAPFILE) -dy -r
Expand Down
1 change: 0 additions & 1 deletion usr/src/cmd/mdb/Makefile.module
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ MAPFILE-EXT = $(SRC)/cmd/mdb/common/modules/conf/mapfile-extern

#
# kmdb is a kernel module, so we'll use the kernel's build flags.
$(KMODOBJS) := CFLAGS += $(STAND_FLAGS_32)
$(KMODOBJS) := CFLAGS64 += $(STAND_FLAGS_64)

#
Expand Down
1 change: 0 additions & 1 deletion usr/src/cmd/mdb/i86pc/modules/apix/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
#

include $(SRC)/Makefile.master
SUBDIRS = ia32
$(BUILD64)SUBDIRS += $(MACH64)
include ../../../Makefile.subdirs
44 changes: 0 additions & 44 deletions usr/src/cmd/mdb/i86pc/modules/apix/ia32/Makefile

This file was deleted.

2 changes: 0 additions & 2 deletions usr/src/cmd/mdb/i86pc/modules/pcplusmp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"

include $(SRC)/Makefile.master
SUBDIRS = ia32
$(BUILD64)SUBDIRS += $(MACH64)
include ../../../Makefile.subdirs
44 changes: 0 additions & 44 deletions usr/src/cmd/mdb/i86pc/modules/pcplusmp/ia32/Makefile

This file was deleted.

2 changes: 0 additions & 2 deletions usr/src/cmd/mdb/i86pc/modules/unix/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"

include $(SRC)/Makefile.master
SUBDIRS = ia32
$(BUILD64)SUBDIRS += $(MACH64)
include ../../../Makefile.subdirs
48 changes: 0 additions & 48 deletions usr/src/cmd/mdb/i86pc/modules/unix/ia32/Makefile

This file was deleted.

2 changes: 0 additions & 2 deletions usr/src/cmd/mdb/i86pc/modules/uppc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"

include $(SRC)/Makefile.master
SUBDIRS = ia32
$(BUILD64)SUBDIRS += $(MACH64)
include ../../../Makefile.subdirs
45 changes: 0 additions & 45 deletions usr/src/cmd/mdb/i86pc/modules/uppc/ia32/Makefile

This file was deleted.

2 changes: 0 additions & 2 deletions usr/src/cmd/mdb/i86xpv/modules/unix/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#ident "%Z%%M% %I% %E% SMI"

include $(SRC)/Makefile.master
SUBDIRS = ia32
$(BUILD64)SUBDIRS += $(MACH64)
include ../../../Makefile.subdirs
Loading

0 comments on commit 95cb2e3

Please sign in to comment.