Mercurial > illumos > illumos-gate

changeset 2037:132880d31aba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6268715 port_getn(3C) and port_sendn(3C) not working on Solaris x86 6315070 lib/libc/$MACH/Makefile: use correct macro for -xarch options in ASFLAGS 6359912 /usr/lib/values-(star).o files should be built with -K pic 6382561 _renameat has incorrect binding 6422703 Lack of /usr/sfw/bin/zsh in /etc/shells makes dtlogin fail.
author craigm
date Tue, 23 May 2006 08:36:21 -0700
parents 6b118cfdcfda
children 9b30a0ab3306
files usr/src/Makefile.master usr/src/lib/common/Makefile.com usr/src/lib/libc/amd64/Makefile usr/src/lib/libc/common/sys/_portfs.s usr/src/lib/libc/i386/Makefile.com usr/src/lib/libc/port/gen/getusershell.c usr/src/lib/libc/sparc/Makefile usr/src/lib/libc/sparcv9/Makefile usr/src/lib/libc/spec/sys.spec
diffstat 9 files changed, 44 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/Makefile.master	Mon May 22 18:36:17 2006 -0700
+++ b/usr/src/Makefile.master	Tue May 23 08:36:21 2006 -0700
@@ -307,7 +307,7 @@
 amd64_XARCH=		-xarch=amd64 -Ui386 -U__i386
 
 # assembler '-xarch' flag.  Different from compiler '-xarch' flag.
-sparc_AS_XARCH=		-xarch=v8
+sparc_AS_XARCH=		-xarch=v8plus
 sparcv9_AS_XARCH=	-xarch=v9
 i386_AS_XARCH=
 amd64_AS_XARCH=		-xarch=amd64 -P -Ui386 -U__i386
--- a/usr/src/lib/common/Makefile.com	Mon May 22 18:36:17 2006 -0700
+++ b/usr/src/lib/common/Makefile.com	Tue May 23 08:36:21 2006 -0700
@@ -2,9 +2,8 @@
 # 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.
+# 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.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -49,6 +48,8 @@
 ASFLAGS +=	-P -D__STDC__ -D_ASM -DPIC
 
 values-xpg6.o := CPPFLAGS += -I$(SRC)/lib/libc/inc
+$(VALUES) := CFLAGS += $(C_PICFLAGS)
+$(VALUES) := CFLAGS64 += $(C_PICFLAGS64)
 
 .KEEP_STATE:
 
--- a/usr/src/lib/libc/amd64/Makefile	Mon May 22 18:36:17 2006 -0700
+++ b/usr/src/lib/libc/amd64/Makefile	Tue May 23 08:36:21 2006 -0700
@@ -810,6 +810,9 @@
 	regex.o			\
 	wordexp.o
 
+VALUES=				\
+	values-Xa.o
+
 MOSTOBJS=			\
 	$(STRETS)		\
 	$(CRTOBJS)		\
@@ -841,7 +844,8 @@
 	$(COMSYSOBJS)		\
 	$(SYSOBJS)		\
 	$(COMSYSOBJS64)		\
-	$(SYSOBJS64)
+	$(SYSOBJS64)		\
+	$(VALUES)
 
 TRACEOBJS=			\
 	plockstat.o
@@ -858,9 +862,6 @@
 OBJECTS= $(CRTI) $(MOSTOBJS) $(CRTN)
 CRTSRCS= ../../common/amd64
 
-# these aren't listed as $(PICS), so we need to force CTF
-pics/values-Xa.o := POST_PROCESS_O = $(CTFCONVERT_O)
-
 # include common library definitions
 include ../../Makefile.lib
 include ../../Makefile.lib.64
