summaryrefslogtreecommitdiff
path: root/usr/src/lib/libc
diff options
context:
space:
mode:
authorraf <none@none>2006-01-06 13:09:21 -0800
committerraf <none@none>2006-01-06 13:09:21 -0800
commite8031f0a8ed0e45c6d8847c5e09424e66fd34a4b (patch)
tree8ded5f3bcfc9f92ca50e6639f7063ea0afd17fa7 /usr/src/lib/libc
parenta7aa4df776b2ef44358da774101a0a3039d69100 (diff)
downloadillumos-gate-e8031f0a8ed0e45c6d8847c5e09424e66fd34a4b.tar.gz
6362982 namespace pollution/protection in libc
6369040 there should be but one synonyms.h file outside of libc --HG-- rename : usr/src/lib/common/inc/mtlib.h => deleted_files/usr/src/lib/common/inc/mtlib.h rename : usr/src/lib/libc/sparcv9/gen/llabs.s => deleted_files/usr/src/lib/libc/sparcv9/gen/llabs.s rename : usr/src/lib/libcurses/screen/synonyms.h => deleted_files/usr/src/lib/libcurses/screen/synonyms.h rename : usr/src/lib/libmail/inc/synonyms.h => deleted_files/usr/src/lib/libmail/inc/synonyms.h rename : usr/src/lib/libresolv/synonyms.h => deleted_files/usr/src/lib/libresolv/synonyms.h rename : usr/src/lib/libresolv2/include/synonyms.h => deleted_files/usr/src/lib/libresolv2/include/synonyms.h rename : usr/src/lib/librsm/inc/synonyms.h => deleted_files/usr/src/lib/librsm/inc/synonyms.h rename : usr/src/ucblib/libucb/port/gen/synonyms.h => deleted_files/usr/src/ucblib/libucb/port/gen/synonyms.h rename : usr/src/lib/common/inc/synonyms.h => usr/src/lib/common/inc/c_synonyms.h rename : usr/src/lib/libcrypt/inc/synonyms.h => usr/src/lib/libcrypt/inc/des_synonyms.h rename : usr/src/lib/libgen/inc/synonyms.h => usr/src/lib/libgen/inc/gen_synonyms.h
Diffstat (limited to 'usr/src/lib/libc')
-rw-r--r--usr/src/lib/libc/Makefile15
-rw-r--r--usr/src/lib/libc/amd64/Makefile3
-rw-r--r--usr/src/lib/libc/amd64/gen/abs.s17
-rw-r--r--usr/src/lib/libc/i386/gen/abs.s16
-rw-r--r--usr/src/lib/libc/inc/libc.h5
-rw-r--r--usr/src/lib/libc/inc/synonyms.h1875
-rw-r--r--usr/src/lib/libc/port/gen/atexit.c7
-rw-r--r--usr/src/lib/libc/port/gen/directio.c5
-rw-r--r--usr/src/lib/libc/port/gen/getauxv.c5
-rw-r--r--usr/src/lib/libc/port/gen/gettxt.c4
-rw-r--r--usr/src/lib/libc/port/gen/imaxabs.c7
-rw-r--r--usr/src/lib/libc/port/gen/nftw.c4
-rw-r--r--usr/src/lib/libc/port/gen/rctlops.c5
-rw-r--r--usr/src/lib/libc/port/gen/strtoimax.c6
-rw-r--r--usr/src/lib/libc/port/gen/strtoumax.c6
-rw-r--r--usr/src/lib/libc/port/i18n/__fputws_xpg5.c5
-rw-r--r--usr/src/lib/libc/port/i18n/gettext_real.c11
-rw-r--r--usr/src/lib/libc/port/i18n/strtows.c5
-rw-r--r--usr/src/lib/libc/port/i18n/wcstoimax.c6
-rw-r--r--usr/src/lib/libc/port/i18n/wcstol.c5
-rw-r--r--usr/src/lib/libc/port/i18n/wcstoul.c5
-rw-r--r--usr/src/lib/libc/port/i18n/wmemcpy.c5
-rw-r--r--usr/src/lib/libc/port/i18n/wmemmove.c5
-rw-r--r--usr/src/lib/libc/port/i18n/wsprintf.c5
-rw-r--r--usr/src/lib/libc/port/i18n/wstok.c5
-rw-r--r--usr/src/lib/libc/port/i18n/wstol.c5
-rw-r--r--usr/src/lib/libc/port/regex/glob.c36
-rw-r--r--usr/src/lib/libc/port/regex/regex.c5
-rw-r--r--usr/src/lib/libc/port/stdio/fdopen.c12
-rw-r--r--usr/src/lib/libc/port/stdio/fopen.c5
-rw-r--r--usr/src/lib/libc/port/stdio/fpos.c5
-rw-r--r--usr/src/lib/libc/port/stdio/system.c19
-rw-r--r--usr/src/lib/libc/port/sys/sigstack.c9
-rw-r--r--usr/src/lib/libc/port/threads/scalls.c7
-rw-r--r--usr/src/lib/libc/port/threads/synch.c6
-rw-r--r--usr/src/lib/libc/port/unwind/unwind.c5
-rw-r--r--usr/src/lib/libc/req.flg3
-rw-r--r--usr/src/lib/libc/sparc/gen/abs.s19
-rw-r--r--usr/src/lib/libc/sparc/gen/siglongjmp.c7
-rw-r--r--usr/src/lib/libc/sparcv9/Makefile3
-rw-r--r--usr/src/lib/libc/sparcv9/gen/abs.s37
-rw-r--r--usr/src/lib/libc/sparcv9/gen/llabs.s48
-rw-r--r--usr/src/lib/libc/sparcv9/gen/siglongjmp.c7
43 files changed, 1260 insertions, 1015 deletions
diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile
index 961d80a379..4bf2ad6379 100644
--- a/usr/src/lib/libc/Makefile
+++ b/usr/src/lib/libc/Makefile
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
#
-# Copyright 2005 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"
@@ -103,7 +103,7 @@ $(ROOTVARIANTDIR)/$(VAR2_DYNLIB) := FILEMODE= 755
all: check_i18n .WAIT spec .WAIT lib32 $(BUILD64) .WAIT lib64 .WAIT etc
check_i18n:
- @if [ ! -f $(ROOTFS_LIBDIR)/libc_i18n.a -a \
+ @if [ ! -f $(ROOTFS_LIBDIR)/libc_i18n.a -o \
! -f $(ROOTFS_LIBDIR64)/libc_i18n.a ]; then \
if [ "$$CLOSED_IS_PRESENT" = no ]; then \
$(ECHO) "Warning: closed binaries not" \
@@ -120,11 +120,20 @@ check_i18n:
etc: $($(MACH)_ETC)
lib32: $(MACHLIBS) $(MACH)/$(LIB_PIC) $(VARIANTLIBS)
+ mkdir -p $(MACH)/i18n_pics
+ cd $(MACH)/i18n_pics ; $(AR) -x $(ROOTFS_LIBDIR)/libc_i18n.a
+ check_fnames -s $(C_SYNONYMS_H) -l $(MACH)/$(DYNLIB) \
+ $(MACH)/pics/*.o $(MACH)/i18n_pics/*.o
lib64: $(MACHLIBS64) $(MACH64)/$(LIB_PIC) $(VARIANTLIBS)
+ mkdir -p $(MACH64)/i18n_pics
+ cd $(MACH64)/i18n_pics ; $(AR) -x $(ROOTFS_LIBDIR64)/libc_i18n.a
+ check_fnames -s $(C_SYNONYMS_H) -l $(MACH64)/$(DYNLIB) \
+ $(MACH64)/pics/*.o $(MACH64)/i18n_pics/*.o
$(VARIANTLIBS): FRC
@cd $(@D); pwd; VERSION='$(VERSION)' $(MAKE) $(@F)
+ check_fnames -s $(C_SYNONYMS_H) -l $(@D)/$(@F) $(@D)/pics/*.o
$($(MACH)_ETC): FRC
@cd $(@); pwd; $(MAKE) $(TARGET)
@@ -194,6 +203,8 @@ spec $(SUBDIRS): FRC
@cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET)
clean clobber: spec .WAIT $(SUBDIRS)
+ $(RM) -r $(MACH)/i18n_pics
+ $(BUILD64)$(RM) -r $(MACH64)/i18n_pics
lint: $(SUBDIRS)
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index 4b71748be4..6b4d219b8d 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
#
-# Copyright 2005 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"
@@ -448,7 +448,6 @@ PORTGEN= \
lfind.o \
lfmt.o \
lfmt_log.o \
- llabs.o \
lldiv.o \
lltostr.o \
lmath.o \
diff --git a/usr/src/lib/libc/amd64/gen/abs.s b/usr/src/lib/libc/amd64/gen/abs.s
index bee5942677..fe559eb08f 100644
--- a/usr/src/lib/libc/amd64/gen/abs.s
+++ b/usr/src/lib/libc/amd64/gen/abs.s
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -38,6 +39,10 @@
* }
*/
+#include <sys/asm_linkage.h>
+
+ ANSI_PRAGMA_WEAK(llabs,function)
+
#include "SYS.h"
ENTRY(abs)
@@ -49,7 +54,6 @@
ret
SET_SIZE(abs)
-
ENTRY(labs)
movq %rdi, %rax
testq %rax, %rax /* arg < 0? */
@@ -58,3 +62,12 @@
1:
ret
SET_SIZE(labs)
+
+ ENTRY(llabs)
+ movq %rdi, %rax
+ testq %rax, %rax /* arg < 0? */
+ jns 1f
+ negq %rax /* yes, return -arg */
+1:
+ ret
+ SET_SIZE(llabs)
diff --git a/usr/src/lib/libc/i386/gen/abs.s b/usr/src/lib/libc/i386/gen/abs.s
index 776d69154b..dd92cc4546 100644
--- a/usr/src/lib/libc/i386/gen/abs.s
+++ b/usr/src/lib/libc/i386/gen/abs.s
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -39,12 +40,19 @@
#include "SYS.h"
ENTRY(abs)
- ENTRY(labs)
movl 4(%esp),%eax / arg < 0?
testl %eax,%eax
- jns .posit
+ jns 1f
negl %eax / yes, return -arg
-.posit:
+1:
ret
SET_SIZE(abs)
+
+ ENTRY(labs)
+ movl 4(%esp),%eax / arg < 0?
+ testl %eax,%eax
+ jns 1f
+ negl %eax / yes, return -arg
+1:
+ ret
SET_SIZE(labs)
diff --git a/usr/src/lib/libc/inc/libc.h b/usr/src/lib/libc/inc/libc.h
index cf5173cc1b..d09aae7ce0 100644
--- a/usr/src/lib/libc/inc/libc.h
+++ b/usr/src/lib/libc/inc/libc.h
@@ -21,7 +21,7 @@
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -333,7 +333,8 @@ extern wint_t _towlower(wint_t);
extern int _doscan(FILE *, const char *, va_list);
extern int _wcscoll(const wchar_t *, const wchar_t *);
extern size_t _wcsxfrm(wchar_t *, const wchar_t *, size_t);
-extern wint_t _fputwc(wint_t, FILE *);
+extern wint_t _fputwc(wint_t, FILE *);
+extern pid_t waitpid_cancel(pid_t, int *, int);
#ifdef __cplusplus
}
#endif
diff --git a/usr/src/lib/libc/inc/synonyms.h b/usr/src/lib/libc/inc/synonyms.h
index 6687e63931..5024e57757 100644
--- a/usr/src/lib/libc/inc/synonyms.h
+++ b/usr/src/lib/libc/inc/synonyms.h
@@ -19,8 +19,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -33,83 +34,247 @@
#pragma ident "%Z%%M% %I% %E% SMI"
+#include <sys/feature_tests.h>
+
#ifdef __cplusplus
extern "C" {
#endif
#if !defined(__lint)
+#if !defined(_LP64)
+/* transitional large file interfaces */
+#define alphasort64 _alphasort64
+#define attropen64 _attropen64
+#define creat64 _creat64
+#define ftello64 _ftello64
+#define fseeko64 _fseeko64
+#define fstat64 _fstat64
+#define fstatvfs64 _fstatvfs64
+#define ftruncate64 _ftruncate64
+#define getdents64 _getdents64
+#define getrlimit64 _getrlimit64
+#define lockf64 _lockf64
+#define lseek64 _lseek64
+#define lstat64 _lstat64
+#define mkstemp64 _mkstemp64
+#define mmap64 _mmap64
+#define openat64 _openat64
+#define open64 _open64
+#define pread64 _pread64
+#define pwrite64 _pwrite64
+#define readdir64 _readdir64
+#define readdir64_r _readdir64_r
+#define scandir64 _scandir64
+#define seekdir64 _seekdir64
+#define tell64 _tell64
+#define telldir64 _telldir64
+#define setrlimit64 _setrlimit64
+#define stat64 _stat64
+#define fstatat64 _fstatat64
+#define statvfs64 _statvfs64
+#define truncate64 _truncate64
+#endif /* !_LP64 */
+
/* external data */
-#define altzone _altzone
-#define daylight _daylight
-#define lone _lone
-#define lten _lten
-#define lzero _lzero
-#define timezone _timezone
-#define tzname _tzname
+#define altzone _altzone
+#define daylight _daylight
+#define lone _lone
+#define lten _lten
+#define lzero _lzero
+#define timezone _timezone
+#define tzname _tzname
/* functions */
-#define Msgdb _Msgdb
-#define a64l _a64l
-#define access _access
-#define acct _acct
-#define acctctl _acctctl
-#define acl _acl
-#define addseverity _addseverity
-#define adjtime _adjtime
-#define alarm _alarm
-#define alphasort _alphasort
-#define ascftime _ascftime
-#define asctime_r _asctime_r
-#define attropen _attropen
-#define basename _basename
-#define brk _brk
-#define brkbase _brkbase
-#define bsd_signal _bsd_signal
-#define catclose _catclose
-#define catgets _catgets
-#define catopen _catopen
-#define cfgetispeed _cfgetispeed
-#define cfgetospeed _cfgetospeed
-#define cfree _cfree
-#define cfsetispeed _cfsetispeed
-#define cfsetospeed _cfsetospeed
-#define cftime _cftime
-#define ctime_r _ctime_r
-#define chdir _chdir
-#define chmod _chmod
-#define chown _chown
-#define chroot _chroot
-#define close _close
-#define closedir _closedir
-#define closefrom _closefrom
-#define closelog _closelog
-#define core_set_options _core_set_options
-#define core_get_options _core_get_options
-#define core_set_global_content _core_set_global_content
+#define a64l _a64l
+#define access _access
+#define acct _acct
+#define acctctl _acctctl
+#define acl _acl
+#define addseverity _addseverity
+#define adjtime _adjtime
+#define alarm _alarm
+#define alphasort _alphasort
+#define ascftime _ascftime
+#define asctime_r _asctime_r
+#define _assert __assert
+#define _assert_c99 __assert_c99
+#define atexit _atexit
+#define atoll _atoll
+#define atomic_add_16 _atomic_add_16
+#define atomic_add_16_nv _atomic_add_16_nv
+#define atomic_add_32 _atomic_add_32
+#define atomic_add_32_nv _atomic_add_32_nv
+#define atomic_add_64 _atomic_add_64
+#define atomic_add_64_nv _atomic_add_64_nv
+#define atomic_add_8 _atomic_add_8
+#define atomic_add_8_nv _atomic_add_8_nv
+#define atomic_add_char _atomic_add_char
+#define atomic_add_char_nv _atomic_add_char_nv
+#define atomic_add_int _atomic_add_int
+#define atomic_add_int_nv _atomic_add_int_nv
+#define atomic_add_long _atomic_add_long
+#define atomic_add_long_nv _atomic_add_long_nv
+#define atomic_add_ptr _atomic_add_ptr
+#define atomic_add_ptr_nv _atomic_add_ptr_nv
+#define atomic_add_short _atomic_add_short
+#define atomic_add_short_nv _atomic_add_short_nv
+#define atomic_and_16 _atomic_and_16
+#define atomic_and_16_nv _atomic_and_16_nv
+#define atomic_and_32 _atomic_and_32
+#define atomic_and_32_nv _atomic_and_32_nv
+#define atomic_and_64 _atomic_and_64
+#define atomic_and_64_nv _atomic_and_64_nv
+#define atomic_and_8 _atomic_and_8
+#define atomic_and_8_nv _atomic_and_8_nv
+#define atomic_and_uchar _atomic_and_uchar
+#define atomic_and_uchar_nv _atomic_and_uchar_nv
+#define atomic_and_uint _atomic_and_uint
+#define atomic_and_uint_nv _atomic_and_uint_nv
+#define atomic_and_ulong _atomic_and_ulong
+#define atomic_and_ulong_nv _atomic_and_ulong_nv
+#define atomic_and_ushort _atomic_and_ushort
+#define atomic_and_ushort_nv _atomic_and_ushort_nv
+#define atomic_cas_16 _atomic_cas_16
+#define atomic_cas_32 _atomic_cas_32
+#define atomic_cas_64 _atomic_cas_64
+#define atomic_cas_8 _atomic_cas_8
+#define atomic_cas_ptr _atomic_cas_ptr
+#define atomic_cas_uchar _atomic_cas_uchar
+#define atomic_cas_uint _atomic_cas_uint
+#define atomic_cas_ulong _atomic_cas_ulong
+#define atomic_cas_ushort _atomic_cas_ushort
+#define atomic_clear_long_excl _atomic_clear_long_excl
+#define atomic_dec_16 _atomic_dec_16
+#define atomic_dec_16_nv _atomic_dec_16_nv
+#define atomic_dec_32 _atomic_dec_32
+#define atomic_dec_32_nv _atomic_dec_32_nv
+#define atomic_dec_64 _atomic_dec_64
+#define atomic_dec_64_nv _atomic_dec_64_nv
+#define atomic_dec_8 _atomic_dec_8
+#define atomic_dec_8_nv _atomic_dec_8_nv
+#define atomic_dec_uchar _atomic_dec_uchar
+#define atomic_dec_uchar_nv _atomic_dec_uchar_nv
+#define atomic_dec_uint _atomic_dec_uint
+#define atomic_dec_uint_nv _atomic_dec_uint_nv
+#define atomic_dec_ulong _atomic_dec_ulong
+#define atomic_dec_ulong_nv _atomic_dec_ulong_nv
+#define atomic_dec_ushort _atomic_dec_ushort
+#define atomic_dec_ushort_nv _atomic_dec_ushort_nv
+#define atomic_inc_16 _atomic_inc_16
+#define atomic_inc_16_nv _atomic_inc_16_nv
+#define atomic_inc_32 _atomic_inc_32
+#define atomic_inc_32_nv _atomic_inc_32_nv
+#define atomic_inc_64 _atomic_inc_64
+#define atomic_inc_64_nv _atomic_inc_64_nv
+#define atomic_inc_8 _atomic_inc_8
+#define atomic_inc_8_nv _atomic_inc_8_nv
+#define atomic_inc_uchar _atomic_inc_uchar
+#define atomic_inc_uchar_nv _atomic_inc_uchar_nv
+#define atomic_inc_uint _atomic_inc_uint
+#define atomic_inc_uint_nv _atomic_inc_uint_nv
+#define atomic_inc_ulong _atomic_inc_ulong
+#define atomic_inc_ulong_nv _atomic_inc_ulong_nv
+#define atomic_inc_ushort _atomic_inc_ushort
+#define atomic_inc_ushort_nv _atomic_inc_ushort_nv
+#define atomic_or_16 _atomic_or_16
+#define atomic_or_16_nv _atomic_or_16_nv
+#define atomic_or_32 _atomic_or_32
+#define atomic_or_32_nv _atomic_or_32_nv
+#define atomic_or_64 _atomic_or_64
+#define atomic_or_64_nv _atomic_or_64_nv
+#define atomic_or_8 _atomic_or_8
+#define atomic_or_8_nv _atomic_or_8_nv
+#define atomic_or_uchar _atomic_or_uchar
+#define atomic_or_uchar_nv _atomic_or_uchar_nv
+#define atomic_or_uint _atomic_or_uint
+#define atomic_or_uint_nv _atomic_or_uint_nv
+#define atomic_or_ulong _atomic_or_ulong
+#define atomic_or_ulong_nv _atomic_or_ulong_nv
+#define atomic_or_ushort _atomic_or_ushort
+#define atomic_or_ushort_nv _atomic_or_ushort_nv
+#define atomic_set_long_excl _atomic_set_long_excl
+#define atomic_swap_16 _atomic_swap_16
+#define atomic_swap_32 _atomic_swap_32
+#define atomic_swap_64 _atomic_swap_64
+#define atomic_swap_8 _atomic_swap_8
+#define atomic_swap_ptr _atomic_swap_ptr
+#define atomic_swap_uchar _atomic_swap_uchar
+#define atomic_swap_uint _atomic_swap_uint
+#define atomic_swap_ulong _atomic_swap_ulong
+#define atomic_swap_ushort _atomic_swap_ushort
+#define attropen _attropen
+#define basename _basename
+#define bindtextdomain _bindtextdomain
+#define bind_textdomain_codeset _bind_textdomain_codeset
+#define brk _brk
+#define bsd_signal _bsd_signal
+#define catclose _catclose
+#define catgets _catgets
+#define catopen _catopen
+#define cfgetispeed _cfgetispeed
+#define cfgetospeed _cfgetospeed
+#define cfree _cfree
+#define cfsetispeed _cfsetispeed
+#define cfsetospeed _cfsetospeed
+#define cftime _cftime
+#define chdir _chdir
+#define chmod _chmod
+#define chown _chown
+#define chroot _chroot
+#define _cladm __cladm
+#define close _close
+#define closedir _closedir
+#define closefrom _closefrom
+#define closelog _closelog
+#define cond_broadcast _cond_broadcast
+#define cond_destroy _cond_destroy
+#define cond_init _cond_init
+#define cond_reltimedwait _cond_reltimedwait
+#define cond_signal _cond_signal
+#define cond_timedwait _cond_timedwait
+#define cond_wait _cond_wait
+#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
-#define core_set_global_path _core_set_global_path
#define core_get_global_path _core_get_global_path
+#define core_get_options _core_get_options
+#define core_get_process_content _core_get_process_content
+#define core_get_process_path _core_get_process_path
#define core_set_default_content _core_set_default_content
-#define core_get_default_content _core_get_default_content
#define core_set_default_path _core_set_default_path
-#define core_get_default_path _core_get_default_path
+#define core_set_global_content _core_set_global_content
+#define core_set_global_path _core_set_global_path
+#define core_set_options _core_set_options
#define core_set_process_content _core_set_process_content
-#define core_get_process_content _core_get_process_content
#define core_set_process_path _core_set_process_path
-#define core_get_process_path _core_get_process_path
-#define countbase _countbase
-#define creat _creat
-#define crypt _crypt
-#define ctermid _ctermid
-#define ctermid_r _ctermid_r
-#define cuserid _cuserid
-#define dial _dial
-#define dirname _dirname
-#define dlclose _dlclose
-#define dlopen _dlopen
-#define dlsym _dlsym
-#define dlerror _dlerror
+#define countbase _countbase
+#define creat _creat
+#define crypt _crypt
+#define ctermid _ctermid
+#define ctermid_r _ctermid_r
+#define ctime_r _ctime_r
+#define _ctype __ctype
+#define cuserid _cuserid
+#define dcgettext _dcgettext
+#define dcngettext _dcngettext
+#define decimal_to_double _decimal_to_double
+#define decimal_to_extended _decimal_to_extended
+#define decimal_to_quadruple _decimal_to_quadruple
+#define decimal_to_single _decimal_to_single
+#define dgettext _dgettext
+#define dirname _dirname
+#define dladdr _dladdr
+#define dladdr1 _dladdr1
+#define dlamd64getunwind _dlamd64getunwind
+#define dlclose _dlclose
+#define dldump _dldump
+#define dlerror _dlerror
+#define dlinfo _dlinfo
+#define dlmopen _dlmopen
+#define dlopen _dlopen
+#define dlsym _dlsym
+#define dngettext _dngettext
#define door_bind _door_bind
#define door_call _door_call
#define door_create _door_create
@@ -118,796 +283,854 @@ extern "C" {
#define door_info _door_info
#define door_return _door_return
#define door_revoke _door_revoke
-#define door_setparam _door_setparam
#define door_server_create _door_server_create
+#define door_setparam _door_setparam
#define door_ucred _door_ucred
#define door_unbind _door_unbind
-#define drand48 _drand48
-#define dup _dup
-#define dup2 _dup2
-#define ecvt _ecvt
-#define edata _edata
-#define encrypt _encrypt
-#define end _end
-#define endgrent _endgrent
-#define endpwent _endpwent
-#define endspent _endspent
-#define endutent _endutent
-#define endutxent _endutxent
-#define environ _environ
-#define erand48 _erand48
-#define etext _etext
-#define execl _execl
-#define execle _execle
-#define execlp _execlp
-#define execv _execv
-#define execve _execve
-#define execvp _execvp
-#define exportfs _exportfs
-#define facl _facl
-#define fattach _fattach
-#define fchdir _fchdir
-#define fchmod _fchmod
-#define fchown _fchown
-#define fchownat _fchownat
-#define fchroot _fchroot
-#define fcntl _fcntl
-#define fcvt _fcvt
-#define fdetach _fdetach
-#define fdopen _fdopen
-#define fdwalk _fdwalk
-#define ffs _ffs
-#define fgetgrent _fgetgrent
-#define fgetgrent_r _fgetgrent_r
-#define fgetpwent _fgetpwent
-#define fgetpwent_r _fgetpwent_r
-#define fgetspent _fgetspent
-#define fgetspent_r _fgetspent_r
-#define finite _finite
-#define flockfile _flockfile
-#define ftrylockfile _ftrylockfile
-#define funlockfile _funlockfile
-#define fmtmsg _fmtmsg
-#define fork _fork
-#define fork1 _fork1
-#define forkall _forkall
-#define fpathconf _fpathconf
-#define fpclass _fpclass
-#define fpgetmask _fpgetmask
-#define fpgetround _fpgetround
-#define fpgetsticky _fpgetsticky
-#define fprintf _fprintf
-#define fpsetmask _fpsetmask
-#define fpsetround _fpsetround
-#define fpsetsticky _fpsetsticky
-#define fstat _fstat
-#define fstatat _fstatat
-#define fstatfs _fstatfs
-#define fstatvfs _fstatvfs
-#define fsync _fsync
-#define ftell _ftell
-#define ftello _ftello
-#define fseek _fseek
-#define fseeko _fseeko
-#define ftok _ftok
-#define ftruncate _ftruncate
-#define unlinkat _unlinkat
-#define futimesat _futimesat
-#define gcvt _gcvt
-#define getacct _getacct
-#define getcontext _getcontext
-#define getcpuid _getcpuid
-#define getcwd _getcwd
-#define getdate _getdate
-#define getdents _getdents
-#define getegid _getegid
-#define geteuid _geteuid
-#define getexecname _getexecname
-#define getextmntent _getextmntent
-#define getgid _getgid
-#define getloadavg _getloadavg
-#define getgrent _getgrent
-#define getgrent_r _getgrent_r
-#define getgrgid _getgrgid
-#define getgrgid_r _getgrgid_r
-#define getgrnam _getgrnam
-#define getgrnam_r _getgrnam_r
-#define getgroups _getgroups
-#define gethomelgroup _gethomelgroup /* Being replaced by lgrp_home() */
-#define gethz _gethz
-#define getisax _getisax
-#define getitimer _getitimer
-#define gettaskid _gettaskid
-#define getlogin _getlogin
-#define getmntany _getmntany
-#define getmntent _getmntent
-#define getmsg _getmsg
-#define getopt _getopt
-#define getopt_clip _getopt_clip
-#define getopt_long _getopt_long
-#define getopt_long_only _getopt_long_only
-#define getpagesizes _getpagesizes
-#define getpass _getpass
-#define getpassphrase _getpassphrase
-#define getpeerucred _getpeerucred
-#define getpgid _getpgid
-#define getpgrp _getpgrp
-#define getpid _getpid
-#define getpmsg _getpmsg
-#define getppid _getppid
-#define getppriv _getppriv
-#define getprivimplinfo _getprivimplinfo
-#define getpflags _getpflags
-#define getprojid _getprojid
-#define getpw _getpw
-#define getpwent _getpwent
-#define getpwent_r _getpwent_r
-#define getpwnam _getpwnam
-#define getpwnam_r _getpwnam_r
-#define getpwuid _getpwuid
-#define getpwuid_r _getpwuid_r
-#define getrctl _getrctl
-#define getrlimit _getrlimit
-#define getsid _getsid
-#define getspent _getspent
-#define getspent_r _getspent_r
-#define getspnam _getspnam
-#define getspnam_r _getspnam_r
-#define getsubopt _getsubopt
-#define gettimeofday _gettimeofday
-#define gettxt _gettxt
-#define getuid _getuid
-#define getustack _getustack
-#define getutent _getutent
-#define getutid _getutid
-#define getutline _getutline
-#define getutmp _getutmp
-#define getutmpx _getutmpx
-#define getutxent _getutxent
-#define getutxid _getutxid
-#define getutxline _getutxline
-#define getvfsany _getvfsany
-#define getvfsent _getvfsent
-#define getvfsfile _getvfsfile
-#define getvfsspec _getvfsspec
-#define getw _getw
-#define getzoneid _getzoneid
-#define getzoneidbyname _getzoneidbyname
-#define getzonenamebyid _getzonenamebyid
-#define grantpt _grantpt
-#define gsignal _gsignal
-#define gtty _gtty
-#define hasmntopt _hasmntopt
-#define hcreate _hcreate
-#define hdestroy _hdestroy
-#define hsearch _hsearch
-#define initgroups _initgroups
-#define insque _insque
-#define install_utrap _install_utrap
-#define inst_sync _inst_sync
-#define ioctl _ioctl
-#define isaexec _isaexec
-#define isastream _isastream
-#define isatty _isatty
-#define issetugid _issetugid
-#define jrand48 _jrand48
-#define kaio _kaio
-#define kill _kill
-#define l64a _l64a
-#define ladd _ladd
-#define lchown _lchown
-#define lckpwdf _lckpwdf
-#define lcong48 _lcong48
-#define ldivide _ldivide
-#define lexp10 _lexp10
-#define lfind _lfind
-#define link _link
-#define llog10 _llog10
-#define llseek _llseek
-#define lmul _lmul
-#define lockf _lockf
-#define localtime_r _localtime_r
-#define longjmp _longjmp
-#define lrand48 _lrand48
-#define lsearch _lsearch
-#define lseek _lseek
-#define lshiftl _lshiftl
-#define lsign _lsign
-#define lstat _lstat
-#define lsub _lsub
-#define ltol3 _ltol3
-#define madvise _madvise
-#define makecontext _makecontext
-#define __makecontext_v2 ___makecontext_v2
-#define makeut _makeut
-#define makeutx _makeutx
-#define memalign _memalign
-#define memccpy _memccpy
-#define memcntl _memcntl
-#define memcmp _memcmp
-#define memcpy _memcpy
-#define meminfo _meminfo
-#define memmove _memmove
-#define memset _memset
-#define mincore _mincore
-#define mkdir _mkdir
-#define mkfifo _mkfifo
-#define mknod _mknod
-#define mktemp _mktemp
-#define mkstemp _mkstemp
-#define mlock _mlock
-#define mlockall _mlockall
-#define mmap _mmap
-#define modut _modut
-#define modutx _modutx
-#define monitor _monitor
-#define mount _mount
-#define mprotect _mprotect
-#define mrand48 _mrand48
-#define msgctl _msgctl
-#define msgctl64 _msgctl64
-#define msgget _msgget
-#define msgids _msgids
-#define msgsnap _msgsnap
-#define msgrcv _msgrcv
-#define msgsnd _msgsnd
-#define msync _msync
-#define munlock _munlock
-#define munlockall _munlockall
-#define munmap _munmap
-#define nfs_getfh _nfs_getfh
-#define nfssvc _nfssvc
-#define nftw _nftw
-#define nice _nice
-#define nrand48 _nrand48
-#define nss_delete _nss_delete
-#define nss_endent _nss_endent
-#define nss_getent _nss_getent
-#define nss_search _nss_search
-#define nss_setent _nss_setent
-#define ntp_gettime _ntp_gettime
-#define ntp_adjtime _ntp_adjtime
-#define open _open
-#define openat _openat
-#define opendir _opendir
-#define fdopendir _fdopendir
-#define openlog _openlog
-#define pathconf _pathconf
-#define pause _pause
-#define pclose _pclose
-#define pcsample _pcsample
-#define pipe _pipe
-#define plock _plock
-#define poll _poll
-#define port_create _port_create
-#define port_associate _port_associate
-#define port_dissociate _port_dissociate
-#define port_send _port_send
-#define port_sendn _port_sendn
-#define port_get _port_get
-#define port_getn _port_getn
-#define port_alert _port_alert
-#define port_dispatch _port_dispatch
-#define popen _popen
-#define posix_openpt _posix_openpt
-#define pread _pread
-#define pselect _pselect
-#define pset_assign _pset_assign
-#define pset_bind _pset_bind
-#define printstack _printstack
-#define pset_create _pset_create
-#define pset_destroy _pset_destroy
-#define pset_getattr _pset_getattr
-#define pset_getloadavg _pset_getloadavg
-#define pset_info _pset_info
-#define pset_list _pset_list
-#define pset_setattr _pset_setattr
-#define priv_addset _priv_addset
-#define priv_allocset _priv_allocset
-#define priv_copyset _priv_copyset
-#define priv_delset _priv_delset
-#define priv_emptyset _priv_emptyset
-#define priv_fillset _priv_fillset
-#define priv_freeset _priv_freeset
-#define priv_getbyname _priv_getbyname
-#define priv_getbynum _priv_getbynum
-#define priv_getsetbyname _priv_getsetbyname
-#define priv_getsetbynum _priv_getsetbynum
-#define priv_gettext _priv_gettext
-#define priv_ineffect _priv_ineffect
-#define priv_intersect _priv_intersect
-#define priv_inverse _priv_inverse
-#define priv_isemptyset _priv_isemptyset
-#define priv_isequalset _priv_isequalset
-#define priv_isfullset _priv_isfullset
-#define priv_ismember _priv_ismember
-#define priv_issubset _priv_issubset
-#define priv_set _priv_set
-#define priv_set_to_str _priv_set_to_str
-#define priv_str_to_set _priv_str_to_set
-#define priv_union _priv_union
-#define profil _profil
-#define psiginfo _psiginfo
-#define psignal _psignal
-#define ptrace _ptrace
-#define ptsname _ptsname
-#define putacct _putacct
-#define pwrite _pwrite
-#define putenv _putenv
-#define putmsg _putmsg
-#define putpmsg _putpmsg
-#define putpwent _putpwent
-#define putspent _putspent
-#define pututline _pututline
-#define pututxline _pututxline
-#define putw _putw
-#define rand_r _rand_r
-#define rctlctl _rctlctl
-#define rctllist _rctllist
-#define read _read
-#define readdir _readdir
-#define readdir_r _readdir_r
-#define readlink _readlink
-#define readv _readv
-#define realpath _realpath
-#define regcmp _regcmp
-#define regcomp _regcomp
-#define regerror _regerror
-#define regex _regex
-#define regexec _regexec
-#define regfree _regfree
-#define remque _remque
-#define renameat _renameat
-#define resetmnttab _resetmnttab
-#define resolvepath _resolvepath
-#define rmdir _rmdir
-#define sbrk _sbrk
-#define scandir _scandir
-#define scrwidth _scrwidth
-#define seed48 _seed48
-#define seekdir _seekdir
-#define select _select
-#define semctl _semctl
-#define semctl64 _semctl64
-#define semget _semget
-#define semids _semids
-#define semop _semop
-#define semtimedop _semtimedop
-#define setcontext _setcontext
-#define setegid _setegid
-#define setenv _setenv
-#define seteuid _seteuid
-#define setgid _setgid
-#define setgrent _setgrent
-#define setgroups _setgroups
-#define setitimer _setitimer
-#define settaskid _settaskid
-#define setjmp _setjmp
-#define setkey _setkey
-#define setlocale _setlocale
-#define setlogmask _setlogmask
-#define setpgid _setpgid
-#define setpgrp _setpgrp
-#define setppriv _setppriv
-#define setpflags _setpflags
-#define setpwent _setpwent
-#define setrctl _setrctl
-#define setregid _setregid
-#define setreuid _setreuid
-#define setrlimit _setrlimit
-#define setsid _setsid
-#define setspent _setspent
-#define settimeofday _settimeofday
-#define setuid _setuid
-#define setustack _setustack
-#define setutent _setutent
-#define setutxent _setutxent
-#define shmat _shmat
-#define shmctl _shmctl
-#define shmctl64 _shmctl64
-#define shmdt _shmdt
-#define shmget _shmget
-#define shmids _shmids
-#define sig2str _sig2str
-#define sigaction _sigaction
-#define sigaddset _sigaddset
-#define sigaltstack _sigaltstack
-#define sigdelset _sigdelset
-#define sigemptyset _sigemptyset
-#define sigfillset _sigfillset
-#define sigflag _sigflag
-#define sigfpe _sigfpe
-#define sighold _sighold
-#define sigignore _sigignore
-#define siginterrupt _siginterrupt
-#define sigismember _sigismember
-#define siglongjmp _siglongjmp
-#define sigpause _sigpause
-#define sigpending _sigpending
-#define sigprocmask _sigprocmask
-#define sigrelse _sigrelse
-#define sigsend _sigsend
-#define sigsendset _sigsendset
-#define sigset _sigset
-#define signal _signal
-#define sigsetjmp _sigsetjmp
-#define sigsuspend _sigsuspend
-#define sigwait _sigwait
-#define sleep _sleep
-#define srand48 _srand48
-#define ssignal _ssignal
-#define stack_getbounds _stack_getbounds
-#define stack_setbounds _stack_setbounds
-#define stack_inbounds _stack_inbounds
-#define stack_violation _stack_violation
-#define stat _stat
-#define statfs _statfs
-#define statvfs _statvfs
-#define stime _stime
-#define str2sig _str2sig
-#define strdup _strdup
-#define strtok_r _strtok_r
-#define stty _stty
-#define swab _swab
-#define swapcontext _swapcontext
-#define swapctl _swapctl
-#define symlink _symlink
-#define sync _sync
-#define synchutmp _synchutmp
-#define syssun _syssun
-#define sys_errlist _sys_errlist
-#define sys_nerr _sys_nerr
-#define syscall _syscall6
-#define _syscall _syscall6
-#define sysconf _sysconf
-#define sysfs _sysfs
-#define sysinfo _sysinfo
-#define syslog _syslog
-#define tcdrain _tcdrain
-#define tcflow _tcflow
-#define tcflush _tcflush
-#define tcgetattr _tcgetattr
-#define tcgetpgrp _tcgetpgrp
-#define tcgetsid _tcgetsid
-#define tcsendbreak _tcsendbreak
-#define tcsetattr _tcsetattr
-#define tcsetpgrp _tcsetpgrp
-#define tdelete _tdelete
-#define tell _tell
-#define telldir _telldir
-#define tempnam _tempnam
-#define tfind _tfind
-#define time _time
-#define times _times
-#define tmpnam _tmpnam
-#define tmpnam_r _tmpnam_r
-#define truncate _truncate
-#define tsearch _tsearch
-#define ttyname _ttyname
-#define ttyslot _ttyslot
-#define twalk _twalk
-#define tzname _tzname
-#define tzset _tzset
-#define uadmin _uadmin
-#define ucred_free _ucred_free
-#define ucred_get _ucred_get
-#define ucred_getamask _ucred_getamask
-#define ucred_getasid _ucred_getasid
-#define ucred_getatid _ucred_getatid
-#define ucred_getauid _ucred_getauid
-#define ucred_getegid _ucred_getegid
-#define ucred_geteuid _ucred_geteuid
-#define ucred_getgroups _ucred_getgroups
-#define ucred_getpflags _ucred_getpflags
-#define ucred_getpid _ucred_getpid
-#define ucred_getprojid _ucred_getprojid
-#define ucred_getprivset _ucred_getprivset
-#define ucred_getrgid _ucred_getrgid
-#define ucred_getruid _ucred_getruid
-#define ucred_getsuid _ucred_getsuid
-#define ucred_getsgid _ucred_getsgid
-#define ucred_getzoneid _ucred_getzoneid
-#define ucred_size _ucred_size
-#define ulckpwdf _ulckpwdf
-#define ulimit _ulimit
-#define umask _umask
-#define umount _umount
-#define umount2 _umount2
-#define uname _uname
-#define undial _undial
-#define unlink _unlink
-#define unlockpt _unlockpt
-#define unordered _unordered
-#define unsetenv _unsetenv
-#define updutfile _updutfile
-#define updutxfile _updutxfile
-#define updutmp _updutmp
-#define updutmpx _updutmpx
-#define updwtmp _updwtmp
-#define updwtmpx _updwtmpx
-#define ustat _ustat
-#define utime _utime
-#define utimes _utimes
-#define utmpname _utmpname
-#define utmpxname _utmpxname
-#define utssys _utssys
-#define valloc _valloc
-#define vfork _vfork
-#define vfscanf _vfscanf
-#define vhangup _vhangup
-#define vscanf _vscanf
-#define vsscanf _vsscanf
-#define vsyslog _vsyslog
-#define wait _wait
-#define waitid _waitid
-#define waitpid _waitpid
-#define walkcontext _walkcontext
-#define wcwidth _wcwidth
-#define wcswidth _wcswidth
-#define wracct _wracct
-#define write _write
-#define writev _writev
-#define yield _yield
-#define usleep _usleep
-#define wait3 _wait3
-#define _assert __assert
-#define _assert_c99 __assert_c99
-#define _cladm __cladm
-#define _ctype __ctype
-#define _filbuf __filbuf
-#define _flsbuf __flsbuf
-#define _iob __iob
-#define _lwp_info __lwp_info
-#define _lwp_self __lwp_self
-#define _lwp_kill __lwp_kill
-#define _lwp_private __lwp_private
-#define _lwp_suspend __lwp_suspend
-#define _lwp_continue __lwp_continue
-#define _lwp_mutex_lock __lwp_mutex_lock
-#define _lwp_mutex_timedlock __lwp_mutex_timedlock
-#define _lwp_mutex_reltimedlock __lwp_mutex_reltimedlock
-#define _lwp_mutex_trylock __lwp_mutex_trylock
-#define _lwp_mutex_unlock __lwp_mutex_unlock
-#define _lwp_cond_wait __lwp_cond_wait
-#define _lwp_cond_timedwait __lwp_cond_timedwait
-#define _lwp_cond_reltimedwait __lwp_cond_reltimedwait
-#define _lwp_cond_signal __lwp_cond_signal
-#define _lwp_cond_broadcast __lwp_cond_broadcast
-#define _lwp_sema_wait __lwp_sema_wait
-#define _lwp_sema_trywait __lwp_sema_trywait
-#define _lwp_sema_post __lwp_sema_post
-#define _lwp_sema_init __lwp_sema_init
-#define __systemcall __systemcall6
-
-/* fp and ll functions */
-#define decimal_to_double _decimal_to_double
-#define decimal_to_extended _decimal_to_extended
-#define decimal_to_quadruple _decimal_to_quadruple
-#define decimal_to_single _decimal_to_single
#define double_to_decimal _double_to_decimal
+#define drand48 _drand48
+#define dup2 _dup2
+#define dup _dup
#define econvert _econvert
+#define ecvt _ecvt
+#define edata _edata
+#define encrypt _encrypt
+#define end _end
+#define endgrent _endgrent
+#define endpwent _endpwent
+#define endspent _endspent
+#define endutent _endutent
+#define endutxent _endutxent
+#define environ _environ
+#define erand48 _erand48
+#define etext _etext
+#define execle _execle
+#define execl _execl
+#define execlp _execlp
+#define execve _execve
+#define execv _execv
+#define execvp _execvp
+#define exportfs _exportfs
#define extended_to_decimal _extended_to_decimal
+#define facl _facl
+#define fattach _fattach
+#define fchdir _fchdir
+#define fchmod _fchmod
+#define fchownat _fchownat
+#define fchown _fchown
+#define fchroot _fchroot
+#define fcntl _fcntl
#define fconvert _fconvert
+#define fcvt _fcvt
+#define fdetach _fdetach
+#define fdopendir _fdopendir
+#define fdopen _fdopen
+#define fdwalk _fdwalk
+#define ffs _ffs
+#define fgetgrent _fgetgrent
+#define fgetgrent_r _fgetgrent_r
+#define fgetpwent _fgetpwent
+#define fgetpwent_r _fgetpwent_r
+#define fgetspent _fgetspent
+#define fgetspent_r _fgetspent_r
+#define _filbuf __filbuf
+#define fileno _fileno
#define file_to_decimal _file_to_decimal
+#define finite _finite
+#define flockfile _flockfile
+#define _flsbuf __flsbuf
+#define fmtmsg _fmtmsg
+#define fnmatch _fnmatch
+#define fork1 _fork1
+#define forkall _forkall
+#define fork _fork
+#define fpathconf _fpathconf
+#define fpclass _fpclass
+#define fpgetmask _fpgetmask
+#define fpgetround _fpgetround
+#define fpgetsticky _fpgetsticky
+#define fprintf _fprintf
+#define fpsetmask _fpsetmask
+#define fpsetround _fpsetround
+#define fpsetsticky _fpsetsticky
+#define fseek _fseek
+#define fseeko _fseeko
+#define fstatat _fstatat
+#define fstatfs _fstatfs
+#define fstat _fstat
+#define fstatvfs _fstatvfs
+#define fsync _fsync
+#define ftell _ftell
+#define ftello _ftello
+#define ftok _ftok
+#define ftruncate _ftruncate
+#define ftrylockfile _ftrylockfile
+#define ftw64 _ftw64
+#define ftw _ftw
#define func_to_decimal _func_to_decimal
+#define funlockfile _funlockfile
+#define futimesat _futimesat
#define gconvert _gconvert
-#define qeconvert _qeconvert
-#define qecvt _qecvt
-#define qfconvert _qfconvert
-#define qfcvt _qfcvt
-#define qgconvert _qgconvert
-#define qgcvt _qgcvt
-#define quadruple_to_decimal _quadruple_to_decimal
-#define seconvert _seconvert
-#define sfconvert _sfconvert
-#define sgconvert _sgconvert
-#define single_to_decimal _single_to_decimal
-#define string_to_decimal _string_to_decimal
-#define atoll _atoll
+#define gcvt _gcvt
+#define getacct _getacct
+#define getcontext _getcontext
+#define getcpuid _getcpuid
+#define getcwd _getcwd
+#define getdate_err _getdate_err
+#define getdate _getdate
+#define getdents _getdents
+#define getegid _getegid
+#define geteuid _geteuid
+#define getexecname _getexecname
+#define getextmntent _getextmntent
+#define getgid _getgid
+#define getgrent _getgrent
+#define getgrent_r _getgrent_r
+#define getgrgid _getgrgid
+#define getgrgid_r _getgrgid_r
+#define getgrnam _getgrnam
+#define getgrnam_r _getgrnam_r
+#define getgroups _getgroups
+#define gethomelgroup _gethomelgroup
+#define gethz _gethz
+#define getisax _getisax
+#define getitimer _getitimer
+#define getloadavg _getloadavg
+#define getlogin _getlogin
+#define getlogin_r _getlogin_r
+#define getmntany _getmntany
+#define getmntent _getmntent
+#define getmsg _getmsg
+#define getopt_clip _getopt_clip
+#define getopt _getopt
+#define getopt_long _getopt_long
+#define getopt_long_only _getopt_long_only
+#define getpagesizes _getpagesizes
+#define getpass _getpass
+#define getpassphrase _getpassphrase
+#define getpeerucred _getpeerucred
+#define getpflags _getpflags
+#define getpgid _getpgid
+#define getpgrp _getpgrp
+#define getpid _getpid
+#define getpmsg _getpmsg
+#define getppid _getppid
+#define getppriv _getppriv
+#define getprivimplinfo _getprivimplinfo
+#define getprojid _getprojid
+#define getpwent _getpwent
+#define getpwent_r _getpwent_r
+#define getpw _getpw
+#define getpwnam _getpwnam
+#define getpwnam_r _getpwnam_r
+#define getpwuid _getpwuid
+#define getpwuid_r _getpwuid_r
+#define getrctl _getrctl
+#define getrlimit _getrlimit
+#define getsid _getsid
+#define getspent _getspent
+#define getspent_r _getspent_r
+#define getspnam _getspnam
+#define getspnam_r _getspnam_r
+#define getsubopt _getsubopt
+#define gettaskid _gettaskid
+#define gettext _gettext
+#define gettimeofday _gettimeofday
+#define gettxt _gettxt
+#define getuid _getuid
+#define getustack _getustack
+#define getutent _getutent
+#define getutid _getutid
+#define getutline _getutline
+#define getutmp _getutmp
+#define getutmpx _getutmpx
+#define getutxent _getutxent
+#define getutxid _getutxid
+#define getutxline _getutxline
+#define getvfsany _getvfsany
+#define getvfsent _getvfsent
+#define getvfsfile _getvfsfile
+#define getvfsspec _getvfsspec
+#define getw _getw
+#define getzoneidbyname _getzoneidbyname
+#define getzoneid _getzoneid
+#define getzonenamebyid _getzonenamebyid
+#define gmtime_r _gmtime_r
+#define grantpt _grantpt
+#define gsignal _gsignal
+#define gtty _gtty
+#define hasmntopt _hasmntopt
+#define hcreate _hcreate
+#define hdestroy _hdestroy
+#define hsearch _hsearch
+#define iconv_close _iconv_close
+#define iconv _iconv
+#define iconv_open _iconv_open
+#define initgroups _initgroups
+#define insque _insque
+#define install_utrap _install_utrap
+#define inst_sync _inst_sync
+#define _iob __iob
+#define ioctl _ioctl
+#define isaexec _isaexec
+#define isastream _isastream
+#define isatty _isatty
+#define isenglish _isenglish
+#define isideogram _isideogram
+#define isnumber _isnumber
+#define isphonogram _isphonogram
+#define issetugid _issetugid
+#define isspecial _isspecial
+#define iswalnum _iswalnum
+#define iswalpha _iswalpha
+#define iswcntrl _iswcntrl
+#define iswctype __iswctype
+#define iswdigit _iswdigit
+#define iswgraph _iswgraph
+#define iswlower _iswlower
+#define iswprint _iswprint
+#define iswpunct _iswpunct
+#define iswspace _iswspace
+#define iswupper _iswupper
+#define iswxdigit _iswxdigit
+#define jrand48 _jrand48
+#define kaio _kaio
+#define kill _kill
+#define l64a _l64a
+#define ladd _ladd
+#define lchown _lchown
+#define lckpwdf _lckpwdf
+#define lcong48 _lcong48
+#define ldivide _ldivide
+#define lexp10 _lexp10
+#define lfind _lfind
+#define link _link
#define llabs _llabs
#define lldiv _lldiv
+#define llog10 _llog10
+#define llseek _llseek
#define lltostr _lltostr
-#define strtoll _strtoll
-#define strtoull _strtoull
-#define ulltostr _ulltostr
-
-#if !defined(_LP64)
-/* transitional large file interfaces */
-#define alphasort64 _alphasort64
-#define attropen64 _attropen64
-#define creat64 _creat64
-#define ftello64 _ftello64
-#define fseeko64 _fseeko64
-#define fstat64 _fstat64
-#define ftw64 _ftw64
-#define fstatvfs64 _fstatvfs64
-#define ftruncate64 _ftruncate64
-#define getdents64 _getdents64
-#define getrlimit64 _getrlimit64
-#define lockf64 _lockf64
-#define lseek64 _lseek64
-#define lstat64 _lstat64
-#define mkstemp64 _mkstemp64
-#define mmap64 _mmap64
-#define nftw64 _nftw64
-#define openat64 _openat64
-#define open64 _open64
-#define pread64 _pread64
-#define pwrite64 _pwrite64
-#define readdir64 _readdir64
-#define readdir64_r _readdir64_r
-#define scandir64 _scandir64
-#define seekdir64 _seekdir64
-#define tell64 _tell64
-#define telldir64 _telldir64
-#define setrlimit64 _setrlimit64
-#define stat64 _stat64
-#define fstatat64 _fstatat64
-#define statvfs64 _statvfs64
-#define truncate64 _truncate64
-#endif /* !_LP64 */
-
-/* lock primitives and other multithreading interfaces */
-#define atomic_inc_8 _atomic_inc_8
-#define atomic_inc_uchar _atomic_inc_uchar
-#define atomic_inc_16 _atomic_inc_16
-#define atomic_inc_ushort _atomic_inc_ushort
-#define atomic_inc_32 _atomic_inc_32
-#define atomic_inc_uint _atomic_inc_uint
-#define atomic_inc_ulong _atomic_inc_ulong
-#define atomic_inc_64 _atomic_inc_64
-#define atomic_dec_8 _atomic_dec_8
-#define atomic_dec_uchar _atomic_dec_uchar
-#define atomic_dec_16 _atomic_dec_16
-#define atomic_dec_ushort _atomic_dec_ushort
-#define atomic_dec_32 _atomic_dec_32
-#define atomic_dec_uint _atomic_dec_uint
-#define atomic_dec_ulong _atomic_dec_ulong
-#define atomic_dec_64 _atomic_dec_64
-#define atomic_add_8 _atomic_add_8
-#define atomic_add_char _atomic_add_char
-#define atomic_add_16 _atomic_add_16
-#define atomic_add_short _atomic_add_short
-#define atomic_add_32 _atomic_add_32
-#define atomic_add_int _atomic_add_int
-#define atomic_add_64 _atomic_add_64
-#define atomic_add_ptr _atomic_add_ptr
-#define atomic_add_long _atomic_add_long
-#define atomic_or_8 _atomic_or_8
-#define atomic_or_uchar _atomic_or_uchar
-#define atomic_or_16 _atomic_or_16
-#define atomic_or_ushort _atomic_or_ushort
-#define atomic_or_32 _atomic_or_32
-#define atomic_or_uint _atomic_or_uint
-#define atomic_or_64 _atomic_or_64
-#define atomic_or_ulong _atomic_or_ulong
-#define atomic_and_8 _atomic_and_8
-#define atomic_and_uchar _atomic_and_uchar
-#define atomic_and_16 _atomic_and_16
-#define atomic_and_ushort _atomic_and_ushort
-#define atomic_and_32 _atomic_and_32
-#define atomic_and_uint _atomic_and_uint
-#define atomic_and_64 _atomic_and_64
-#define atomic_and_ulong _atomic_and_ulong
-#define atomic_inc_8_nv _atomic_inc_8_nv
-#define atomic_inc_uchar_nv _atomic_inc_uchar_nv
-#define atomic_inc_16_nv _atomic_inc_16_nv
-#define atomic_inc_ushort_nv _atomic_inc_ushort_nv
-#define atomic_inc_32_nv _atomic_inc_32_nv
-#define atomic_inc_uint_nv _atomic_inc_uint_nv
-#define atomic_inc_ulong_nv _atomic_inc_ulong_nv
-#define atomic_inc_64_nv _atomic_inc_64_nv
-#define atomic_dec_8_nv _atomic_dec_8_nv
-#define atomic_dec_uchar_nv _atomic_dec_uchar_nv
-#define atomic_dec_16_nv _atomic_dec_16_nv
-#define atomic_dec_ushort_nv _atomic_dec_ushort_nv
-#define atomic_dec_32_nv _atomic_dec_32_nv
-#define atomic_dec_uint_nv _atomic_dec_uint_nv
-#define atomic_dec_ulong_nv _atomic_dec_ulong_nv
-#define atomic_dec_64_nv _atomic_dec_64_nv
-#define atomic_add_8_nv _atomic_add_8_nv
-#define atomic_add_char_nv _atomic_add_char_nv
-#define atomic_add_16_nv _atomic_add_16_nv
-#define atomic_add_short_nv _atomic_add_short_nv
-#define atomic_add_32_nv _atomic_add_32_nv
-#define atomic_add_int_nv _atomic_add_int_nv
-#define atomic_add_64_nv _atomic_add_64_nv
-#define atomic_add_ptr_nv _atomic_add_ptr_nv
-#define atomic_add_long_nv _atomic_add_long_nv
-#define atomic_or_8_nv _atomic_or_8_nv
-#define atomic_or_uchar_nv _atomic_or_uchar_nv
-#define atomic_or_16_nv _atomic_or_16_nv
-#define atomic_or_ushort_nv _atomic_or_ushort_nv
-#define atomic_or_32_nv _atomic_or_32_nv
-#define atomic_or_uint_nv _atomic_or_uint_nv
-#define atomic_or_64_nv _atomic_or_64_nv
-#define atomic_or_ulong_nv _atomic_or_ulong_nv
-#define atomic_and_8_nv _atomic_and_8_nv
-#define atomic_and_uchar_nv _atomic_and_uchar_nv
-#define atomic_and_16_nv _atomic_and_16_nv
-#define atomic_and_ushort_nv _atomic_and_ushort_nv
-#define atomic_and_32_nv _atomic_and_32_nv
-#define atomic_and_uint_nv _atomic_and_uint_nv
-#define atomic_and_64_nv _atomic_and_64_nv
-#define atomic_and_ulong_nv _atomic_and_ulong_nv
-#define atomic_cas_8 _atomic_cas_8
-#define atomic_cas_uchar _atomic_cas_uchar
-#define atomic_cas_16 _atomic_cas_16
-#define atomic_cas_ushort _atomic_cas_ushort
-#define atomic_cas_32 _atomic_cas_32
-#define atomic_cas_uint _atomic_cas_uint
-#define atomic_cas_ptr _atomic_cas_ptr
-#define atomic_cas_ulong _atomic_cas_ulong
-#define atomic_cas_64 _atomic_cas_64
-#define atomic_swap_8 _atomic_swap_8
-#define atomic_swap_uchar _atomic_swap_uchar
-#define atomic_swap_16 _atomic_swap_16
-#define atomic_swap_ushort _atomic_swap_ushort
-#define atomic_swap_32 _atomic_swap_32
-#define atomic_swap_uint _atomic_swap_uint
-#define atomic_swap_ptr _atomic_swap_ptr
-#define atomic_swap_ulong _atomic_swap_ulong
-#define atomic_swap_64 _atomic_swap_64
-#define atomic_set_long_excl _atomic_set_long_excl
-#define atomic_clear_long_excl _atomic_clear_long_excl
+#define lmul _lmul
+#define localtime_r _localtime_r
+#define lockf _lockf
+#define longjmp _longjmp
+#define lrand48 _lrand48
+#define lsearch _lsearch
+#define lseek _lseek
+#define lshiftl _lshiftl
+#define lsign _lsign
+#define lstat _lstat
+#define lsub _lsub
+#define _lwp_cond_broadcast __lwp_cond_broadcast
+#define _lwp_cond_reltimedwait __lwp_cond_reltimedwait
+#define _lwp_cond_signal __lwp_cond_signal
+#define _lwp_cond_timedwait __lwp_cond_timedwait
+#define _lwp_cond_wait __lwp_cond_wait
+#define _lwp_continue __lwp_continue
+#define _lwp_info __lwp_info
+#define _lwp_kill __lwp_kill
+#define _lwp_mutex_lock __lwp_mutex_lock
+#define _lwp_mutex_reltimedlock __lwp_mutex_reltimedlock
+#define _lwp_mutex_timedlock __lwp_mutex_timedlock
+#define _lwp_mutex_trylock __lwp_mutex_trylock
+#define _lwp_mutex_unlock __lwp_mutex_unlock
+#define _lwp_private __lwp_private
+#define _lwp_self __lwp_self
+#define _lwp_sema_init __lwp_sema_init
+#define _lwp_sema_post __lwp_sema_post
+#define _lwp_sema_trywait __lwp_sema_trywait
+#define _lwp_sema_wait __lwp_sema_wait
+#define _lwp_suspend __lwp_suspend
+#define madvise _madvise
+#define makecontext _makecontext
+#define __makecontext_v2 ___makecontext_v2
+#define makeut _makeut
+#define makeutx _makeutx
+#define mblen _mblen
+#define mbstowcs _mbstowcs
+#define mbtowc _mbtowc
+#define memalign _memalign
+#define membar_consumer _membar_consumer
#define membar_enter _membar_enter
#define membar_exit _membar_exit
#define membar_producer _membar_producer
-#define membar_consumer _membar_consumer
-#define mutex_init _mutex_init
+#define memccpy _memccpy
+#define memcmp _memcmp
+#define memcntl _memcntl
+#define memcpy _memcpy
+#define meminfo _meminfo
+#define memmove _memmove
+#define memset _memset
+#define mincore _mincore
+#define mkdir _mkdir
+#define mkfifo _mkfifo
+#define mknod _mknod
+#define mkstemp _mkstemp
+#define mktemp _mktemp
+#define mlockall _mlockall
+#define mlock _mlock
+#define mmap _mmap
+#define modut _modut
+#define modutx _modutx
+#define monitor _monitor
+#define mount _mount
+#define mprotect _mprotect
+#define mrand48 _mrand48
+#define msgctl64 _msgctl64
+#define msgctl _msgctl
+#define msgget _msgget
+#define msgids _msgids
+#define msgrcv _msgrcv
+#define msgsnap _msgsnap
+#define msgsnd _msgsnd
+#define msync _msync
+#define munlockall _munlockall
+#define munlock _munlock
+#define munmap _munmap
#define mutex_destroy _mutex_destroy
+#define mutex_held _mutex_held
+#define mutex_init _mutex_init
#define mutex_lock _mutex_lock
#define mutex_trylock _mutex_trylock
#define mutex_unlock _mutex_unlock
-#define cond_init _cond_init
-#define cond_destroy _cond_destroy
-#define cond_wait _cond_wait
-#define cond_timedwait _cond_timedwait
-#define cond_reltimedwait _cond_reltimedwait
-#define cond_signal _cond_signal
-#define cond_broadcast _cond_broadcast
-#define rwlock_init _rwlock_init
+#define nfs_getfh _nfs_getfh
+#define nfssvc _nfssvc
+#define nftw64 _nftw64
+#define nftw _nftw
+#define ngettext _ngettext
+#define nice _nice
+#define nl_langinfo _nl_langinfo
+#define nrand48 _nrand48
+#define nss_default_finders _nss_default_finders
+#define nss_delete _nss_delete
+#define nss_endent _nss_endent
+#define nss_getent _nss_getent
+#define nss_search _nss_search
+#define nss_setent _nss_setent
+#define ntp_adjtime _ntp_adjtime
+#define ntp_gettime _ntp_gettime
+#define openat _openat
+#define opendir _opendir
+#define openlog _openlog
+#define open _open
+#define pathconf _pathconf
+#define pause _pause
+#define pclose _pclose
+#define pcsample _pcsample
+#define pipe _pipe
+#define plock _plock
+#define poll _poll
+#define popen _popen
+#define port_alert _port_alert
+#define port_associate _port_associate
+#define port_create _port_create
+#define port_dispatch _port_dispatch
+#define port_dissociate _port_dissociate
+#define port_getn _port_getn
+#define port_get _port_get
+#define port_sendn _port_sendn
+#define port_send _port_send
+#define posix_openpt _posix_openpt
+#define posix_spawnattr_destroy _posix_spawnattr_destroy
+#define posix_spawnattr_getflags _posix_spawnattr_getflags
+#define posix_spawnattr_getpgroup _posix_spawnattr_getpgroup
+#define posix_spawnattr_getschedparam _posix_spawnattr_getschedparam
+#define posix_spawnattr_getschedpolicy _posix_spawnattr_getschedpolicy
+#define posix_spawnattr_getsigdefault _posix_spawnattr_getsigdefault
+#define posix_spawnattr_getsigmask _posix_spawnattr_getsigmask
+#define posix_spawnattr_init _posix_spawnattr_init
+#define posix_spawnattr_setflags _posix_spawnattr_setflags
+#define posix_spawnattr_setpgroup _posix_spawnattr_setpgroup
+#define posix_spawnattr_setschedparam _posix_spawnattr_setschedparam
+#define posix_spawnattr_setschedpolicy _posix_spawnattr_setschedpolicy
+#define posix_spawnattr_setsigdefault _posix_spawnattr_setsigdefault
+#define posix_spawnattr_setsigmask _posix_spawnattr_setsigmask
+#define posix_spawn_file_actions_addclose _posix_spawn_file_actions_addclose
+#define posix_spawn_file_actions_adddup2 _posix_spawn_file_actions_adddup2
+#define posix_spawn_file_actions_addopen _posix_spawn_file_actions_addopen
+#define posix_spawn_file_actions_destroy _posix_spawn_file_actions_destroy
+#define posix_spawn_file_actions_init _posix_spawn_file_actions_init
+#define posix_spawn _posix_spawn
+#define posix_spawnp _posix_spawnp
+#define pread _pread
+#define printstack _printstack
+#define priv_addset _priv_addset
+#define priv_allocset _priv_allocset
+#define priv_copyset _priv_copyset
+#define priv_delset _priv_delset
+#define priv_emptyset _priv_emptyset
+#define priv_fillset _priv_fillset
+#define priv_freeset _priv_freeset
+#define priv_getbyname _priv_getbyname
+#define priv_getbynum _priv_getbynum
+#define priv_getsetbyname _priv_getsetbyname
+#define priv_getsetbynum _priv_getsetbynum
+#define priv_gettext _priv_gettext
+#define priv_ineffect _priv_ineffect
+#define priv_intersect _priv_intersect
+#define priv_inverse _priv_inverse
+#define priv_isemptyset _priv_isemptyset
+#define priv_isequalset _priv_isequalset
+#define priv_isfullset _priv_isfullset
+#define priv_ismember _priv_ismember
+#define priv_issubset _priv_issubset
+#define priv_set _priv_set
+#define priv_set_to_str _priv_set_to_str
+#define priv_str_to_set _priv_str_to_set
+#define priv_union _priv_union
+#define profil _profil
+#define pselect _pselect
+#define pset_assign _pset_assign
+#define pset_bind _pset_bind
+#define pset_create _pset_create
+#define pset_destroy _pset_destroy
+#define pset_getattr _pset_getattr
+#define pset_getloadavg _pset_getloadavg
+#define pset_info _pset_info
+#define pset_list _pset_list
+#define pset_setattr _pset_setattr
+#define psiginfo _psiginfo
+#define psignal _psignal
+#define pthread_atfork _pthread_atfork
+#define pthread_attr_destroy _pthread_attr_destroy
+#define pthread_attr_getdetachstate _pthread_attr_getdetachstate
+#define pthread_attr_getguardsize _pthread_attr_getguardsize
+#define pthread_attr_getinheritsched _pthread_attr_getinheritsched
+#define pthread_attr_getschedparam _pthread_attr_getschedparam
+#define pthread_attr_getschedpolicy _pthread_attr_getschedpolicy
+#define pthread_attr_getscope _pthread_attr_getscope
+#define pthread_attr_getstackaddr _pthread_attr_getstackaddr
+#define pthread_attr_getstack _pthread_attr_getstack
+#define pthread_attr_getstacksize _pthread_attr_getstacksize
+#define pthread_attr_init _pthread_attr_init
+#define pthread_attr_setdetachstate _pthread_attr_setdetachstate
+#define pthread_attr_setguardsize _pthread_attr_setguardsize
+#define pthread_attr_setinheritsched _pthread_attr_setinheritsched
+#define pthread_attr_setschedparam _pthread_attr_setschedparam
+#define pthread_attr_setschedpolicy _pthread_attr_setschedpolicy
+#define pthread_attr_setscope _pthread_attr_setscope
+#define pthread_attr_setstackaddr _pthread_attr_setstackaddr
+#define pthread_attr_setstack _pthread_attr_setstack
+#define pthread_attr_setstacksize _pthread_attr_setstacksize
+#define pthread_barrierattr_destroy _pthread_barrierattr_destroy
+#define pthread_barrierattr_getpshared _pthread_barrierattr_getpshared
+#define pthread_barrierattr_init _pthread_barrierattr_init
+#define pthread_barrierattr_setpshared _pthread_barrierattr_setpshared
+#define pthread_barrier_destroy _pthread_barrier_destroy
+#define pthread_barrier_init _pthread_barrier_init
+#define pthread_barrier_wait _pthread_barrier_wait
+#define pthread_cancel _pthread_cancel
+#define pthread_condattr_destroy _pthread_condattr_destroy
+#define pthread_condattr_getclock _pthread_condattr_getclock
+#define pthread_condattr_getpshared _pthread_condattr_getpshared
+#define pthread_condattr_init _pthread_condattr_init
+#define pthread_condattr_setclock _pthread_condattr_setclock
+#define pthread_condattr_setpshared _pthread_condattr_setpshared
+#define pthread_cond_broadcast _pthread_cond_broadcast
+#define pthread_cond_destroy _pthread_cond_destroy
+#define pthread_cond_init _pthread_cond_init
+#define pthread_cond_reltimedwait_np _pthread_cond_reltimedwait_np
+#define pthread_cond_signal _pthread_cond_signal
+#define pthread_cond_timedwait _pthread_cond_timedwait
+#define pthread_cond_wait _pthread_cond_wait
+#define pthread_create _pthread_create
+#define pthread_detach _pthread_detach
+#define pthread_equal _pthread_equal
+#define pthread_exit _pthread_exit
+#define pthread_getconcurrency _pthread_getconcurrency
+#define pthread_getschedparam _pthread_getschedparam
+#define pthread_getspecific _pthread_getspecific
+#define pthread_join _pthread_join
+#define pthread_key_create _pthread_key_create
+#define pthread_key_delete _pthread_key_delete
+#define pthread_kill _pthread_kill
+#define pthread_mutexattr_destroy _pthread_mutexattr_destroy
+#define pthread_mutexattr_getprioceiling _pthread_mutexattr_getprioceiling
+#define pthread_mutexattr_getprotocol _pthread_mutexattr_getprotocol
+#define pthread_mutexattr_getpshared _pthread_mutexattr_getpshared
+#define pthread_mutexattr_getrobust_np _pthread_mutexattr_getrobust_np
+#define pthread_mutexattr_gettype _pthread_mutexattr_gettype
+#define pthread_mutexattr_init _pthread_mutexattr_init
+#define pthread_mutexattr_setprioceiling _pthread_mutexattr_setprioceiling
+#define pthread_mutexattr_setprotocol _pthread_mutexattr_setprotocol
+#define pthread_mutexattr_setpshared _pthread_mutexattr_setpshared
+#define pthread_mutexattr_setrobust_np _pthread_mutexattr_setrobust_np
+#define pthread_mutexattr_settype _pthread_mutexattr_settype
+#define pthread_mutex_consistent_np _pthread_mutex_consistent_np
+#define pthread_mutex_destroy _pthread_mutex_destroy
+#define pthread_mutex_getprioceiling _pthread_mutex_getprioceiling
+#define pthread_mutex_init _pthread_mutex_init
+#define pthread_mutex_lock _pthread_mutex_lock
+#define pthread_mutex_reltimedlock_np _pthread_mutex_reltimedlock_np
+#define pthread_mutex_setprioceiling _pthread_mutex_setprioceiling
+#define pthread_mutex_timedlock _pthread_mutex_timedlock
+#define pthread_mutex_trylock _pthread_mutex_trylock
+#define pthread_mutex_unlock _pthread_mutex_unlock
+#define pthread_once _pthread_once
+#define pthread_rwlockattr_destroy _pthread_rwlockattr_destroy
+#define pthread_rwlockattr_getpshared _pthread_rwlockattr_getpshared
+#define pthread_rwlockattr_init _pthread_rwlockattr_init
+#define pthread_rwlockattr_setpshared _pthread_rwlockattr_setpshared
+#define pthread_rwlock_destroy _pthread_rwlock_destroy
+#define pthread_rwlock_init _pthread_rwlock_init
+#define pthread_rwlock_rdlock _pthread_rwlock_rdlock
+#define pthread_rwlock_reltimedrdlock_np _pthread_rwlock_reltimedrdlock_np
+#define pthread_rwlock_reltimedwrlock_np _pthread_rwlock_reltimedwrlock_np
+#define pthread_rwlock_timedrdlock _pthread_rwlock_timedrdlock
+#define pthread_rwlock_timedwrlock _pthread_rwlock_timedwrlock
+#define pthread_rwlock_tryrdlock _pthread_rwlock_tryrdlock
+#define pthread_rwlock_trywrlock _pthread_rwlock_trywrlock
+#define pthread_rwlock_unlock _pthread_rwlock_unlock
+#define pthread_rwlock_wrlock _pthread_rwlock_wrlock
+#define pthread_self _pthread_self
+#define pthread_setcancelstate _pthread_setcancelstate
+#define pthread_setcanceltype _pthread_setcanceltype
+#define pthread_setconcurrency _pthread_setconcurrency
+#define pthread_setschedparam _pthread_setschedparam
+#define pthread_setschedprio _pthread_setschedprio
+#define pthread_setspecific _pthread_setspecific
+#define pthread_sigmask _pthread_sigmask
+#define pthread_spin_destroy _pthread_spin_destroy
+#define pthread_spin_init _pthread_spin_init
+#define pthread_spin_lock _pthread_spin_lock
+#define pthread_spin_trylock _pthread_spin_trylock
+#define pthread_spin_unlock _pthread_spin_unlock
+#define pthread_testcancel _pthread_testcancel
+#define ptrace _ptrace
+#define ptsname _ptsname
+#define putacct _putacct
+#define putenv _putenv
+#define putmsg _putmsg
+#define putpmsg _putpmsg
+#define putpwent _putpwent
+#define putspent _putspent
+#define pututline _pututline
+#define pututxline _pututxline
+#define putw _putw
+#define pwrite _pwrite
+#define qeconvert _qeconvert
+#define qecvt _qecvt
+#define qfconvert _qfconvert
+#define qfcvt _qfcvt
+#define qgconvert _qgconvert
+#define qgcvt _qgcvt
+#define quadruple_to_decimal _quadruple_to_decimal
+#define rand_r _rand_r
+#define rctlctl _rctlctl
+#define rctllist _rctllist
+#define readdir _readdir
+#define readdir_r _readdir_r
+#define readlink _readlink
+#define read _read
+#define readv _readv
+#define realpath _realpath
+#define regcmp _regcmp
+#define regcomp _regcomp
+#define regerror _regerror
+#define regexec _regexec
+#define regex _regex
+#define regfree _regfree
+#define remque _remque
+#define renameat _renameat
+#define resetmnttab _resetmnttab
+#define resolvepath _resolvepath
+#define rmdir _rmdir
#define rwlock_destroy _rwlock_destroy
+#define rwlock_init _rwlock_init
#define rw_rdlock _rw_rdlock
-#define rw_wrlock _rw_wrlock
+#define rw_read_held _rw_read_held
#define rw_tryrdlock _rw_tryrdlock
#define rw_trywrlock _rw_trywrlock
#define rw_unlock _rw_unlock
-#define thr_main _thr_main
-#define thr_self _thr_self
+#define rw_write_held _rw_write_held
+#define rw_wrlock _rw_wrlock
+#define sbrk _sbrk
+#define scandir _scandir
+#define schedctl_exit _schedctl_exit
+#define schedctl_init _schedctl_init
+#define schedctl_lookup _schedctl_lookup
+#define scrwidth _scrwidth
+#define seconvert _seconvert
+#define seed48 _seed48
+#define seekdir _seekdir
+#define select _select
+#define sema_destroy _sema_destroy
+#define sema_held _sema_held
+#define sema_init _sema_init
+#define sema_post _sema_post
+#define sema_reltimedwait _sema_reltimedwait
+#define sema_timedwait _sema_timedwait
+#define sema_trywait _sema_trywait
+#define sema_wait _sema_wait
+#define semctl64 _semctl64
+#define semctl _semctl
+#define semget _semget
+#define semids _semids
+#define semop _semop
+#define semtimedop _semtimedop
+#define setcontext _setcontext
+#define setegid _setegid
+#define setenv _setenv
+#define seteuid _seteuid
+#define setgid _setgid
+#define setgrent _setgrent
+#define setgroups _setgroups
+#define setitimer _setitimer
+#define setjmp _setjmp
+#define setkey _setkey
+#define setlocale _setlocale
+#define setlogmask _setlogmask
+#define setpflags _setpflags
+#define setpgid _setpgid
+#define setpgrp _setpgrp
+#define setppriv _setppriv
+#define setpwent _setpwent
+#define setrctl _setrctl
+#define setregid _setregid
+#define setreuid _setreuid
+#define setrlimit _setrlimit
+#define setsid _setsid
+#define setspent _setspent
+#define settaskid _settaskid
+#define settimeofday _settimeofday
+#define setuid _setuid
+#define setustack _setustack
+#define setutent _setutent
+#define setutxent _setutxent
+#define s_fcntl _s_fcntl
+#define sfconvert _sfconvert
+#define sgconvert _sgconvert
+#define shmat _shmat
+#define shmctl64 _shmctl64
+#define shmctl _shmctl
+#define shmdt _shmdt
+#define shmget _shmget
+#define shmids _shmids
+#define sig2str _sig2str
+#define sigaction _sigaction
+#define sigaddset _sigaddset
+#define sigaltstack _sigaltstack
+#define sigdelset _sigdelset
+#define sigemptyset _sigemptyset
+#define sigfillset _sigfillset
+#define sigflag _sigflag
+#define sigfpe _sigfpe
+#define sighold _sighold
+#define sigignore _sigignore
+#define siginterrupt _siginterrupt
+#define sigismember _sigismember
+#define siglongjmp _siglongjmp
+#define signal _signal
+#define sigpause _sigpause
+#define sigpending _sigpending
+#define sigprocmask _sigprocmask
+#define sigrelse _sigrelse
+#define sigsendset _sigsendset
+#define sigsend _sigsend
+#define sigsetjmp _sigsetjmp
+#define sigset _sigset
+#define sigsuspend _sigsuspend
+#define sigwait _sigwait
+#define single_to_decimal _single_to_decimal
+#define s_ioctl _s_ioctl
+#define sleep _sleep
+#define srand48 _srand48
+#define ssignal _ssignal
+#define stack_getbounds _stack_getbounds
+#define stack_inbounds _stack_inbounds
+#define stack_setbounds _stack_setbounds
+#define stack_violation _stack_violation
+#define statfs _statfs
+#define stat _stat
+#define statvfs _statvfs
+#define stime _stime
+#define str2sig _str2sig
+#define strcoll _strcoll
+#define strdup _strdup
+#define strerror_r _strerror_r
+#define strerror _strerror
+#define string_to_decimal _string_to_decimal
+#define strtok_r _strtok_r
+#define strtoll _strtoll
+#define strtoull _strtoull
+#define strxfrm _strxfrm
+#define stty _stty
+#define swab _swab
+#define swapcontext _swapcontext
+#define swapctl _swapctl
+#define symlink _symlink
+#define synchutmp _synchutmp
+#define sync _sync
+#define _syscall _syscall6
+#define syscall _syscall6
+#define sysconf _sysconf
+#define sys_errlist _sys_errlist
+#define sysfs _sysfs
+#define sysinfo _sysinfo
+#define syslog _syslog
+#define sys_nerr _sys_nerr
+#define syssun _syssun
+#define __systemcall __systemcall6
+#define tcdrain _tcdrain
+#define tcflow _tcflow
+#define tcflush _tcflush
+#define tcgetattr _tcgetattr
+#define tcgetpgrp _tcgetpgrp
+#define tcgetsid _tcgetsid
+#define tcsendbreak _tcsendbreak
+#define tcsetattr _tcsetattr
+#define tcsetpgrp _tcsetpgrp
+#define tdelete _tdelete
+#define telldir _telldir
+#define tell _tell
+#define tempnam _tempnam
+#define textdomain _textdomain
+#define tfind _tfind
+#define thr_continue_allmutators _thr_continue_allmutators
+#define thr_continue_mutator _thr_continue_mutator
+#define thr_continue _thr_continue
+#define thr_create _thr_create
#define thr_exit _thr_exit
-#define thr_min_stack _thr_min_stack
-#define thr_kill _thr_kill
+#define thr_getconcurrency _thr_getconcurrency
+#define thr_getprio _thr_getprio
+#define thr_getspecific _thr_getspecific
+#define thr_getstate _thr_getstate
+#define thr_join _thr_join
#define thr_keycreate _thr_keycreate
+#define thr_kill _thr_kill
+#define thr_main _thr_main
+#define thr_min_stack _thr_min_stack
+#define thr_mutators_barrier _thr_mutators_barrier
+#define thr_self _thr_self
+#define thr_setconcurrency _thr_setconcurrency
+#define thr_setmutator _thr_setmutator
+#define thr_setprio _thr_setprio
#define thr_setspecific _thr_setspecific
-#define thr_getspecific _thr_getspecific
-
-/* new POSIX SUSV3 stuff */
-#define posix_spawn _posix_spawn
-#define posix_spawnp _posix_spawnp
-#define posix_spawn_file_actions_init _posix_spawn_file_actions_init
-#define posix_spawn_file_actions_destroy \
- _posix_spawn_file_actions_destroy
-#define posix_spawn_file_actions_addopen \
- _posix_spawn_file_actions_addopen
-#define posix_spawn_file_actions_addclose \
- _posix_spawn_file_actions_addclose
-#define posix_spawn_file_actions_adddup2 \
- _posix_spawn_file_actions_adddup2
-#define posix_spawnattr_init _posix_spawnattr_init
-#define posix_spawnattr_destroy _posix_spawnattr_destroy
-#define posix_spawnattr_setflags _posix_spawnattr_setflags
-#define posix_spawnattr_getflags _posix_spawnattr_getflags
-#define posix_spawnattr_setpgroup _posix_spawnattr_setpgroup
-#define posix_spawnattr_getpgroup _posix_spawnattr_getpgroup
-#define posix_spawnattr_setschedparam _posix_spawnattr_setschedparam
-#define posix_spawnattr_getschedparam _posix_spawnattr_getschedparam
-#define posix_spawnattr_setschedpolicy _posix_spawnattr_setschedpolicy
-#define posix_spawnattr_getschedpolicy _posix_spawnattr_getschedpolicy
-#define posix_spawnattr_setsigdefault _posix_spawnattr_setsigdefault
-#define posix_spawnattr_getsigdefault _posix_spawnattr_getsigdefault
-#define posix_spawnattr_setsigmask _posix_spawnattr_setsigmask
-#define posix_spawnattr_getsigmask _posix_spawnattr_getsigmask
+#define thr_setstate _thr_setstate
+#define thr_sighndlrinfo _thr_sighndlrinfo
+#define thr_sigsetmask _thr_sigsetmask
+#define thr_stksegment _thr_stksegment
+#define thr_suspend_allmutators _thr_suspend_allmutators
+#define thr_suspend_mutator _thr_suspend_mutator
+#define thr_suspend _thr_suspend
+#define thr_wait_mutator _thr_wait_mutator
+#define thr_yield _thr_yield
+#define times _times
+#define time _time
+#define tmpnam_r _tmpnam_r
+#define tmpnam _tmpnam
+#define towlower _towlower
+#define towupper _towupper
+#define truncate _truncate
+#define tsearch _tsearch
+#define ttyname_r _ttyname_r
+#define ttyname _ttyname
+#define ttyslot _ttyslot
+#define twalk _twalk
+#define tzset _tzset
+#define uadmin _uadmin
+#define ucred_free _ucred_free
+#define ucred_getamask _ucred_getamask
+#define ucred_getasid _ucred_getasid
+#define ucred_getatid _ucred_getatid
+#define ucred_getauid _ucred_getauid
+#define ucred_getegid _ucred_getegid
+#define ucred_geteuid _ucred_geteuid
+#define ucred_getgroups _ucred_getgroups
+#define ucred_getpflags _ucred_getpflags
+#define ucred_getpid _ucred_getpid
+#define ucred_getprivset _ucred_getprivset
+#define ucred_getprojid _ucred_getprojid
+#define ucred_getrgid _ucred_getrgid
+#define ucred_getruid _ucred_getruid
+#define ucred_getsgid _ucred_getsgid
+#define ucred_getsuid _ucred_getsuid
+#define ucred_get _ucred_get
+#define ucred_getzoneid _ucred_getzoneid
+#define ucred_size _ucred_size
+#define ulckpwdf _ulckpwdf
+#define ulimit _ulimit
+#define ulltostr _ulltostr
+#define umask _umask
+#define umount2 _umount2
+#define umount _umount
+#define uname _uname
+#define unlinkat _unlinkat
+#define unlink _unlink
+#define unlockpt _unlockpt
+#define unordered _unordered
+#define unsetenv _unsetenv
+#define updutfile _updutfile
+#define updutmp _updutmp
+#define updutmpx _updutmpx
+#define updutxfile _updutxfile
+#define updwtmp _updwtmp
+#define updwtmpx _updwtmpx
+#define usleep _usleep
+#define ustat _ustat
+#define utimes _utimes
+#define utime _utime
+#define utmpname _utmpname
+#define utmpxname _utmpxname
+#define utssys _utssys
+#define valloc _valloc
+#define vfork _vfork
+#define vfscanf _vfscanf
+#define vhangup _vhangup
+#define vscanf _vscanf
+#define vsscanf _vsscanf
+#define vsyslog _vsyslog
+#define wait3 _wait3
+#define waitid _waitid
+#define waitpid _waitpid
+#define wait _wait
+#define walkcontext _walkcontext
+#define wcscat _wcscat
+#define wcschr _wcschr
+#define wcscmp _wcscmp
+#define wcscoll _wcscoll
+#define wcscpy _wcscpy
+#define wcscspn _wcscspn
+#define wcsftime _wcsftime
+#define wcslen _wcslen
+#define wcsncat _wcsncat
+#define wcsncmp _wcsncmp
+#define wcsncpy _wcsncpy
+#define wcspbrk _wcspbrk
+#define wcsrchr _wcsrchr
+#define wcstod _wcstod
+#define wcstol _wcstol
+#define wcstombs _wcstombs
+#define wcstoul _wcstoul
+#define wcswcs _wcswcs
+#define wcswidth _wcswidth
+#define wcsxfrm _wcsxfrm
+#define wctomb _wctomb
+#define wctype __wctype
+#define wcwidth _wcwidth
+#define wracct _wracct
+#define writev _writev
+#define write _write
+#define wscasecmp _wscasecmp
+#define wscat _wscat
+#define wschr _wschr
+#define wscmp _wscmp
+#define wscoll _wscoll
+#define wscpy _wscpy
+#define wscspn _wscspn
+#define wslen _wslen
+#define wsncasecmp _wsncasecmp
+#define wsncat _wsncat
+#define wsncmp _wsncmp
+#define wsncpy _wsncpy
+#define wspbrk _wspbrk
+#define wsrchr _wsrchr
+#define wstod _wstod
+#define wstok _wstok
+#define wstoll _wstoll
+#define wstol _wstol
+#define wsxfrm _wsxfrm
+#define yield _yield
/* unwind stuff (amd64 only) */
#if defined(__amd64)
@@ -922,7 +1145,7 @@ extern "C" {
#define _Unwind_Resume _SUNW_Unwind_Resume
#define _Unwind_SetGR _SUNW_Unwind_SetGR
#define _Unwind_SetIP _SUNW_Unwind_SetIP
-#endif /* __amd64 */
+#endif /* __amd64 */
#endif /* !defined(__lint) */
diff --git a/usr/src/lib/libc/port/gen/atexit.c b/usr/src/lib/libc/port/gen/atexit.c
index 8d1ebcef79..2104eefea3 100644
--- a/usr/src/lib/libc/port/gen/atexit.c
+++ b/usr/src/lib/libc/port/gen/atexit.c
@@ -19,8 +19,9 @@
*
* 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,8 +30,9 @@
/* Copyright (c) 1988 AT&T */
/* All Rights Reserved */
+#pragma weak atexit = _atexit
-#include "lint.h"
+#include "synonyms.h"
#include "thr_uberdata.h"
#include "libc_int.h"
#include "atexit.h"
@@ -94,7 +96,6 @@ atexit_unlocks()
* atexit() is called before the primordial thread is fully set up.
* Be careful about dereferencing self->ul_uberdata->atexit_root.
*/
-#pragma weak atexit = _atexit
int
_atexit(void (*func)(void))
{
diff --git a/usr/src/lib/libc/port/gen/directio.c b/usr/src/lib/libc/port/gen/directio.c
index a682734f17..3a76c7bb9d 100644
--- a/usr/src/lib/libc/port/gen/directio.c
+++ b/usr/src/lib/libc/port/gen/directio.c
@@ -19,14 +19,15 @@
*
* 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"
-#include "lint.h"
+#include "synonyms.h"
#include <sys/types.h>
#include <unistd.h>
#include <sys/filio.h>
diff --git a/usr/src/lib/libc/port/gen/getauxv.c b/usr/src/lib/libc/port/gen/getauxv.c
index 4e7af946c6..c32fefdfb6 100644
--- a/usr/src/lib/libc/port/gen/getauxv.c
+++ b/usr/src/lib/libc/port/gen/getauxv.c
@@ -19,14 +19,15 @@
*
* 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"
-#include "lint.h"
+#include "synonyms.h"
#include <libc.h>
#include <fcntl.h>
#include <stdlib.h>
diff --git a/usr/src/lib/libc/port/gen/gettxt.c b/usr/src/lib/libc/port/gen/gettxt.c
index 398585fbe0..c9b1d386e3 100644
--- a/usr/src/lib/libc/port/gen/gettxt.c
+++ b/usr/src/lib/libc/port/gen/gettxt.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -30,7 +31,6 @@
/* All Rights Reserved */
-#pragma weak Msgdb = _Msgdb
#pragma weak gettxt = _gettxt
#include "synonyms.h"
diff --git a/usr/src/lib/libc/port/gen/imaxabs.c b/usr/src/lib/libc/port/gen/imaxabs.c
index 569b4a190f..6beaca4796 100644
--- a/usr/src/lib/libc/port/gen/imaxabs.c
+++ b/usr/src/lib/libc/port/gen/imaxabs.c
@@ -19,16 +19,15 @@
*
* 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"
-#include <sys/feature_tests.h>
-#include "lint.h"
-#include <inttypes.h>
+#include "synonyms.h"
#include <sys/types.h>
#include <stdlib.h>
diff --git a/usr/src/lib/libc/port/gen/nftw.c b/usr/src/lib/libc/port/gen/nftw.c
index 3b849c08f4..78fdc109a4 100644
--- a/usr/src/lib/libc/port/gen/nftw.c
+++ b/usr/src/lib/libc/port/gen/nftw.c
@@ -19,8 +19,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -111,6 +112,7 @@
#define getcwd _getcwd
#define opendir _opendir
#define seekdir _seekdir
+#define strerror _strerror
#define telldir _telldir
#include "lint.h"
diff --git a/usr/src/lib/libc/port/gen/rctlops.c b/usr/src/lib/libc/port/gen/rctlops.c
index 59eba92212..f8d67e2f4b 100644
--- a/usr/src/lib/libc/port/gen/rctlops.c
+++ b/usr/src/lib/libc/port/gen/rctlops.c
@@ -19,14 +19,15 @@
*
* 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"
-#include "lint.h"
+#include "synonyms.h"
#include <sys/rctl_impl.h>
#include <stdlib.h>
#include <string.h>
diff --git a/usr/src/lib/libc/port/gen/strtoimax.c b/usr/src/lib/libc/port/gen/strtoimax.c
index a8ad96b6a5..35b9d48155 100644
--- a/usr/src/lib/libc/port/gen/strtoimax.c
+++ b/usr/src/lib/libc/port/gen/strtoimax.c
@@ -19,15 +19,15 @@
*
* 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"
-#include <sys/feature_tests.h>
-#include "lint.h"
+#include "synonyms.h"
#include <inttypes.h>
#include <sys/types.h>
#include <stdlib.h>
diff --git a/usr/src/lib/libc/port/gen/strtoumax.c b/usr/src/lib/libc/port/gen/strtoumax.c
index 95a42c7c95..2fb3f144e4 100644
--- a/usr/src/lib/libc/port/gen/strtoumax.c
+++ b/usr/src/lib/libc/port/gen/strtoumax.c
@@ -19,15 +19,15 @@
*
* 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"
-#include <sys/feature_tests.h>
-#include "lint.h"
+#include "synonyms.h"
#include <inttypes.h>
#include <sys/types.h>
#include <stdlib.h>
diff --git a/usr/src/lib/libc/port/i18n/__fputws_xpg5.c b/usr/src/lib/libc/port/i18n/__fputws_xpg5.c
index e2a5a4bca9..8bea02334b 100644
--- a/usr/src/lib/libc/port/i18n/__fputws_xpg5.c
+++ b/usr/src/lib/libc/port/i18n/__fputws_xpg5.c
@@ -19,8 +19,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -44,7 +45,7 @@
* the string in a series of smaller buffers.
*/
-#include "lint.h"
+#include "synonyms.h"
#include "file64.h"
#include "mse_int.h"
#include <stdio.h>
diff --git a/usr/src/lib/libc/port/i18n/gettext_real.c b/usr/src/lib/libc/port/i18n/gettext_real.c
index c820d87167..c40f103be0 100644
--- a/usr/src/lib/libc/port/i18n/gettext_real.c
+++ b/usr/src/lib/libc/port/i18n/gettext_real.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -74,8 +75,8 @@ _real_gettext_u(const char *domain,
size_t cblen, cur_locale_len, cur_domain_len;
unsigned int hash_locale;
- struct msg_pack *mp, omp = { 0 };
- struct cache_pack *cp, ocp = { 0 };
+ struct msg_pack *mp, omp;
+ struct cache_pack *cp, ocp;
#ifdef GETTEXT_DEBUG
(void) printf("*************** _real_gettext_u(%s, %s, "
@@ -87,8 +88,8 @@ _real_gettext_u(const char *domain,
if (msgid1 == NULL)
return (NULL);
- cp = &ocp; /* cache pack */
- mp = &omp; /* msg pack */
+ cp = memset(&ocp, 0, sizeof (ocp)); /* cache pack */
+ mp = memset(&omp, 0, sizeof (omp)); /* msg pack */
/*
* category may be LC_MESSAGES or LC_TIME
diff --git a/usr/src/lib/libc/port/i18n/strtows.c b/usr/src/lib/libc/port/i18n/strtows.c
index c423c31e5d..add9ed0ed7 100644
--- a/usr/src/lib/libc/port/i18n/strtows.c
+++ b/usr/src/lib/libc/port/i18n/strtows.c
@@ -19,14 +19,15 @@
*
* 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"
-#include "lint.h"
+#include "synonyms.h"
#include <limits.h>
#include <widec.h>
#include <errno.h>
diff --git a/usr/src/lib/libc/port/i18n/wcstoimax.c b/usr/src/lib/libc/port/i18n/wcstoimax.c
index c787d012ba..b9ab153303 100644
--- a/usr/src/lib/libc/port/i18n/wcstoimax.c
+++ b/usr/src/lib/libc/port/i18n/wcstoimax.c
@@ -19,15 +19,15 @@
*
* 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"
-#include <sys/feature_tests.h>
-#include "lint.h"
+#include "synonyms.h"
#include <stddef.h>
#include <inttypes.h>
#include <wchar.h>
diff --git a/usr/src/lib/libc/port/i18n/wcstol.c b/usr/src/lib/libc/port/i18n/wcstol.c
index 307bcdc608..d370951353 100644
--- a/usr/src/lib/libc/port/i18n/wcstol.c
+++ b/usr/src/lib/libc/port/i18n/wcstol.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -34,7 +35,7 @@
#pragma weak wcstol = _wcstol
#endif
-#include "lint.h"
+#include "synonyms.h"
#include <limits.h>
#include <errno.h>
#include <wchar.h>
diff --git a/usr/src/lib/libc/port/i18n/wcstoul.c b/usr/src/lib/libc/port/i18n/wcstoul.c
index 96b475d6ce..b67db3fd9a 100644
--- a/usr/src/lib/libc/port/i18n/wcstoul.c
+++ b/usr/src/lib/libc/port/i18n/wcstoul.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -34,7 +35,7 @@
#pragma weak wcstoul = _wcstoul
#endif
-#include "lint.h"
+#include "synonyms.h"
#include <limits.h>
#include <errno.h>
#include <wchar.h>
diff --git a/usr/src/lib/libc/port/i18n/wmemcpy.c b/usr/src/lib/libc/port/i18n/wmemcpy.c
index 3bd296ba4f..1473b8cb8e 100644
--- a/usr/src/lib/libc/port/i18n/wmemcpy.c
+++ b/usr/src/lib/libc/port/i18n/wmemcpy.c
@@ -19,14 +19,15 @@
*
* 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"
-#include "lint.h"
+#include "synonyms.h"
#include <sys/types.h>
#include <wchar.h>
#include <limits.h>
diff --git a/usr/src/lib/libc/port/i18n/wmemmove.c b/usr/src/lib/libc/port/i18n/wmemmove.c
index 62407b88ac..86d016ceeb 100644
--- a/usr/src/lib/libc/port/i18n/wmemmove.c
+++ b/usr/src/lib/libc/port/i18n/wmemmove.c
@@ -19,14 +19,15 @@
*
* 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"
-#include "lint.h"
+#include "synonyms.h"
#include <sys/types.h>
#include <wchar.h>
#include <limits.h>
diff --git a/usr/src/lib/libc/port/i18n/wsprintf.c b/usr/src/lib/libc/port/i18n/wsprintf.c
index 9796242181..dd82d9a475 100644
--- a/usr/src/lib/libc/port/i18n/wsprintf.c
+++ b/usr/src/lib/libc/port/i18n/wsprintf.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -30,7 +31,7 @@
/* All Rights Reserved */
-#include "lint.h"
+#include "synonyms.h"
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
diff --git a/usr/src/lib/libc/port/i18n/wstok.c b/usr/src/lib/libc/port/i18n/wstok.c
index 1bb4b22df9..d0f109aa7c 100644
--- a/usr/src/lib/libc/port/i18n/wstok.c
+++ b/usr/src/lib/libc/port/i18n/wstok.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -41,7 +42,7 @@
#pragma weak wstok = _wstok
-#include "lint.h"
+#include "synonyms.h"
#include "mtlib.h"
#include "mse_int.h"
#include <stdlib.h>
diff --git a/usr/src/lib/libc/port/i18n/wstol.c b/usr/src/lib/libc/port/i18n/wstol.c
index a106247433..78af1651c4 100644
--- a/usr/src/lib/libc/port/i18n/wstol.c
+++ b/usr/src/lib/libc/port/i18n/wstol.c
@@ -19,8 +19,9 @@
*
* 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,7 +33,7 @@
#pragma weak wstol = _wstol
-#include "lint.h"
+#include "synonyms.h"
#include <widec.h>
#include <wchar.h>
diff --git a/usr/src/lib/libc/port/regex/glob.c b/usr/src/lib/libc/port/regex/glob.c
index d411840dea..936c1e78d8 100644
--- a/usr/src/lib/libc/port/regex/glob.c
+++ b/usr/src/lib/libc/port/regex/glob.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -45,7 +46,7 @@
* Written by Eric Gisin.
*/
-#include "lint.h"
+#include "synonyms.h"
#include <stdio.h>
#include <unistd.h>
#include <limits.h>
@@ -61,6 +62,7 @@
#define INITIAL 8 /* initial pathv allocation */
#define NULLCPP ((char **)0) /* Null char ** */
+#define NAME_MAX 1024 /* something large */
static int globit(size_t, const char *, glob_t *, int,
int (*)(const char *, int), char **);
@@ -164,12 +166,8 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags,
struct stat64 sb;
DIR *dirp;
struct dirent64 *d;
- struct dirent64 *entry = NULL;
- int namemax;
int err;
-#define FREE_ENTRY if (entry) free(entry)
-
for (;;)
switch (*dp++ = *(unsigned char *)sp++) {
case '\0': /* end of source path */
@@ -179,7 +177,6 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags,
if (!(flags & GLOB_NOCHECK) ||
flags & (GLOB__CHECK|GLOB_MARK))
if (stat64(*path, &sb) < 0) {
- FREE_ENTRY;
return (0);
}
if (flags & GLOB_MARK && S_ISDIR(sb.st_mode)) {
@@ -187,7 +184,6 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags,
*--dp = '/';
}
if (append(gp, *path) < 0) {
- FREE_ENTRY;
return (GLOB_NOSPACE);
}
return (0);
@@ -211,25 +207,12 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags,
Expand:
/* determine directory and open it */
(*path)[end] = '\0';
-#ifdef NAME_MAX
- namemax = NAME_MAX;
-#else
- namemax = 1024; /* something large */
-#endif
- if ((entry = (struct dirent64 *)malloc(
- sizeof (struct dirent64) + namemax + 1))
- == NULL) {
- return (GLOB_NOSPACE);
- }
-
dirp = opendir(**path == '\0' ? "." : *path);
- if (dirp == (DIR *)0 || namemax == -1) {
+ if (dirp == NULL) {
if (errfn != 0 && errfn(*path, errno) != 0 ||
flags&GLOB_ERR) {
- FREE_ENTRY;
return (GLOB_ABORTED);
}
- FREE_ENTRY;
return (0);
}
@@ -237,7 +220,6 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags,
n = sp - pat;
if ((cp = malloc(n)) == NULL) {
(void) closedir(dirp);
- FREE_ENTRY;
return (GLOB_NOSPACE);
}
pat = memcpy(cp, pat, n);
@@ -248,20 +230,17 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags,
/* expand path to max. expansion */
n = dp - *path;
*path = realloc(*path,
- strlen(*path)+namemax+strlen(sp)+1);
+ strlen(*path) + NAME_MAX + strlen(sp) + 1);
if (*path == NULL) {
(void) closedir(dirp);
free(pat);
- FREE_ENTRY;
return (GLOB_NOSPACE);
}
dp = (*path) + n;
/* read directory and match entries */
err = 0;
- while (readdir64_r(dirp, entry, &d) == 0) {
- if (d == NULL)
- break;
+ while ((d = readdir64(dirp)) != NULL) {
cp = d->d_name;
if ((flags&GLOB_NOESCAPE)
? fnmatch(pat, cp, FNM_PERIOD|FNM_NOESCAPE)
@@ -279,7 +258,6 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags,
(void) closedir(dirp);
free(pat);
- FREE_ENTRY;
return (err);
}
/* NOTREACHED */
diff --git a/usr/src/lib/libc/port/regex/regex.c b/usr/src/lib/libc/port/regex/regex.c
index b763a915b0..369e2b813f 100644
--- a/usr/src/lib/libc/port/regex/regex.c
+++ b/usr/src/lib/libc/port/regex/regex.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -42,7 +43,7 @@
/* CONSTANTS SHARED WITH regcmp() */
#include "regex.h"
-#include "lint.h"
+#include "synonyms.h"
#include "mtlib.h"
#include <limits.h>
#include <stdarg.h>
diff --git a/usr/src/lib/libc/port/stdio/fdopen.c b/usr/src/lib/libc/port/stdio/fdopen.c
index 38ed3af860..c0908f5f89 100644
--- a/usr/src/lib/libc/port/stdio/fdopen.c
+++ b/usr/src/lib/libc/port/stdio/fdopen.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -40,14 +41,7 @@
#pragma weak fdopen = _fdopen
-#include <sys/feature_tests.h>
-
-#define fdopen _fdopen
-#if !defined(_LP64)
-#define lseek64 _lseek64
-#endif
-
-#include "lint.h"
+#include "synonyms.h"
#include <mtlib.h>
#include "file64.h"
#include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/fopen.c b/usr/src/lib/libc/port/stdio/fopen.c
index 24ad5f0966..4881cef27d 100644
--- a/usr/src/lib/libc/port/stdio/fopen.c
+++ b/usr/src/lib/libc/port/stdio/fopen.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -39,7 +40,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-#include "lint.h"
+#include "synonyms.h"
#include "file64.h"
#include <sys/types.h>
#include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/fpos.c b/usr/src/lib/libc/port/stdio/fpos.c
index 44e92cac70..d2395fc801 100644
--- a/usr/src/lib/libc/port/stdio/fpos.c
+++ b/usr/src/lib/libc/port/stdio/fpos.c
@@ -19,8 +19,9 @@
*
* 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.
*/
@@ -30,7 +31,7 @@
/* All Rights Reserved */
-#include "lint.h"
+#include "synonyms.h"
#include <sys/types.h>
#include <unistd.h>
#include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/system.c b/usr/src/lib/libc/port/stdio/system.c
index 45e11aeeac..b641e6592e 100644
--- a/usr/src/lib/libc/port/stdio/system.c
+++ b/usr/src/lib/libc/port/stdio/system.c
@@ -19,8 +19,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -32,14 +33,6 @@
#include "synonyms.h"
#include "mtlib.h"
-
-/*
- * system() is a cancellation point.
- * Undefine waitpid so we call the real waitpid() rather than _waitpid().
- * This ensures that we actually perform the cancellation logic.
- */
-#undef waitpid
-
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
@@ -52,6 +45,7 @@
#include <errno.h>
#include <synch.h>
#include <spawn.h>
+#include "libc.h"
extern const char **environ;
@@ -221,9 +215,14 @@ system(const char *cmd)
errno = error;
status = -1;
} else {
+ /*
+ * system() is a cancellation point.
+ * Call waitpid_cancel() rather than _waitpid() to make
+ * sure that we actually perform the cancellation logic.
+ */
pthread_cleanup_push(cleanup, &savemask);
do {
- w = waitpid(pid, &status, 0);
+ w = waitpid_cancel(pid, &status, 0);
} while (w == -1 && errno == EINTR);
pthread_cleanup_pop(0);
if (w == -1)
diff --git a/usr/src/lib/libc/port/sys/sigstack.c b/usr/src/lib/libc/port/sys/sigstack.c
index 9b147051b0..cf4335f2a2 100644
--- a/usr/src/lib/libc/port/sys/sigstack.c
+++ b/usr/src/lib/libc/port/sys/sigstack.c
@@ -19,8 +19,9 @@
*
* 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,16 +30,14 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-#pragma weak sigstack = _sigstack
-
-#include "lint.h"
+#include "synonyms.h"
#include <sys/types.h>
#include <sys/ucontext.h>
#include <signal.h>
#include <errno.h>
int
-_sigstack(struct sigstack *nss, struct sigstack *oss)
+sigstack(struct sigstack *nss, struct sigstack *oss)
{
struct sigaltstack nalt;
struct sigaltstack oalt;
diff --git a/usr/src/lib/libc/port/threads/scalls.c b/usr/src/lib/libc/port/threads/scalls.c
index 660c29f9b3..0e0b3c78e4 100644
--- a/usr/src/lib/libc/port/threads/scalls.c
+++ b/usr/src/lib/libc/port/threads/scalls.c
@@ -21,7 +21,7 @@
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -891,6 +891,11 @@ waitid(idtype_t idtype, id_t id, siginfo_t *infop, int options)
PERFORM(_waitid(idtype, id, infop, options))
}
+/*
+ * waitpid_cancel() is a libc-private symbol for internal use
+ * where cancellation semantics is desired (see system()).
+ */
+#pragma weak waitpid_cancel = waitpid
pid_t
waitpid(pid_t pid, int *stat_loc, int options)
{
diff --git a/usr/src/lib/libc/port/threads/synch.c b/usr/src/lib/libc/port/threads/synch.c
index 21ecb0a2b7..296096dc22 100644
--- a/usr/src/lib/libc/port/threads/synch.c
+++ b/usr/src/lib/libc/port/threads/synch.c
@@ -19,8 +19,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -3145,6 +3146,9 @@ record_spin_locks(ulwp_t *ulwp)
/*
* atexit function: dump the queue statistics to stderr.
*/
+#if !defined(__lint)
+#define fprintf _fprintf
+#endif
#include <stdio.h>
void
dump_queue_statistics(void)
diff --git a/usr/src/lib/libc/port/unwind/unwind.c b/usr/src/lib/libc/port/unwind/unwind.c
index e7151c0c40..9e31d656c1 100644
--- a/usr/src/lib/libc/port/unwind/unwind.c
+++ b/usr/src/lib/libc/port/unwind/unwind.c
@@ -19,14 +19,15 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2005 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"
-#include "lint.h"
+#include "synonyms.h"
#include "thr_uberdata.h"
#include <dlfcn.h>
diff --git a/usr/src/lib/libc/req.flg b/usr/src/lib/libc/req.flg
index 9fad6cfb0e..c35743d94a 100644
--- a/usr/src/lib/libc/req.flg
+++ b/usr/src/lib/libc/req.flg
@@ -21,10 +21,11 @@
# CDDL HEADER END
#
#
-# Copyright 2005 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"
find_files "s.*" usr/src/common/atomic
find_files "s.*" usr/src/common/util
+find_files "s.*" usr/src/lib/common
diff --git a/usr/src/lib/libc/sparc/gen/abs.s b/usr/src/lib/libc/sparc/gen/abs.s
index 6a555d8dca..920daaab83 100644
--- a/usr/src/lib/libc/sparc/gen/abs.s
+++ b/usr/src/lib/libc/sparc/gen/abs.s
@@ -19,8 +19,10 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright (c) 1987 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
.ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5 */
@@ -31,15 +33,24 @@
/*
* int abs(register int arg);
- * long labs(register long int arg);
*/
- ENTRY2(abs,labs)
+ ENTRY(abs)
tst %o0
bl,a 1f
neg %o0
1:
retl
nop
-
SET_SIZE(abs)
+
+/*
+ * long labs(register long int arg);
+ */
+ ENTRY(labs)
+ tst %o0
+ bl,a 1f
+ neg %o0
+1:
+ retl
+ nop
SET_SIZE(labs)
diff --git a/usr/src/lib/libc/sparc/gen/siglongjmp.c b/usr/src/lib/libc/sparc/gen/siglongjmp.c
index 3b90f52164..5efc2e28a2 100644
--- a/usr/src/lib/libc/sparc/gen/siglongjmp.c
+++ b/usr/src/lib/libc/sparc/gen/siglongjmp.c
@@ -19,8 +19,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -32,7 +33,7 @@
#pragma weak siglongjmp = _siglongjmp
-#include "lint.h"
+#include "synonyms.h"
#include <sys/types.h>
#include <sys/stack.h>
#include <sys/frame.h>
@@ -43,7 +44,7 @@
#include "libc.h"
void
-_siglongjmp(sigjmp_buf env, int val)
+siglongjmp(sigjmp_buf env, int val)
{
extern void _fetch_globals(greg_t *);
ucontext_t uc;
diff --git a/usr/src/lib/libc/sparcv9/Makefile b/usr/src/lib/libc/sparcv9/Makefile
index 13129556e5..6e051be401 100644
--- a/usr/src/lib/libc/sparcv9/Makefile
+++ b/usr/src/lib/libc/sparcv9/Makefile
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
#
-# Copyright 2005 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"
@@ -128,7 +128,6 @@ GENOBJS= \
ecvt.o \
getctxt.o \
lexp10.o \
- llabs.o \
llog10.o \
lock.o \
makectxt.o \
diff --git a/usr/src/lib/libc/sparcv9/gen/abs.s b/usr/src/lib/libc/sparcv9/gen/abs.s
index 1da656130f..9e483e2ca2 100644
--- a/usr/src/lib/libc/sparcv9/gen/abs.s
+++ b/usr/src/lib/libc/sparcv9/gen/abs.s
@@ -19,8 +19,10 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright (c) 1997 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
.ident "%Z%%M% %I% %E% SMI"
@@ -29,15 +31,40 @@
#include <sys/asm_linkage.h>
+ ANSI_PRAGMA_WEAK(llabs,function)
+
+#include "synonyms.h"
+
/*
- * int abs(register int arg);
+ * int abs(int arg);
*/
ENTRY(abs)
cmp %o0, 0
- bneg,a %icc, .done
+ bneg,a %icc, 1f
neg %o0
-.done:
+1:
retl
nop
-
SET_SIZE(abs)
+
+/*
+ * long labs(long arg);
+ */
+ ENTRY(labs)
+ brlz,a %o0, 1f
+ neg %o0
+1:
+ retl
+ nop
+ SET_SIZE(labs)
+
+/*
+ * long long llabs(long long arg);
+ */
+ ENTRY(llabs)
+ brlz,a %o0, 1f
+ neg %o0
+1:
+ retl
+ nop
+ SET_SIZE(llabs)
diff --git a/usr/src/lib/libc/sparcv9/gen/llabs.s b/usr/src/lib/libc/sparcv9/gen/llabs.s
deleted file mode 100644
index fdc1f04c4f..0000000000
--- a/usr/src/lib/libc/sparcv9/gen/llabs.s
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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
- */
-/*
- * Copyright (c) 1997 Sun Microsystems, Inc.
- */
-
-.ident "%Z%%M% %I% %E% SMI"
-
- .file "%M%"
-
-#include <sys/asm_linkage.h>
-
- ANSI_PRAGMA_WEAK(llabs,function)
-
-#include "synonyms.h"
-
-/*
- * long long llabs(register long long arg);
- * long labs(register long int arg);
- */
- ENTRY2(labs,llabs)
- brlz,a %o0, .done
- neg %o0
-.done:
- retl
- nop
-
- SET_SIZE(labs)
- SET_SIZE(llabs)
diff --git a/usr/src/lib/libc/sparcv9/gen/siglongjmp.c b/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
index 3b90f52164..5efc2e28a2 100644
--- a/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
+++ b/usr/src/lib/libc/sparcv9/gen/siglongjmp.c
@@ -19,8 +19,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -32,7 +33,7 @@
#pragma weak siglongjmp = _siglongjmp
-#include "lint.h"
+#include "synonyms.h"
#include <sys/types.h>
#include <sys/stack.h>
#include <sys/frame.h>
@@ -43,7 +44,7 @@
#include "libc.h"
void
-_siglongjmp(sigjmp_buf env, int val)
+siglongjmp(sigjmp_buf env, int val)
{
extern void _fetch_globals(greg_t *);
ucontext_t uc;