Mercurial Mercurial > upstream > illumos > illumos-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PSARC 2006/445 Generic 32-bit/64-bit symbolic links for ucblib libraries
authorcraigm
Tue, 15 Aug 2006 14:28:22 -0700
changeset 2552 04b007b7b43f
parent 2551 3b077b6c1476
child 2553 624f674f2ad8
PSARC 2006/445 Generic 32-bit/64-bit symbolic links for ucblib libraries 1174853 Unknown external functions in 5.4 /usr/lib/libc.so: What is "glob"? 5084403 /usr/ucblib needs to ship with 32/64 symlinks
usr/src/Targetdirs file | annotate | diff | comparison | revisions
usr/src/lib/libc/inc/synonyms.h file | annotate | diff | comparison | revisions
usr/src/lib/libc/port/gen/addsev.c file | annotate | diff | comparison | revisions
usr/src/lib/libc/port/gen/confstr.c file | annotate | diff | comparison | revisions
usr/src/lib/libc/port/gen/gtxt.c file | annotate | diff | comparison | revisions
usr/src/lib/libc/port/gen/lfmt.c file | annotate | diff | comparison | revisions
usr/src/lib/libc/port/gen/pfmt.c file | annotate | diff | comparison | revisions
usr/src/lib/libc/port/gen/setlabel.c file | annotate | diff | comparison | revisions
usr/src/lib/libc/port/gen/vlfmt.c file | annotate | diff | comparison | revisions
usr/src/lib/libc/port/gen/vpfmt.c file | annotate | diff | comparison | revisions
usr/src/lib/libc/port/regex/glob.c file | annotate | diff | comparison | revisions
usr/src/lib/libc/port/regex/wordexp.c file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWscpu/prototype_com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWscpu/prototype_i386 file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWscpu/prototype_sparc file | annotate | diff | comparison | revisions 
--- a/usr/src/Targetdirs	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/Targetdirs	Tue Aug 15 14:28:22 2006 -0700
@@ -426,7 +426,8 @@
 	/usr/lib/lwp/32 \
 	/usr/lib/link_audit/32 \
 	/usr/lib/secure/32 \
-	/var/ld/32
+	/var/ld/32 \
+	/usr/ucblib/32
 
 SYM.ROOT.BIN64= \
 	/lib/64 \
@@ -438,7 +439,8 @@
 	/usr/lib/secure/64 \
 	/usr/lib/security/64 \
 	/usr/xpg4/lib/64 \
-	/var/ld/64
+	/var/ld/64 \
+	/usr/ucblib/64
 
 SYM.ROOT.SFW64= \
 	/usr/sfw/lib/64
@@ -568,6 +570,7 @@
 $(ROOT)/usr/ccs/lib/fp:=		LINKDEST=../../lib/fp
 $(ROOT)/usr/ccs/lib/link_audit:=	LINKDEST=../../lib/link_audit
 $(ROOT)/var/ld/32:=			LINKDEST=.
+$(ROOT)/usr/ucblib/32:=			LINKDEST=.
 
 
 $(BUILD64) $(ROOT)/lib/64:=		LINKDEST=$(MACH64)
@@ -581,6 +584,7 @@
 $(BUILD64) $(ROOT)/usr/xpg4/lib/64:=	LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/var/ld/64:=		LINKDEST=$(MACH64)
 $(BUILD64) $(ROOT)/usr/sfw/lib/64:=	LINKDEST=$(MACH64)
+$(BUILD64) $(ROOT)/usr/ucblib/64:=	LINKDEST=$(MACH64)
 
 # Installing a directory symlink calls for overriding INS.dir to install
 # a symlink.
--- a/usr/src/lib/libc/inc/synonyms.h	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/inc/synonyms.h	Tue Aug 15 14:28:22 2006 -0700
@@ -91,6 +91,7 @@
 #define	acct			_acct
 #define	acctctl			_acctctl
 #define	acl			_acl
+#define	addsev			_addsev
 #define	addseverity		_addseverity
 #define	adjtime			_adjtime
 #define	alarm			_alarm
@@ -238,6 +239,7 @@
 #define	cond_signal		_cond_signal
 #define	cond_timedwait		_cond_timedwait
 #define	cond_wait		_cond_wait