@@ -896,7 +897,7 @@
 CPPFLAGS=	-D_REENTRANT -D$(MACH64) -D__$(MACH64) \
 		-I. -I$(LIBCBASE)/inc -I../inc $(CPPFLAGS.master) -I/usr/include
 ASFLAGS=	$(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(CPPFLAGS) \
-		-xarch=generic64
+		$(amd64_AS_XARCH)
 
 # Inform the run-time linker about libc specialized initialization
 RTLDINFO =	-z rtldinfo=tls_rtldinfo
@@ -923,7 +924,6 @@
 	crt/_rtld.s		\
 	pics/crti.o		\
 	pics/crtn.o		\
-	pics/values-Xa.o	\
 	$(ALTPICS)
 
 CLOBBERFILES +=	$(MAPFILE) $(LIB_PIC)
@@ -956,7 +956,7 @@
 
 # conditional assignments
 # $(DYNLIB) $(LIB_PIC) := DYNOBJS = _rtbootld.o
-$(DYNLIB) := CRTI = crti.o values-Xa.o
+$(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
 
 $(DYNLIB):	$(MAPFILE)
--- a/usr/src/lib/libc/common/sys/_portfs.s	Mon May 22 18:36:17 2006 -0700
+++ b/usr/src/lib/libc/common/sys/_portfs.s	Tue May 23 08:36:21 2006 -0700
@@ -2,9 +2,8 @@
  * 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.
+ * 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.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -36,6 +35,6 @@
 
 #include "SYS.h"
 
-	SYSCALL2_RVAL1(_portfs,port)
+	SYSCALL2(_portfs,port)
 	RET
 	SET_SIZE(_portfs)
--- a/usr/src/lib/libc/i386/Makefile.com	Mon May 22 18:36:17 2006 -0700
+++ b/usr/src/lib/libc/i386/Makefile.com	Tue May 23 08:36:21 2006 -0700
@@ -32,9 +32,7 @@
 CPP=	/usr/lib/cpp
 TARGET_ARCH=	i386
 
-# values deliverables
-VALUES=	values-Xa.o values-Xc.o values-Xs.o values-Xt.o values-xpg4.o \
-	values-xpg6.o
+VALUES=	values-Xa.o
 
 # objects are grouped by source directory
 
@@ -881,7 +879,8 @@
 	$(COMSYSOBJS)		\
 	$(SYSOBJS)		\
 	$(COMSYSOBJS64)		\
-	$(SYSOBJS64)
+	$(SYSOBJS64)		\
+	$(VALUES)
 
 TRACEOBJS=			\
 	plockstat.o
@@ -942,7 +941,7 @@
 CFLAGS +=	$(EXTN_CFLAGS)
 CPPFLAGS=	-D_REENTRANT -Di386 $(EXTN_CPPFLAGS) \
 		-I$(LIBCBASE)/inc -I../inc $(CPPFLAGS.master)
-ASFLAGS=	$(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(CPPFLAGS)
+ASFLAGS=	$(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(CPPFLAGS) $(i386_AS_XARCH)
 
 # Inform the run-time linker about libc specialized initialization
 RTLDINFO =	-z rtldinfo=tls_rtldinfo
@@ -974,8 +973,6 @@
 	pics/_rtbootld.o	\
 	pics/crti.o		\
 	pics/crtn.o		\
-	pics/values-Xa.o	\
-	$(VALUES)		\
 	$(ALTPICS)
 
 CLOBBERFILES +=	$(MAPFILE) $(LIB_PIC)
@@ -1009,7 +1006,7 @@
 
 # conditional assignments
 $(DYNLIB) $(LIB_PIC) := DYNOBJS = _rtbootld.o
-$(DYNLIB) := CRTI = crti.o values-Xa.o
+$(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
 
 $(DYNLIB):	$(MAPFILE)
@@ -1089,7 +1086,7 @@
 
 .KEEP_STATE:
 
-all: $(LIBS) $(LIB_PIC) values
+all: $(LIBS) $(LIB_PIC)
 
 lint	:=	CPPFLAGS += -I../$(MACH)/fp
 lint	:=	CPPFLAGS += -D_MSE_INT_H -D_LCONV_C99
@@ -1099,12 +1096,6 @@
 	@echo $(LINT.c) ...
 	@$(LINT.c) $(SRCS) $(LDLIBS)
 
-values: $(VALUES)
-
-# these aren't listed as $(PICS), so we need to force CTF
-$(VALUES) := CTFCONVERT_POST = $(CTFCONVERT_O)
-pics/values-Xa.o := CTFCONVERT_POST = $(CTFCONVERT_O)
-
 $(LINTLIB):= SRCS=../port/llib-lc
 $(LINTLIB):= CPPFLAGS += -D_MSE_INT_H
 $(LINTLIB):= LINTFLAGS=-nvx
--- a/usr/src/lib/libc/port/gen/getusershell.c	Mon May 22 18:36:17 2006 -0700
+++ b/usr/src/lib/libc/port/gen/getusershell.c	Tue May 23 08:36:21 2006 -0700
@@ -57,6 +57,7 @@
 	"/bin/zsh",
 	"/usr/xpg4/bin/sh",
 	"/sbin/pfsh",
+	"/usr/sfw/bin/zsh",
 	NULL
 };
 
--- a/usr/src/lib/libc/sparc/Makefile	Mon May 22 18:36:17 2006 -0700
+++ b/usr/src/lib/libc/sparc/Makefile	Tue May 23 08:36:21 2006 -0700
@@ -873,6 +873,8 @@
 	regex.o			\
 	wordexp.o
 
+VALUES=	values-Xa.o
+
 MOSTOBJS=			\
 	$(STRETS)		\
 	$(CRTOBJS)		\
@@ -905,7 +907,8 @@
 	$(COMSYSOBJS)		\
 	$(SYSOBJS)		\
 	$(COMSYSOBJS64)		\
-	$(SYSOBJS64)
+	$(SYSOBJS64)		\
+	$(VALUES)
 
 TRACEOBJS=			\
 	plockstat.o
@@ -956,7 +959,7 @@
 CFLAGS +=	$(EXTN_CFLAGS)
 CPPFLAGS=	-D_REENTRANT -Dsparc $(EXTN_CPPFLAGS) \
 		-I$(LIBCBASE)/inc -I../inc $(CPPFLAGS.master)
-ASFLAGS=	-K pic -P -D__STDC__ -D_ASM $(CPPFLAGS) -xarch=v8plus
+ASFLAGS=	-K pic -P -D__STDC__ -D_ASM $(CPPFLAGS) $(sparc_AS_XARCH)
 
 # Inform the run-time linker about libc specialized initialization
 RTLDINFO =	-z rtldinfo=tls_rtldinfo
@@ -986,7 +989,6 @@
 	pics/_rtbootld.o	\
 	pics/crti.o		\
 	pics/crtn.o		\
-	pics/values-Xa.o	\
 	$(ALTPICS)
 
 CLOBBERFILES +=	$(MAPFILE) $(LIB_PIC)
@@ -1021,7 +1023,7 @@
 
 # conditional assignments
 $(DYNLIB) $(LIB_PIC) := DYNOBJS = _rtbootld.o
-$(DYNLIB) := CRTI = crti.o values-Xa.o
+$(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
 
 $(DYNLIB):	$(MAPFILE)
@@ -1145,10 +1147,6 @@
 	@echo $(LINT.c) ... $(LDLIBS)
 	@$(LINT.c) $(SRCS) $(LDLIBS)
 
-# these aren't listed as $(PICS), so we need to force CTF
-pics/values-Xa.o := CFLAGS += $(CTF_FLAGS)
-pics/values-Xa.o := CTFCONVERT_POST = $(CTFCONVERT_O)
-
 $(LINTLIB):= SRCS=../port/llib-lc
 $(LINTLIB):= CPPFLAGS += -D_MSE_INT_H
 $(LINTLIB):= LINTFLAGS=-nvx
--- a/usr/src/lib/libc/sparcv9/Makefile	Mon May 22 18:36:17 2006 -0700
+++ b/usr/src/lib/libc/sparcv9/Makefile	Tue May 23 08:36:21 2006 -0700
@@ -819,6 +819,8 @@
 	regex.o			\
 	wordexp.o
 
+VALUES=	values-Xa.o
+
 MOSTOBJS=			\
 	$(STRETS)		\
 	$(CRTOBJS)		\
@@ -850,7 +852,8 @@
 	$(COMSYSOBJS)		\
 	$(SYSOBJS)		\
 	$(COMSYSOBJS64)		\
-	$(SYSOBJS64)
+	$(SYSOBJS64)		\
+	$(VALUES)
 
 TRACEOBJS=			\
 	plockstat.o
@@ -904,7 +907,7 @@
 CPPFLAGS=	-D_REENTRANT -Dsparc $(EXTN_CPPFLAGS) \
 		-I$(LIBCBASE)/inc -I../inc $(CPPFLAGS.master)
 ASFLAGS=	-K PIC -P -D__STDC__ -D_ASM -D__sparcv9 $(CPPFLAGS) \
-		$(sparcv9_XARCH)
+		$(sparcv9_AS_XARCH)
 
 # Inform the run-time linker about libc specialized initialization
 RTLDINFO =	-z rtldinfo=tls_rtldinfo
@@ -931,7 +934,6 @@
 	genassym		\
 	pics/crti.o		\
 	pics/crtn.o		\
-	pics/values-Xa.o	\
 	$(ALTPICS)
 
 CLOBBERFILES +=	$(MAPFILE) $(LIB_PIC)
@@ -965,7 +967,7 @@
 
 # conditional assignments
 # $(DYNLIB) $(LIB_PIC) := DYNOBJS = _rtbootld.o
-$(DYNLIB) := CRTI = crti.o values-Xa.o
+$(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
 
 $(DYNLIB):	$(MAPFILE)
@@ -1085,10 +1087,6 @@
 	@echo $(LINT.c) ... $(LDLIBS)
 	@$(LINT.c) $(SRCS) $(LDLIBS)
 
-# these aren't listed as $(PICS), so we need to force CTF
-pics/values-Xa.o := CFLAGS64 += $(CTF_FLAGS)
-pics/values-Xa.o := CTFCONVERT_POST = $(CTFCONVERT_O)
-
 $(LINTLIB):= SRCS=../port/llib-lc
 $(LINTLIB):= CPPFLAGS += -D_MSE_INT_H
 $(LINTLIB):= LINTFLAGS64=-nvx -Xarch=v9
--- a/usr/src/lib/libc/spec/sys.spec	Mon May 22 18:36:17 2006 -0700
+++ b/usr/src/lib/libc/spec/sys.spec	Tue May 23 08:36:21 2006 -0700
@@ -1,7 +1,3 @@
-#
-# Copyright 2006 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
@@ -21,6 +17,9 @@
 #
 # CDDL HEADER END
 #
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 # lib/libc/spec/sys.spec
@@ -3275,6 +3274,11 @@
 exception	$return == -1
 end
 
+function	_renameat
+weak		renameat
+version		SUNW_1.23
+end
+
 function	getrctl
 include		<rctl.h>
 declaration	int getrctl(const char *name, rctlblk_t *old_rblk, \