summaryrefslogtreecommitdiff
path: root/usr/src/uts
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts')
-rw-r--r--usr/src/uts/Makefile.targ11
-rw-r--r--usr/src/uts/common/io/1394/inc.flg16
-rw-r--r--usr/src/uts/common/io/ib/inc.flg3
-rw-r--r--usr/src/uts/intel/ml/i86_subr.s2
-rw-r--r--usr/src/uts/sparc/Makefile.files5
-rw-r--r--usr/src/uts/sparc/Makefile.sparc2
-rw-r--r--usr/src/uts/sparc/ml/sparc.il70
-rw-r--r--usr/src/uts/sparc/req.flg4
-rw-r--r--usr/src/uts/sun/io/scsi/inc.flg1
-rw-r--r--usr/src/uts/sun4u/Makefile.sun4u2
-rw-r--r--usr/src/uts/sun4u/db21554/Makefile3
-rw-r--r--usr/src/uts/sun4u/md5/Makefile5
-rw-r--r--usr/src/uts/sun4u/md5/inc.flg2
-rw-r--r--usr/src/uts/sun4u/opl/Makefile.rules10
-rw-r--r--usr/src/uts/sun4u/sbbc/Makefile3
-rw-r--r--usr/src/uts/sun4u/sbus/Makefile3
-rw-r--r--usr/src/uts/sun4u/serengeti/Makefile.rules16
-rw-r--r--usr/src/uts/sun4v/Makefile.sun4v2
-rw-r--r--usr/src/uts/sun4v/md5/Makefile5
19 files changed, 16 insertions, 149 deletions
diff --git a/usr/src/uts/Makefile.targ b/usr/src/uts/Makefile.targ
index 7e6896a508..c7d771d6e5 100644
--- a/usr/src/uts/Makefile.targ
+++ b/usr/src/uts/Makefile.targ
@@ -33,17 +33,6 @@
#
#
-# All C objects depend on inline files. However, cc(1) doesn't generate
-# the correct dependency info. Also, these Makefiles don't contain a
-# separate list of C-derived object files (but it is light weight to
-# let the assembler files think they depend upon this when they don't).
-# Fortunately, the inline files won't change very often. So, for now,
-# all objects depend on the inline files. Remove this when the inliner
-# is fixed to drop correct dependency information.
-#
-$(OBJECTS): $(INLINES)
-
-#
# Partially link .o files to generate the kmod. The fake dependency
# on modstubs simplifies things...
#
diff --git a/usr/src/uts/common/io/1394/inc.flg b/usr/src/uts/common/io/1394/inc.flg
index 5c0ff64f53..1763c679cf 100644
--- a/usr/src/uts/common/io/1394/inc.flg
+++ b/usr/src/uts/common/io/1394/inc.flg
@@ -25,7 +25,7 @@
# Use is subject to license terms.
#
-# This file brings down all that is needed to build just
+# This file brings down all that is needed to build just
# 1394 drivers.
#
@@ -36,22 +36,22 @@ find_files "s.*.h" \
usr/src/uts/common/sys
find_files "s.*.h" \
- usr/src/uts/sparc/sys
+ usr/src/uts/sparc/sys
find_files "s.*.h" \
- usr/src/uts/sparc/v7/sys
+ usr/src/uts/sparc/v7/sys
find_files "s.*.h" \
- usr/src/uts/sparc/v9/sys
+ usr/src/uts/sparc/v9/sys
find_files "s.*.h" \
- usr/src/uts/sun/sys
+ usr/src/uts/sun/sys
find_files "s.*.h" \
- usr/src/uts/sun4u/sys
+ usr/src/uts/sun4u/sys
find_files "s.*.h" \
- usr/src/uts/common/vm
+ usr/src/uts/common/vm
find_files "s.*" \
usr/src/uts/sparc/hci1394 \
@@ -75,6 +75,4 @@ echo_file usr/src/uts/sparc/Makefile.files
echo_file usr/src/uts/sparc/Makefile.rules
echo_file usr/src/uts/sparc/Makefile.sparc
echo_file usr/src/uts/sparc/Makefile.targ
-echo_file usr/src/uts/sparc/ml/sparc.il
echo_file usr/src/uts/sparc/req.flg
-
diff --git a/usr/src/uts/common/io/ib/inc.flg b/usr/src/uts/common/io/ib/inc.flg
index 4fca0e4d50..0e76d857f3 100644
--- a/usr/src/uts/common/io/ib/inc.flg
+++ b/usr/src/uts/common/io/ib/inc.flg
@@ -65,7 +65,7 @@ find_files "s.*" \
usr/src/uts/intel/ibmf \
usr/src/uts/intel/ibtl \
usr/src/uts/intel/ibp \
- usr/src/uts/intel/rpcib
+ usr/src/uts/intel/rpcib
# packaging files
find_files "s.*" usr/src/pkg/license_files
@@ -96,7 +96,6 @@ echo_file usr/src/uts/sparc/Makefile.files
echo_file usr/src/uts/sparc/Makefile.rules
echo_file usr/src/uts/sparc/Makefile.sparc
echo_file usr/src/uts/sparc/Makefile.targ
-echo_file usr/src/uts/sparc/ml/sparc.il
echo_file usr/src/uts/sparc/req.flg
echo_file usr/src/uts/intel/Makefile
echo_file usr/src/uts/intel/Makefile.files
diff --git a/usr/src/uts/intel/ml/i86_subr.s b/usr/src/uts/intel/ml/i86_subr.s
index 2a1a183026..61c457135d 100644
--- a/usr/src/uts/intel/ml/i86_subr.s
+++ b/usr/src/uts/intel/ml/i86_subr.s
@@ -745,7 +745,7 @@ str_valid:
/*
* Replacement functions for ones that are normally inlined.
- * In addition to the copy in i86.il, they are defined here just in case.
+ * In addition to the inline copies, they are defined here just in case.
*/
ENTRY(intr_clear)
diff --git a/usr/src/uts/sparc/Makefile.files b/usr/src/uts/sparc/Makefile.files
index bb662117a5..09c47476c4 100644
--- a/usr/src/uts/sparc/Makefile.files
+++ b/usr/src/uts/sparc/Makefile.files
@@ -117,8 +117,3 @@ INC_PATH += -I$(UTSBASE)/sparc/krtld
# all files including this file.
#
ASSYM_DEPS += sparc_ddi.o
-
-#
-# Inlined assembler routines.
-#
-INLINES += $(UTSBASE)/sparc/ml/sparc.il
diff --git a/usr/src/uts/sparc/Makefile.sparc b/usr/src/uts/sparc/Makefile.sparc
index b35e264e71..210d2b512a 100644
--- a/usr/src/uts/sparc/Makefile.sparc
+++ b/usr/src/uts/sparc/Makefile.sparc
@@ -119,7 +119,7 @@ CFLAGS += $(XARCH)
CFLAGS += $(COPTIMIZE)
CFLAGS += $(EXTRA_CFLAGS)
CFLAGS += $(XAOPT)
-CFLAGS += $(INLINES) -D_ASM_INLINES
+CFLAGS += -D_ASM_INLINES
CFLAGS += $(CCMODE)
CFLAGS += $(SPACEFLAG)
CFLAGS += $(CERRWARN)
diff --git a/usr/src/uts/sparc/ml/sparc.il b/usr/src/uts/sparc/ml/sparc.il
deleted file mode 100644
index 8337c30728..0000000000
--- a/usr/src/uts/sparc/ml/sparc.il
+++ /dev/null
@@ -1,70 +0,0 @@
-!
-! Copyright 2009 Sun Microsystems, Inc. All rights reserved.
-! Use is subject to license terms.
-!
-! CDDL HEADER START
-!
-! The contents of this file are subject to the terms of the
-! Common Development and Distribution License (the "License").
-! You may not use this file except in compliance with the License.
-!
-! You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-! or http://www.opensolaris.org/os/licensing.
-! See the License for the specific language governing permissions
-! and limitations under the License.
-!
-! When distributing Covered Code, include this CDDL HEADER in each
-! file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-! If applicable, add the following below this CDDL HEADER, with the
-! fields enclosed by brackets "[]" replaced with your own identifying
-! information: Portions Copyright [yyyy] [name of copyright owner]
-!
-! CDDL HEADER END
-!
-!
-! In-line functions for sparc kernels.
-!
-
-! return current thread pointer
-
- .inline threadp,0
- .register %g7, #scratch
- mov %g7, %o0
- .end
-
-! return caller
-
- .inline caller,0
- mov %i7, %o0
- .end
-
-! return callee
-
- .inline callee,0
- mov %o7, %o0
- .end
-
-! needed by krtld
-
- .inline doflush,0
- andn %o0, 3, %o0
- flush %o0
- .end
-
-! prefetch 64 bytes into L2-cache
-
- .inline prefetch_read_many,8
- prefetch [%o0], #n_reads
- .end
-
- .inline prefetch_read_once,8
- prefetch [%o0], #one_read
- .end
-
- .inline prefetch_write_many,8
- prefetch [%o0], #n_writes
- .end
-
- .inline prefetch_write_once,8
- prefetch [%o0], #one_write
- .end
diff --git a/usr/src/uts/sparc/req.flg b/usr/src/uts/sparc/req.flg
index b2dd456328..c909e3508a 100644
--- a/usr/src/uts/sparc/req.flg
+++ b/usr/src/uts/sparc/req.flg
@@ -36,7 +36,3 @@ echo_file usr/src/uts/sun/Makefile.rules
echo_file usr/src/uts/common/Makefile.files
echo_file usr/src/uts/common/Makefile.rules
-
-# uts/Makefile.targ (version 1.17) says "All C objects depend on
-# inline files".
-echo_file usr/src/uts/sparc/ml/sparc.il
diff --git a/usr/src/uts/sun/io/scsi/inc.flg b/usr/src/uts/sun/io/scsi/inc.flg
index 6dcd7cc954..4aa2e3d758 100644
--- a/usr/src/uts/sun/io/scsi/inc.flg
+++ b/usr/src/uts/sun/io/scsi/inc.flg
@@ -72,7 +72,6 @@ echo_file usr/src/uts/sparc/Makefile.files
echo_file usr/src/uts/sparc/Makefile.rules
echo_file usr/src/uts/sparc/Makefile.sparc
echo_file usr/src/uts/sparc/Makefile.targ
-echo_file usr/src/uts/sparc/ml/sparc.il
echo_file usr/src/uts/sparc/req.flg
echo_file usr/src/uts/sun/Makefile.files
echo_file usr/src/uts/sun/Makefile.rules
diff --git a/usr/src/uts/sun4u/Makefile.sun4u b/usr/src/uts/sun4u/Makefile.sun4u
index 0979312bb1..947e17625f 100644
--- a/usr/src/uts/sun4u/Makefile.sun4u
+++ b/usr/src/uts/sun4u/Makefile.sun4u
@@ -187,7 +187,7 @@ CFLAGS += $(CC_XARCH)
CFLAGS += $(COPTIMIZE)
CFLAGS += $(EXTRA_CFLAGS)
CFLAGS += $(XAOPT)
-CFLAGS += $(INLINES) -D_ASM_INLINES
+CFLAGS += -D_ASM_INLINES
CFLAGS += $(CCMODE)
CFLAGS += $(SPACEFLAG)
CFLAGS += $(CERRWARN)
diff --git a/usr/src/uts/sun4u/db21554/Makefile b/usr/src/uts/sun4u/db21554/Makefile
index b59bcd53c8..e6ae7826fe 100644
--- a/usr/src/uts/sun4u/db21554/Makefile
+++ b/usr/src/uts/sun4u/db21554/Makefile
@@ -54,9 +54,6 @@ include $(UTSBASE)/sun4u/Makefile.sun4u
ALL_TARGET = $(BINARY)
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
-# Turn this on once compiler understands v9 in it's backend
-#INLINES += $(UTSBASE)/sun4u/io/pci.il
-
#
# Turn on doubleword alignment for 64 bit registers
#
diff --git a/usr/src/uts/sun4u/md5/Makefile b/usr/src/uts/sun4u/md5/Makefile
index 6b220c54a2..67739996b8 100644
--- a/usr/src/uts/sun4u/md5/Makefile
+++ b/usr/src/uts/sun4u/md5/Makefile
@@ -61,11 +61,6 @@ CFLAGS += $(CCVERBOSE)
LDFLAGS += -Nmisc/kcf
#
-# need extra inline file for here.
-#
-INLINES += $(SRC)/common/crypto/md5/sparc/sun4u/byteswap.il
-
-#
# Default build targets.
#
.KEEP_STATE:
diff --git a/usr/src/uts/sun4u/md5/inc.flg b/usr/src/uts/sun4u/md5/inc.flg
index b7893b0dec..f2ba849728 100644
--- a/usr/src/uts/sun4u/md5/inc.flg
+++ b/usr/src/uts/sun4u/md5/inc.flg
@@ -24,7 +24,5 @@
# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
echo_file usr/src/common/crypto/md5/md5.c
-echo_file usr/src/common/crypto/md5/sparc/sun4u/byteswap.il
diff --git a/usr/src/uts/sun4u/opl/Makefile.rules b/usr/src/uts/sun4u/opl/Makefile.rules
index 3c3bc09263..842f5a874b 100644
--- a/usr/src/uts/sun4u/opl/Makefile.rules
+++ b/usr/src/uts/sun4u/opl/Makefile.rules
@@ -64,10 +64,9 @@ $(SBDGENERR): $(DR_IO)/sbdgenerr.pl
IL_CPP=$(CPP) -P -DINLINE -D_ASM $(AS_INC_PATH) \
$(CPP_DEFS) $(ALWAYS_DEFS) $(ALL_DEFS) $(CONFIG_DEFS)
-DRMACH_IL= $(OBJS_DIR)/drmach.il
$(OBJS_DIR)/drmach.o := CC_XARCH_32 = -xarch=v8plusa
-$(OBJS_DIR)/drmach.o: $(UTSBASE)/sun4u/opl/io/drmach.c $(DRMACH_IL)
- $(COMPILE.c) $(DRMACH_IL) -o $@ $(UTSBASE)/sun4u/opl/io/drmach.c
+$(OBJS_DIR)/drmach.o: $(UTSBASE)/sun4u/opl/io/drmach.c
+ $(COMPILE.c) -o $@ $(UTSBASE)/sun4u/opl/io/drmach.c
$(CTFCONVERT_O)
$(OBJS_DIR)/%.o: $(UTSBASE)/sun4u/opl/io/%.c
@@ -101,9 +100,4 @@ $(OPL_IO)/drmach_err.c: $(SBDGENERR) $(SBD_IOCTL)
$(RM) $@
$(SBDGENERR) EOPL < $(SBD_IOCTL) > $@
-CLEANFILES += $(DRMACH_IL)
-
-$(DRMACH_IL): $(UTSBASE)/sun4u/opl/ml/drmach.il.cpp
- $(IL_CPP) $(UTSBASE)/sun4u/opl/ml/drmach.il.cpp > $@
-
.KEEP_STATE:
diff --git a/usr/src/uts/sun4u/sbbc/Makefile b/usr/src/uts/sun4u/sbbc/Makefile
index 69d3b24876..554104627b 100644
--- a/usr/src/uts/sun4u/sbbc/Makefile
+++ b/usr/src/uts/sun4u/sbbc/Makefile
@@ -53,9 +53,6 @@ include $(UTSBASE)/sun4u/Makefile.sun4u
ALL_TARGET = $(BINARY)
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
-# Turn this on once compiler understands v9 in it's backend
-#INLINES += $(UTSBASE)/sun4u/io/sbbc.il
-
#
# Turn on doubleword alignment for 64 bit registers
#
diff --git a/usr/src/uts/sun4u/sbus/Makefile b/usr/src/uts/sun4u/sbus/Makefile
index f950751b24..93301f25a0 100644
--- a/usr/src/uts/sun4u/sbus/Makefile
+++ b/usr/src/uts/sun4u/sbus/Makefile
@@ -54,9 +54,6 @@ include $(UTSBASE)/sun4u/Makefile.sun4u
ALL_TARGET = $(BINARY)
INSTALL_TARGET = $(BINARY) $(ROOTMODULE)
-# Turn this on once compiler understands v9 in it's backend
-#INLINES += $(UTSBASE)/sun4u/io/iommu.il
-
#
# Turn on doubleword alignment for 64 bit registers
#
diff --git a/usr/src/uts/sun4u/serengeti/Makefile.rules b/usr/src/uts/sun4u/serengeti/Makefile.rules
index 2d386e2e41..708b511fba 100644
--- a/usr/src/uts/sun4u/serengeti/Makefile.rules
+++ b/usr/src/uts/sun4u/serengeti/Makefile.rules
@@ -38,11 +38,9 @@
#
# Section 1a: C object build rules
#
-SBDP_IL=$(OBJS_DIR)/sbdp.il
-
$(OBJS_DIR)/sbdp_mem.o := CC_XARCH_32 = -xarch=v8plusa
-$(OBJS_DIR)/%.o: $(UTSBASE)/sun4u/serengeti/io/%.c $(SBDP_IL)
- $(COMPILE.c) $(SBDP_IL) -o $@ $<
+$(OBJS_DIR)/%.o: $(UTSBASE)/sun4u/serengeti/io/%.c
+ $(COMPILE.c) -o $@ $<
$(CTFCONVERT_O)
$(OBJS_DIR)/%.o: $(UTSBASE)/sun4u/serengeti/ml/%.s
@@ -51,13 +49,3 @@ $(OBJS_DIR)/%.o: $(UTSBASE)/sun4u/serengeti/ml/%.s
$(OBJS_DIR)/%.o: $(UTSBASE)/sun4u/serengeti/os/%.c
$(COMPILE.c) -o $@ $<
$(CTFCONVERT_O)
-
-
-# inline stuff
-
-IL_CPP=$(CPP) -P -DINLINE -D_ASM $(AS_INC_PATH) \
- $(CPP_DEFS) $(ALWAYS_DEFS) $(ALL_DEFS) $(CONFIG_DEFS)
-CLEANFILES += $(SBDP_IL)
-
-$(SBDP_IL): $(UTSBASE)/sun4u/serengeti/ml/sbdp.il.cpp
- $(IL_CPP) $(UTSBASE)/sun4u/serengeti/ml/sbdp.il.cpp >$@
diff --git a/usr/src/uts/sun4v/Makefile.sun4v b/usr/src/uts/sun4v/Makefile.sun4v
index ecc3f509db..abb9c9bc9f 100644
--- a/usr/src/uts/sun4v/Makefile.sun4v
+++ b/usr/src/uts/sun4v/Makefile.sun4v
@@ -169,7 +169,7 @@ CFLAGS += $(CC_XARCH)
CFLAGS += $(COPTIMIZE)
CFLAGS += $(EXTRA_CFLAGS)
CFLAGS += $(XAOPT)
-CFLAGS += $(INLINES) -D_ASM_INLINES
+CFLAGS += -D_ASM_INLINES
CFLAGS += $(CCMODE)
CFLAGS += $(SPACEFLAG)
CFLAGS += $(CERRWARN)
diff --git a/usr/src/uts/sun4v/md5/Makefile b/usr/src/uts/sun4v/md5/Makefile
index 4d85f10c8f..658f3b834d 100644
--- a/usr/src/uts/sun4v/md5/Makefile
+++ b/usr/src/uts/sun4v/md5/Makefile
@@ -66,11 +66,6 @@ sparc_SPACEFLAG = -W0,-Lt
LDFLAGS += -Nmisc/kcf
#
-# need extra inline file for here.
-#
-INLINES += $(SRC)/common/crypto/md5/sparc/sun4v/byteswap.il
-
-#
# Default build targets.
#
.KEEP_STATE:
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 10:03:51 +0000