+#define	confstr			_confstr
 #define	core_get_default_content	_core_get_default_content
 #define	core_get_default_path		_core_get_default_path
 #define	core_get_global_content		_core_get_global_content
@@ -459,6 +461,8 @@
 #define	getzoneidbyname		_getzoneidbyname
 #define	getzoneid		_getzoneid
 #define	getzonenamebyid		_getzonenamebyid
+#define	glob			_glob
+#define	globfree		_globfree
 #define	gmtime_r		_gmtime_r
 #define	grantpt			_grantpt
 #define	gsignal			_gsignal
@@ -508,6 +512,7 @@
 #define	ldivide			_ldivide
 #define	lexp10			_lexp10
 #define	lfind			_lfind
+#define	lfmt			_lfmt
 #define	link			_link
 #define	llabs			_llabs
 #define	lldiv			_lldiv
@@ -630,6 +635,7 @@
 #define	pause			_pause
 #define	pclose			_pclose
 #define	pcsample		_pcsample
+#define	pfmt			_pfmt
 #define	pipe			_pipe
 #define	plock			_plock
 #define	poll			_poll
@@ -891,6 +897,7 @@
 #define	sem_trywait		_sem_trywait
 #define	sem_unlink		_sem_unlink
 #define	sem_wait		_sem_wait
+#define	setcat			_setcat
 #define	setcontext		_setcontext
 #define	setegid			_setegid
 #define	setenv			_setenv
@@ -901,6 +908,7 @@
 #define	setitimer		_setitimer
 #define	setjmp			_setjmp
 #define	setkey			_setkey
+#define	setlabel		_setlabel
 #define	setlocale		_setlocale
 #define	setlogmask		_setlogmask
 #define	setpflags		_setpflags
@@ -976,7 +984,9 @@
 #define	strdup			_strdup
 #define	strerror_r		_strerror_r
 #define	strerror		_strerror
+#define	strfmon			_strfmon
 #define	string_to_decimal	_string_to_decimal
+#define	strptime		_strptime
 #define	strtok_r		_strtok_r
 #define	strtoll			_strtoll
 #define	strtoull		_strtoull
@@ -1110,6 +1120,8 @@
 #define	vfork			_vfork
 #define	vfscanf			_vfscanf
 #define	vhangup			_vhangup
+#define	vlfmt			_vlfmt
+#define	vpfmt			_vpfmt
 #define	vscanf			_vscanf
 #define	vsscanf			_vsscanf
 #define	vsyslog			_vsyslog
@@ -1141,6 +1153,8 @@
 #define	wctomb			_wctomb
 #define	wctype			__wctype
 #define	wcwidth			_wcwidth
+#define	wordexp			_wordexp
+#define	wordfree		_wordfree
 #define	wracct			_wracct
 #define	writev			_writev
 #define	write			_write
--- a/usr/src/lib/libc/port/gen/addsev.c	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/port/gen/addsev.c	Tue Aug 15 14:28:22 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.
  */
 
@@ -29,6 +28,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma	weak addsev = _addsev
 
 #include "synonyms.h"
 #include "mtlib.h"
--- a/usr/src/lib/libc/port/gen/confstr.c	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/port/gen/confstr.c	Tue Aug 15 14:28:22 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,12 +19,14 @@
  * 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.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
+#pragma	weak confstr = _confstr
+
 #include "synonyms.h"
 #include "xpg6.h"
 #include <sys/types.h>
--- a/usr/src/lib/libc/port/gen/gtxt.c	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/port/gen/gtxt.c	Tue Aug 15 14:28:22 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.
  */
 
@@ -32,6 +31,8 @@
 
 /* __gtxt(): Common part to gettxt() and pfmt()	*/
 
+#pragma	weak setcat = _setcat
+
 #include "synonyms.h"
 #include "libc.h"
 #include <mtlib.h>
--- a/usr/src/lib/libc/port/gen/lfmt.c	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/port/gen/lfmt.c	Tue Aug 15 14:28:22 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.
  */
 
@@ -32,6 +31,8 @@
 
 /* lfmt() - format, print and log */
 
+#pragma	weak lfmt = _lfmt
+
 #include "synonyms.h"
 #include <sys/types.h>
 #include "mtlib.h"
--- a/usr/src/lib/libc/port/gen/pfmt.c	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/port/gen/pfmt.c	Tue Aug 15 14:28:22 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.
  */
 
