summaryrefslogtreecommitdiff
path: root/usr/src/uts/sparc
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/sparc')
-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
4 files changed, 1 insertions, 80 deletions
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