summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifest17
-rw-r--r--usr/src/cmd/ast/Makefile.ast3
-rw-r--r--usr/src/cmd/ast/Makefile.astmsg4
-rw-r--r--usr/src/uts/intel/os/driver_aliases8
4 files changed, 28 insertions, 4 deletions
diff --git a/manifest b/manifest
index 87cd9c4f39..0f748a112a 100644
--- a/manifest
+++ b/manifest
@@ -1968,9 +1968,15 @@ d platform/i86pc/kernel/pcbe/amd64 0755 root sys
f platform/i86pc/kernel/pcbe/amd64/pcbe.AuthenticAMD 0755 root sys
f platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.15 0755 root sys
s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.122=pcbe.GenuineIntel.6.15
+s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.126=pcbe.GenuineIntel.6.15
+s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.134=pcbe.GenuineIntel.6.15
+s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.140=pcbe.GenuineIntel.6.15
+s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.141=pcbe.GenuineIntel.6.15
s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.142=pcbe.GenuineIntel.6.15
f platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.15 0755 root sys
s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.158=pcbe.GenuineIntel.6.15
+s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.165=pcbe.GenuineIntel.6.15
+s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.166=pcbe.GenuineIntel.6.15
s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.23=pcbe.GenuineIntel.6.15
s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.26=pcbe.GenuineIntel.6.15
s platform/i86pc/kernel/pcbe/amd64/pcbe.GenuineIntel.6.28=pcbe.GenuineIntel.6.15
@@ -3023,7 +3029,9 @@ f usr/include/asm/thread.h 0644 root bin
f usr/include/assert.h 0644 root bin
d usr/include/ast 0755 root bin
f usr/include/ast/align.h 0644 root bin
+f usr/include/ast/aso.h 0644 root bin
f usr/include/ast/ast.h 0644 root bin
+f usr/include/ast/ast_api.h 0644 root bin
f usr/include/ast/ast_botch.h 0644 root bin
f usr/include/ast/ast_ccode.h 0644 root bin
f usr/include/ast/ast_common.h 0644 root bin
@@ -3043,21 +3051,24 @@ f usr/include/ast/ast_namval.h 0644 root bin
f usr/include/ast/ast_ndbm.h 0644 root bin
f usr/include/ast/ast_nl_types.h 0644 root bin
f usr/include/ast/ast_param.h 0644 root bin
+f usr/include/ast/ast_sizeof.h 0644 root bin
f usr/include/ast/ast_standards.h 0644 root bin
f usr/include/ast/ast_std.h 0644 root bin
f usr/include/ast/ast_stdio.h 0644 root bin
f usr/include/ast/ast_sys.h 0644 root bin
f usr/include/ast/ast_time.h 0644 root bin
f usr/include/ast/ast_tty.h 0644 root bin
-f usr/include/ast/ast_version.h 0644 root bin
f usr/include/ast/ast_vfork.h 0644 root bin
f usr/include/ast/ast_wait.h 0644 root bin
f usr/include/ast/ast_wchar.h 0644 root bin
+f usr/include/ast/ast_wctype.h 0644 root bin
f usr/include/ast/ast_windows.h 0644 root bin
f usr/include/ast/bytesex.h 0644 root bin
f usr/include/ast/ccode.h 0644 root bin
f usr/include/ast/cdt.h 0644 root bin
+f usr/include/ast/cdtlib.h 0644 root bin
f usr/include/ast/cmd.h 0644 root bin
+f usr/include/ast/cmdarg.h 0644 root bin
f usr/include/ast/cmdext.h 0644 root bin
f usr/include/ast/debug.h 0644 root bin
f usr/include/ast/dirent.h 0644 root bin
@@ -3127,6 +3138,7 @@ f usr/include/ast/vecargs.h 0644 root bin
f usr/include/ast/vmalloc.h 0644 root bin
f usr/include/ast/wait.h 0644 root bin
f usr/include/ast/wchar.h 0644 root bin
+f usr/include/ast/wctype.h 0644 root bin
f usr/include/ast/wordexp.h 0644 root bin
f usr/include/atomic.h 0644 root bin
f usr/include/attr.h 0644 root bin
@@ -14754,6 +14766,7 @@ f usr/share/man/man3cpc/glm_events.3cpc 0444 root bin
f usr/share/man/man3cpc/glp_events.3cpc 0444 root bin
f usr/share/man/man3cpc/hsw_events.3cpc 0444 root bin
f usr/share/man/man3cpc/hsx_events.3cpc 0444 root bin
+f usr/share/man/man3cpc/icl_events.3cpc 0444 root bin
f usr/share/man/man3cpc/ivb_events.3cpc 0444 root bin
f usr/share/man/man3cpc/ivt_events.3cpc 0444 root bin
f usr/share/man/man3cpc/jkt_events.3cpc 0444 root bin
@@ -14768,6 +14781,8 @@ f usr/share/man/man3cpc/skl_events.3cpc 0444 root bin
f usr/share/man/man3cpc/skx_events.3cpc 0444 root bin
f usr/share/man/man3cpc/slm_events.3cpc 0444 root bin
f usr/share/man/man3cpc/snb_events.3cpc 0444 root bin
+f usr/share/man/man3cpc/snr_events.3cpc 0444 root bin
+f usr/share/man/man3cpc/tgl_events.3cpc 0444 root bin
f usr/share/man/man3cpc/wsm_ep_dp_events.3cpc 0444 root bin
f usr/share/man/man3cpc/wsm_ep_sp_events.3cpc 0444 root bin
f usr/share/man/man3cpc/wsm_ex_events.3cpc 0444 root bin
diff --git a/usr/src/cmd/ast/Makefile.ast b/usr/src/cmd/ast/Makefile.ast
index 66d799c6eb..1b7b6f1572 100644
--- a/usr/src/cmd/ast/Makefile.ast
+++ b/usr/src/cmd/ast/Makefile.ast
@@ -157,7 +157,8 @@ ASTCFLAGS64= $(CCVERBOSE)
#
# They have trailing whitespace, which is removed.
-POST_PROCESS_AST = $(SED) -i ' \
+# XXX WORKAROUND - add "" to the -i because SmartOS backed out illumos#586
+POST_PROCESS_AST = $(SED) -i "" ' \
s^$(SRC)/^^g; \
s/ *$$//; \
/def.* _def_.*_$(MACH64)/s/$(MACH64)/$(HDRGUARD)/; \
diff --git a/usr/src/cmd/ast/Makefile.astmsg b/usr/src/cmd/ast/Makefile.astmsg
index c7f911c260..b607c0f95a 100644
--- a/usr/src/cmd/ast/Makefile.astmsg
+++ b/usr/src/cmd/ast/Makefile.astmsg
@@ -49,8 +49,8 @@ MSGLIBNAME= $(ASTLIB)
ASTMSGCATALOG= $(ROOT)/usr/lib/locale/C/LC_MESSAGES/$(MSGLIBNAME)
$(DO_BUILD_AST_CATALOGS)ASTMSGCC= \
- PATH="/usr/ast/bin/:/bin:/usr/bin" \
- /usr/bin/ksh93 /usr/ast/bin/msgcc >>msgcc.out 2>&1
+ PATH="$(ASTBINDIR):/bin:/usr/bin" \
+ /usr/bin/ksh93 $(MSGCC) >>msgcc.out 2>&1
ASTMSGS= $(LIBOBJS:%.o=msgs/%.mso)
diff --git a/usr/src/uts/intel/os/driver_aliases b/usr/src/uts/intel/os/driver_aliases
index 8aab0f3f4a..2ffdd0b03e 100644
--- a/usr/src/uts/intel/os/driver_aliases
+++ b/usr/src/uts/intel/os/driver_aliases
@@ -614,6 +614,9 @@ hid "usbif,class3"
hme "pci108e,1001"
hubd "usbif,class9"
hxge "pci108e,aaaa"
+i40e "pciex8086,101f"
+i40e "pciex8086,104e"
+i40e "pciex8086,104f"
i40e "pciex8086,1572"
i40e "pciex8086,1580"
i40e "pciex8086,1581"
@@ -624,12 +627,15 @@ i40e "pciex8086,1586"
i40e "pciex8086,1589"
i40e "pciex8086,158a"
i40e "pciex8086,158b"
+i40e "pciex8086,15ff"
i40e "pciex8086,37ce"
i40e "pciex8086,37cf"
i40e "pciex8086,37d0"
i40e "pciex8086,37d1"
i40e "pciex8086,37d2"
i40e "pciex8086,37d3"
+i40e "pciex8086,cf8"
+i40e "pciex8086,d58"
i915 "pci8086,2562"
i915 "pci8086,2572"
i915 "pci8086,2582"
@@ -1320,9 +1326,11 @@ oce "pciex19a2,710"
ohci "pciclass,0c0310"
pcata "pccard,disk"
pchtemp "pci8086,2f9,p"
+pchtemp "pci8086,6f9,p"
pchtemp "pci8086,8ca4,p"
pchtemp "pci8086,8c24,p"
pchtemp "pci8086,8d24,p"
+pchtemp "pci8086,9ca4,p"
pchtemp "pci8086,9d31,p"
pchtemp "pci8086,9df9,p"
pchtemp "pci8086,a1b1,p"