[illumos-gate merge]

commit 564d52366b33ac17bebd5b441ac47b668dfcb6cd
    15040 remove support for unused sun studio inline asm
commit 6faa6645c7a15dbddad859508e1f766bf1cef639
    15012 nightly should fail if tools build failed
commit 3c6ef809288edc29a5dd9e0664c095967e7903dc
    13313 tools build uses cw from /opt/onbld even if -t flag is specified

3 files changed, 0 insertions, 259 deletions

diff --git a/usr/src/lib/libc/sparcv9/Makefile.com b/usr/src/lib/libc/sparcv9/Makefile.com
index eaa772040b..b7c3b49703 100644
--- a/usr/src/lib/libc/sparcv9/Makefile.com
+++ b/usr/src/lib/libc/sparcv9/Makefile.com
@@ -1134,83 +1134,9 @@ CLOBBERFILES +=	$(LIB_PIC)
 $(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
 
-# Files which need the threads .il inline template
-TIL=				\
-	aio.o			\
-	alloc.o			\
-	assfail.o		\
-	atexit.o		\
-	atfork.o		\
-	cancel.o		\
-	door_calls.o		\
-	err.o			\
-	errno.o			\
-	getctxt.o		\
-	lwp.o			\
-	ma.o			\
-	machdep.o		\
-	posix_aio.o		\
-	pthr_attr.o		\
-	pthr_barrier.o		\
-	pthr_cond.o		\
-	pthr_mutex.o		\
-	pthr_rwlock.o		\
-	pthread.o		\
-	rand.o			\
-	rwlock.o		\
-	scalls.o		\
-	sched.o			\
-	sema.o			\
-	sigaction.o		\
-	sigev_thread.o		\
-	spawn.o			\
-	stack.o			\
-	swapctxt.o		\
-	synch.o			\
-	tdb_agent.o		\
-	thr.o			\
-	thread_interface.o	\
-	thread_pool.o		\
-	tls.o			\
-	tsd.o			\
-	unwind.o
-
-$(TIL:%=pics/%) := CFLAGS64 += $(LIBCBASE)/threads/sparcv9.il
-
-# Files in fp, port/fp subdirectories that need base.il inline template
-IL=				\
-	__flt_decim.o		\
-	decimal_bin.o
-
-$(IL:%=pics/%) := CFLAGS64 += $(LIBCBASE)/fp/base.il
-
-# Files in fp subdirectory which need __quad.il inline template
-QIL=				\
-	_Q_add.o		\
-	_Q_cmp.o		\
-	_Q_cmpe.o		\
-	_Q_div.o		\
-	_Q_dtoq.o		\
-	_Q_fcc.o		\
-	_Q_mul.o		\
-	_Q_qtod.o		\
-	_Q_qtoi.o		\
-	_Q_qtos.o		\
-	_Q_qtou.o		\
-	_Q_sqrt.o		\
-	_Q_stoq.o		\
-	_Q_sub.o		\
-	_Qp_qtox.o		\
-	_Qp_qtoux.o
-
-$(QIL:%=pics/%) := CFLAGS64 += $(LIBCDIR)/$(MACH)/fp/__quad.il
 pics/_Qp%.o := CFLAGS64 += -I$(LIBCDIR)/$(MACH)/fp
 pics/_Q%.o := sparcv9_COPTFLAG = -xO4 -xchip=ultra
 
-# Files in crt subdirectory which need muldiv64.il inline template
-#CIL=	mul64.o divrem64.o
-#$(CIL:%=pics/%) := CFLAGS += $(LIBCBASE)/crt/mul64.il
-
 # large-file-aware components that should be built large
 
 #$(COMSYSOBJS64:%=pics/%) := \
@@ -1252,12 +1178,6 @@ STACKPROTECT = none
 
 all: $(LIBS) $(LIB_PIC)
 
-# object files that depend on inline template
-$(TIL:%=pics/%): $(LIBCBASE)/threads/sparcv9.il
-$(IL:%=pics/%): $(LIBCBASE)/fp/base.il
-$(QIL:%=pics/%): $(LIBCDIR)/$(MACH)/fp/__quad.il
-#$(CIL:%=pics/%): $(LIBCBASE)/crt/muldiv64.il
-
 # include common libc targets
 include $(LIBCDIR)/Makefile.targ
 
diff --git a/usr/src/lib/libc/sparcv9/fp/base.il b/usr/src/lib/libc/sparcv9/fp/base.il
deleted file mode 100644
index 8bdab78f32..0000000000
--- a/usr/src/lib/libc/sparcv9/fp/base.il
+++ /dev/null
@@ -1,62 +0,0 @@
-! .ident	"%Z%%M%	%I%	%E% SMI"
-!
-! Copyright 2005 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, Version 1.0 only
-! (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
-!
-
-	.inline	__mul_set,0
-	.volatile
-	fmuld	%f0,%f2,%f0		! compute result and leave it for return
-	st	%fsr,[%sp+0x87f]
-	.nonvolatile
-	ld	[%sp+0x87f],%o0
-	and	%o0,1,%o0
-	st	%o0,[%o2]		! store eround
-	.end
-
-	.inline	__div_set,0
-	.volatile
-	fdivd	%f0,%f2,%f0
-	st	%fsr,[%sp+0x87f]
-	.nonvolatile
-	ld	[%sp+0x87f],%o0
-	and	%o0,1,%o0
-	st	%o0,[%o2]		! store eround
-	.end
-
-	.inline	__dabs,0
-	ldd	[%o0],%f0
-	fabsd	%f0,%f0
-	.end
-
-	.inline	__get_ieee_flags,0
-	.volatile
-	st	%fsr,[%o0]
-	st	%g0,[%sp+0x87f]
-	ld	[%sp+0x87f],%fsr
-	.nonvolatile
-	.end
-
-	.inline	__set_ieee_flags,0
-	ld	[%o0],%fsr
-	.end
diff --git a/usr/src/lib/libc/sparcv9/threads/sparcv9.il b/usr/src/lib/libc/sparcv9/threads/sparcv9.il
deleted file mode 100644
index 4f1d543f6c..0000000000
--- a/usr/src/lib/libc/sparcv9/threads/sparcv9.il
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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
- */
-/*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-	.inline	_curthread, 0
-	.register %g7, #scratch
-	mov	%g7, %o0
-	.end
-
-	.inline	__curthread, 0
-	.register %g7, #scratch
-	ldx	[%g7 + 80], %o0		! ul_self
-	.end
-
-	.inline	stkptr, 0
-	mov	%sp, %o0
-	.end
-
-	.inline	gethrtime, 0
-	.volatile
-	ta	0x24
-	sllx	%o0, 32, %o0
-	or	%o1, %o0, %o0
-	.nonvolatile
-	.end
-
-	.inline	set_lock_byte, 0
-	ldstub	[%o0], %o0
-	membar	#LoadLoad
-	.end
-
-	.inline	atomic_cas_32, 0
-	cas	[%o0], %o1, %o2
-	mov	%o2, %o0
-	.end
-
-	.inline	atomic_swap_32, 0
-	ld	[%o0], %o2
-1:
-	mov	%o1, %o3
-	cas	[%o0], %o2, %o3
-	cmp	%o2, %o3
-	bne,a,pn %icc, 1b
-	  mov	%o3, %o2
-	mov	%o3, %o0
-	.end
-
-	.inline	atomic_inc_32, 0
-	ld	[%o0], %o2
-1:
-	add	%o2, 1, %o3
-	cas	[%o0], %o2, %o3
-	cmp	%o2, %o3
-	bne,a,pn %icc, 1b
-	  mov	%o3, %o2
-	.end
-
-	.inline	atomic_dec_32, 0
-	ld	[%o0], %o2
-1:
-	sub	%o2, 1, %o3
-	cas	[%o0], %o2, %o3
-	cmp	%o2, %o3
-	bne,a,pn %icc, 1b
-	  mov	%o3, %o2
-	.end
-
-	.inline	atomic_and_32, 0
-	ld	[%o0], %o2
-1:
-	and	%o2, %o1, %o3
-	cas	[%o0], %o2, %o3
-	cmp	%o2, %o3
-	bne,a,pn %icc, 1b
-	  mov	%o3, %o2
-	.end
-
-	.inline	atomic_or_32, 0
-	ld	[%o0], %o2
-1:
-	or	%o2, %o1, %o3
-	cas	[%o0], %o2, %o3
-	cmp	%o2, %o3
-	bne,a,pn %icc, 1b
-	  mov	%o3, %o2
-	.end
-
-	.inline	caller, 0
-	mov	%i7, %o0
-	.end
-
-	.inline	getfp, 0
-	mov	%fp, %o0
-	.end