@@ -29,6 +28,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma	weak pfmt = _pfmt
 
 #include "synonyms.h"
 #include "mtlib.h"
--- a/usr/src/lib/libc/port/gen/setlabel.c	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/port/gen/setlabel.c	Tue Aug 15 14:28:22 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.
  */
 
@@ -29,6 +28,7 @@
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma	weak setlabel = _setlabel
 
 #include "synonyms.h"
 #include "mtlib.h"
--- a/usr/src/lib/libc/port/gen/vlfmt.c	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/port/gen/vlfmt.c	Tue Aug 15 14:28:22 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.
  */
 
@@ -32,6 +31,8 @@
 
 /* vlfmt() - format, print and log (variable arguments) */
 
+#pragma	weak vlfmt = _vlfmt
+
 #include "synonyms.h"
 #include "mtlib.h"
 #include <sys/types.h>
--- a/usr/src/lib/libc/port/gen/vpfmt.c	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/port/gen/vpfmt.c	Tue Aug 15 14:28:22 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.
  */
 
@@ -33,6 +32,9 @@
 /*
  * vpfmt() - format and print (variable argument list)
  */
+
+#pragma	weak vpfmt = _vpfmt
+
 #include "synonyms.h"
 #include "mtlib.h"
 #include <sys/types.h>
--- a/usr/src/lib/libc/port/regex/glob.c	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/port/regex/glob.c	Tue Aug 15 14:28:22 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.
@@ -46,6 +45,9 @@
  * Written by Eric Gisin.
  */
 
+#pragma	weak glob = _glob
+#pragma	weak globfree = _globfree
+
 #include "synonyms.h"
 #include <stdio.h>
 #include <unistd.h>
--- a/usr/src/lib/libc/port/regex/wordexp.c	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/lib/libc/port/regex/wordexp.c	Tue Aug 15 14:28:22 2006 -0700
@@ -43,6 +43,9 @@
  *
  */
 
+#pragma	weak wordexp = _wordexp
+#pragma	weak wordfree = _wordfree
+
 #include "synonyms.h"
 #include <stdio.h>
 #include <unistd.h>
--- a/usr/src/pkgdefs/SUNWscpu/prototype_com	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/pkgdefs/SUNWscpu/prototype_com	Tue Aug 15 14:28:22 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,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1990-1998 by 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"
 #
@@ -153,6 +152,7 @@
 s none usr/ucb/whois=../bin/whois
 s none usr/ucb/xstr=../bin/xstr
 d none usr/ucblib 755 root bin
+s none usr/ucblib/32=.
 s none usr/ucblib/libcurses.so=./libcurses.so.1
 f none usr/ucblib/libcurses.so.1 755 root bin
 s none usr/ucblib/libdbm.so=./libdbm.so.1
--- a/usr/src/pkgdefs/SUNWscpu/prototype_i386	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/pkgdefs/SUNWscpu/prototype_i386	Tue Aug 15 14:28:22 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"
@@ -54,6 +53,7 @@
 d none usr/ucb/amd64 755 root bin
 f none usr/ucb/amd64/ps 0555 root sys
 d none usr/ucblib/amd64 755 root bin
+s none usr/ucblib/64=amd64
 s none usr/ucblib/amd64/libcurses.so=./libcurses.so.1
 f none usr/ucblib/amd64/libcurses.so.1 755 root bin
 s none usr/ucblib/amd64/libdbm.so=./libdbm.so.1
--- a/usr/src/pkgdefs/SUNWscpu/prototype_sparc	Tue Aug 15 11:33:29 2006 -0700
+++ b/usr/src/pkgdefs/SUNWscpu/prototype_sparc	Tue Aug 15 14:28:22 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"
@@ -54,6 +53,7 @@
 d none usr/ucb/sparcv9 755 root bin
 f none usr/ucb/sparcv9/ps 0555 root sys
 d none usr/ucblib/sparcv9 755 root bin
+s none usr/ucblib/64=sparcv9
 s none usr/ucblib/sparcv9/libcurses.so=./libcurses.so.1
 f none usr/ucblib/sparcv9/libcurses.so.1 755 root bin
 s none usr/ucblib/sparcv9/libdbm.so=./libdbm.so.1
upstream/illumos/illumos-gate