Update.cvs/libc-ud-960807cvs/libc-960808

Thu Aug  8 01:41:43 1996  Ulrich Drepper  <drepper@cygnus.com>

	* elf/Makefile: Undo change of Tue Aug  6 14:27:11 1996.
	* elf/dl-support: Add definition of `_dl_sysdep_read_whole_file'.

Thu Aug  8 01:15:59 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/i386/fpu_control.h (_FPU_DEFAULT, _FPU_IEEE): Set
	to 0x137f to allow long double operations.

Sun Aug  4 13:12:05 1996  Richard Henderson  <rth@tamu.edu>

	Bug Fixes:

	* nss/nsswitch.c (_res): Remove redundant variable definition.
	The real one is in resolve/res_init.c, and having both prevents
	using -fno-common when building the shared library.
	* sunrpc/rpc_prot.c (_null_auth): Same.  Original is in rpc_common.c.

	* sysdeps/unix/sysv/linux/alpha/brk.S: When PIC, define __curbrk as
	a .bss object not a COMMON symbol.

	* sysdeps/alpha/bsd-_setjmp.S, sysdeps/alpha/bsd-setjmp.S: Must load
	$gp before referencing __sigsetjmp symbol.  Retain LITUSE for same.

	Optimizations:

	* sysdeps/alpha/strlen.S: Rearrange first-word setup and thense the
	main loop for better dual-issue on EV5.  Rearrange binary search to
	pipeline better and trim one instruction.

	Cosmetic Changes:

	* time/localtime.c (localtime_r): Move lock declaration back next to
	the comment where it was before the 960724 change.

	* INSTALL, manual/maint.texi: alpha-gnu-linux -> alpha-ANYTHING-linux.
	The second word is supposed to be the hardware manufacturer.

	* sysdeps/alpha/_mcount.S: Retain LITUSE for __mcount.
	* sysdeps/alpha/setjmp.S: Retain LITUSE for __sigsetjmp_aux.

	* sysdeps/alpha/divrem.h: More local labels, retain LITUSE for _mcount.

	* sysdeps/alpha/alphaev5/add_n.S, sysdeps/alpha/alphaev5/lshift.S,
	sysdeps/alpha/alphaev5/rshift.S, sysdeps/alpha/alphaev5/sub_n.S:
	Same cleanups as with EV4 GMP stuff.

Tue Jul 25 03:30:56 1996  Richard Henderson  <rth@tamu.edu>

	* sysdeps/unix/sysv/linux/Makefile [misc] (sysdep_routines): Add clone.
	* sysdeps/unix/sysv/linux/alpha/clone.S: New file.
	* sysdeps/unix/sysv/linux/i386/clone.S: New file.

Sun Aug  4 00:12:41 1996  David Mosberger-Tang  <davidm@azstarnet.com>

	* sysdeps/unix/sysv/linux/gnu/types.h: Declare __fd_mask as
	`unsigned long'.

	* misc/sys/select.h: Declare fd_mask as alias of __fd_mask.

Sat Aug  3 16:20:02 1996  David Mosberger-Tang  <davidm@azstarnet.com>

	* sysdeps/unix/sysv/linux/alpha/ioperm.c (platform): Add entry for
 	Mikasa.

	* socket/sys/socket.h (send, __send, sendto): Declare buffer
 	pointer as __const.

	* string/tester.c (main): Test stpncpy.

	* sysdeps/generic/stpncpy.c (__stpncpy): Fix so it works without
 	segfault when called with an N that is not a multiple of four and
 	src[N-1]=='\0'.

	* misc/syslog.c (LogType): New variable.
	(openlog): If connect() with SOCK_DGRAM fails with EPROTOTYPE,
 	try again with SOCK_STREAM (the Linux syslogd uses a socket of the
 	latter type).
	(vsyslog): When LogType==SOCK_STREAM, also send ASCII NUL
 	terminator as a record-delimiter.  If __send(LogFile) fails,
	call closelog() so logfile gets re-opened next time.

Wed Aug  7 15:15:14 1996  Ulrich Drepper  <drepper@cygnus.com>

	* elf/dl-open (_dl_open): Add cast to avoid warning.

	* manual/memory.texi: Improve some examples to give readers better
	advice: Use `stpcpy' instead of `strcat' if possible.
	* manual/string.texi: Document `strtok_r' and `strtok'.

	* sunrpc/Makefile: Move `+gccwarn' definition before inclusion
	of Makeconfig.
	[$(cross-compiling)=no]: Change test before making librpcsvc
	to this from $(cross-compile).
	Reported by Andreas Schwab.

Tue Aug  6 14:27:11 1996  Ulrich Drepper  <drepper@cygnus.com>

	* elf/Makefile (routines): Move dl-sysdep to here...
	(rtld-routines): ...from here.  This should make static linking
	work again.

	* locale/setlocale.c: Add local variable `lock' and add code to
	`setlocale' to avoid simultaneous changing of global data.

	* catgets/catgets.c (catopen): Use `__strdup' instead of `strdup'.
	* catgets/open_catalog (__open_catalog): Use `__stpcpy', `__open',
	`__fstat', `__read', `__mmap', `__munmap' and `__close' instead
	of unprotected names.

2 files changed, 125 insertions, 81 deletions

diff --git a/sysdeps/generic/confname.h b/sysdeps/generic/confname.h
index fb2679fb45..d0968a1ba5 100644
--- a/sysdeps/generic/confname.h
+++ b/sysdeps/generic/confname.h
@@ -21,175 +21,209 @@ Cambridge, MA 02139, USA.  */
 enum
   {
     _PC_LINK_MAX,
-#define	_PC_LINK_MAX		_PC_LINK_MAX
+#define	_PC_LINK_MAX			_PC_LINK_MAX
     _PC_MAX_CANON,
-#define	_PC_MAX_CANON		_PC_MAX_CANON
+#define	_PC_MAX_CANON			_PC_MAX_CANON
     _PC_MAX_INPUT,
-#define	_PC_MAX_INPUT		_PC_MAX_INPUT
+#define	_PC_MAX_INPUT			_PC_MAX_INPUT
     _PC_NAME_MAX,
-#define	_PC_NAME_MAX		_PC_NAME_MAX
+#define	_PC_NAME_MAX			_PC_NAME_MAX
     _PC_PATH_MAX,
-#define	_PC_PATH_MAX		_PC_PATH_MAX
+#define	_PC_PATH_MAX			_PC_PATH_MAX
     _PC_PIPE_BUF,
-#define	_PC_PIPE_BUF		_PC_PIPE_BUF
+#define	_PC_PIPE_BUF			_PC_PIPE_BUF
     _PC_CHOWN_RESTRICTED,
-#define	_PC_CHOWN_RESTRICTED	_PC_CHOWN_RESTRICTED
+#define	_PC_CHOWN_RESTRICTED		_PC_CHOWN_RESTRICTED
     _PC_NO_TRUNC,
-#define	_PC_NO_TRUNC		_PC_NO_TRUNC
+#define	_PC_NO_TRUNC			_PC_NO_TRUNC
     _PC_VDISABLE,
     _PC_SYNC_IO,
-#define	_PC_SYNC_IO		_PC_SYNC_IO
+#define	_PC_SYNC_IO			_PC_SYNC_IO
     _PC_ASYNC_IO,
-#define	_PC_ASYNC_IO		_PC_ASYNC_IO
+#define	_PC_ASYNC_IO			_PC_ASYNC_IO
     _PC_PRIO_IO,
-#define	_PC_PRIO_IO		_PC_PRIO_IO
+#define	_PC_PRIO_IO			_PC_PRIO_IO
     _PC_SOCK_MAXBUF
-#define	_PC_SOCK_MAXBUF		_PC_SOCK_MAXBUF
+#define	_PC_SOCK_MAXBUF			_PC_SOCK_MAXBUF
   };
 
 /* Values for the argument to `sysconf'.  */
 enum
   {
     _SC_ARG_MAX,
-#define	_SC_ARG_MAX		_SC_ARG_MAX
+#define	_SC_ARG_MAX			_SC_ARG_MAX
     _SC_CHILD_MAX,
-#define	_SC_CHILD_MAX		_SC_CHILD_MAX
+#define	_SC_CHILD_MAX			_SC_CHILD_MAX
     _SC_CLK_TCK,
-#define	_SC_CLK_TCK		_SC_CLK_TCK
+#define	_SC_CLK_TCK			_SC_CLK_TCK
     _SC_NGROUPS_MAX,
-#define	_SC_NGROUPS_MAX		_SC_NGROUPS_MAX
+#define	_SC_NGROUPS_MAX			_SC_NGROUPS_MAX
     _SC_OPEN_MAX,
-#define	_SC_OPEN_MAX		_SC_OPEN_MAX
+#define	_SC_OPEN_MAX			_SC_OPEN_MAX
     _SC_STREAM_MAX,
-#define	_SC_STREAM_MAX		_SC_STREAM_MAX
+#define	_SC_STREAM_MAX			_SC_STREAM_MAX
     _SC_TZNAME_MAX,
-#define	_SC_TZNAME_MAX		_SC_TZNAME_MAX
+#define	_SC_TZNAME_MAX			_SC_TZNAME_MAX
     _SC_JOB_CONTROL,
-#define	_SC_JOB_CONTROL		_SC_JOB_CONTROL
+#define	_SC_JOB_CONTROL			_SC_JOB_CONTROL
     _SC_SAVED_IDS,
-#define	_SC_SAVED_IDS		_SC_SAVED_IDS
+#define	_SC_SAVED_IDS			_SC_SAVED_IDS
     _SC_REALTIME_SIGNALS,
-#define	_SC_REALTIME_SIGNALS	_SC_REALTIME_SIGNALS
+#define	_SC_REALTIME_SIGNALS		_SC_REALTIME_SIGNALS
     _SC_PRIORITY_SCHEDULING,
-#define	_SC_PRIORITY_SCHEDULING	_SC_PRIORITY_SCHEDULING
+#define	_SC_PRIORITY_SCHEDULING		_SC_PRIORITY_SCHEDULING
     _SC_TIMERS,
-#define	_SC_TIMERS		_SC_TIMERS
+#define	_SC_TIMERS			_SC_TIMERS
     _SC_ASYNCHRONOUS_IO,
-#define	_SC_ASYNCHRONOUS_IO	_SC_ASYNCHRONOUS_IO
+#define	_SC_ASYNCHRONOUS_IO		_SC_ASYNCHRONOUS_IO
     _SC_PRIORITIZED_IO,
-#define	_SC_PRIORITIZED_IO	_SC_PRIORITIZED_IO
+#define	_SC_PRIORITIZED_IO		_SC_PRIORITIZED_IO
     _SC_SYNCHRONIZED_IO,
-#define	_SC_SYNCHRONIZED_IO	_SC_SYNCHRONIZED_IO
+#define	_SC_SYNCHRONIZED_IO		_SC_SYNCHRONIZED_IO
     _SC_FSYNC,
-#define	_SC_FSYNC		_SC_FSYNC
+#define	_SC_FSYNC			_SC_FSYNC
     _SC_MAPPED_FILES,
-#define	_SC_MAPPED_FILES	_SC_MAPPED_FILES
+#define	_SC_MAPPED_FILES		_SC_MAPPED_FILES
     _SC_MEMLOCK,
-#define	_SC_MEMLOCK		_SC_MEMLOCK
+#define	_SC_MEMLOCK			_SC_MEMLOCK
     _SC_MEMLOCK_RANGE,
-#define	_SC_MEMLOCK_RANGE	_SC_MEMLOCK_RANGE
+#define	_SC_MEMLOCK_RANGE		_SC_MEMLOCK_RANGE
     _SC_MEMORY_PROTECTION,
-#define	_SC_MEMORY_PROTECTION	_SC_MEMORY_PROTECTION
+#define	_SC_MEMORY_PROTECTION		_SC_MEMORY_PROTECTION
     _SC_MESSAGE_PASSING,
-#define	_SC_MESSAGE_PASSING	_SC_MESSAGE_PASSING
+#define	_SC_MESSAGE_PASSING		_SC_MESSAGE_PASSING
     _SC_SEMAPHORES,
-#define	_SC_SEMAPHORES		_SC_SEMAPHORES
+#define	_SC_SEMAPHORES			_SC_SEMAPHORES
     _SC_SHARED_MEMORY_OBJECTS,
 #define	_SC_SHARED_MEMORY_OBJECTS	_SC_SHARED_MEMORY_OBJECTS
     _SC_AIO_LISTIO_MAX,
-#define	_SC_AIO_LIST_MAX	_SC_AIO_LIST_MAX
+#define	_SC_AIO_LIST_MAX		_SC_AIO_LIST_MAX
     _SC_AIO_MAX,
-#define	_SC_AIO_MAX		_SC_AIO_MAX
+#define	_SC_AIO_MAX			_SC_AIO_MAX
     _SC_AIO_PRIO_DELTA_MAX,
-#define	_SC_AIO_PRIO_DELTA_MAX	_SC_AIO_PRIO_DELTA_MAX
+#define	_SC_AIO_PRIO_DELTA_MAX		_SC_AIO_PRIO_DELTA_MAX
     _SC_DELAYTIMER_MAX,
-#define	_SC_DELAYTIMER_MAX	_SC_DELAYTIMER_MAX
+#define	_SC_DELAYTIMER_MAX		_SC_DELAYTIMER_MAX
     _SC_MQ_OPEN_MAX,
-#define	_SC_MQ_OPEN_MAX		_SC_MQ_OPEN_MAX
+#define	_SC_MQ_OPEN_MAX			_SC_MQ_OPEN_MAX
     _SC_MQ_PRIO_MAX,
-#define	_SC_MQ_PRIO_MAX		_SC_MQ_PRIO_MAX
+#define	_SC_MQ_PRIO_MAX			_SC_MQ_PRIO_MAX
     _SC_VERSION,
-#define	_SC_VERSION		_SC_VERSION
+#define	_SC_VERSION			_SC_VERSION
     _SC_PAGESIZE,
-#define	_SC_PAGESIZE		_SC_PAGESIZE
-#define	_SC_PAGE_SIZE		_SC_PAGESIZE
+#define	_SC_PAGESIZE			_SC_PAGESIZE
+#define	_SC_PAGE_SIZE			_SC_PAGESIZE
     _SC_RTSIG_MAX,
-#define	_SC_RTSIG_MAX		_SC_RTSIG_MAX
+#define	_SC_RTSIG_MAX			_SC_RTSIG_MAX
     _SC_SEM_NSEMS_MAX,
-#define	_SC_SEM_NSEMS_MAX	_SC_SEM_NSEMS_MAX
+#define	_SC_SEM_NSEMS_MAX		_SC_SEM_NSEMS_MAX
     _SC_SEM_VALUE_MAX,
-#define	_SC_SEM_VALUE_MAX	_SC_SEM_VALUE_MAX
+#define	_SC_SEM_VALUE_MAX		_SC_SEM_VALUE_MAX
     _SC_SIGQUEUE_MAX,
-#define	_SC_SIGQUEUE_MAX	_SC_SIGQUEUE_MAX
+#define	_SC_SIGQUEUE_MAX		_SC_SIGQUEUE_MAX
     _SC_TIMER_MAX,
-#define	_SC_TIMER_MAX		_SC_TIMER_MAX
+#define	_SC_TIMER_MAX			_SC_TIMER_MAX
 
     /* Values for the argument to `sysconf'
        corresponding to _POSIX2_* symbols.  */
     _SC_BC_BASE_MAX,
-#define	_SC_BC_BASE_MAX		_SC_BC_BASE_MAX
+#define	_SC_BC_BASE_MAX			_SC_BC_BASE_MAX
     _SC_BC_DIM_MAX,
-#define	_SC_BC_DIM_MAX		_SC_BC_DIM_MAX
+#define	_SC_BC_DIM_MAX			_SC_BC_DIM_MAX
     _SC_BC_SCALE_MAX,
-#define	_SC_BC_SCALE_MAX	_SC_BC_SCALE_MAX
+#define	_SC_BC_SCALE_MAX		_SC_BC_SCALE_MAX
     _SC_BC_STRING_MAX,
-#define	_SC_BC_STRING_MAX	_SC_BC_STRING_MAX
+#define	_SC_BC_STRING_MAX		_SC_BC_STRING_MAX
     _SC_COLL_WEIGHTS_MAX,
-#define	_SC_COLL_WEIGHTS_MAX	_SC_COLL_WEIGHTS_MAX
+#define	_SC_COLL_WEIGHTS_MAX		_SC_COLL_WEIGHTS_MAX
     _SC_EQUIV_CLASS_MAX,
-#define	_SC_EQUIV_CLASS_MAX	_SC_EQUIV_CLASS_MAX
+#define	_SC_EQUIV_CLASS_MAX		_SC_EQUIV_CLASS_MAX
     _SC_EXPR_NEST_MAX,
-#define	_SC_EXPR_NEST_MAX	_SC_EXPR_NEST_MAX
+#define	_SC_EXPR_NEST_MAX		_SC_EXPR_NEST_MAX
     _SC_LINE_MAX,
-#define	_SC_LINE_MAX		_SC_LINE_MAX
+#define	_SC_LINE_MAX			_SC_LINE_MAX
     _SC_RE_DUP_MAX,
-#define	_SC_RE_DUP_MAX		_SC_RE_DUP_MAX
+#define	_SC_RE_DUP_MAX			_SC_RE_DUP_MAX
     _SC_CHARCLASS_NAME_MAX,
-#define	_SC_CHARCLASS_NAME_MAX	_SC_CHARCLASS_NAME_MAX
+#define	_SC_CHARCLASS_NAME_MAX		_SC_CHARCLASS_NAME_MAX
 
     _SC_2_VERSION,
-#define	_SC_2_VERSION		_SC_2_VERSION
+#define	_SC_2_VERSION			_SC_2_VERSION
     _SC_2_C_BIND,
-#define	_SC_2_C_BIND		_SC_2_C_BIND
+#define	_SC_2_C_BIND			_SC_2_C_BIND
     _SC_2_C_DEV,
-#define	_SC_2_C_DEV		_SC_2_C_DEV
+#define	_SC_2_C_DEV			_SC_2_C_DEV
     _SC_2_FORT_DEV,
-#define	_SC_2_FORT_DEV		_SC_2_FORT_DEV
+#define	_SC_2_FORT_DEV			_SC_2_FORT_DEV
     _SC_2_FORT_RUN,
-#define	_SC_2_FORT_RUN		_SC_2_FORT_RUN
+#define	_SC_2_FORT_RUN			_SC_2_FORT_RUN
     _SC_2_SW_DEV,
-#define	_SC_2_SW_DEV		_SC_2_SW_DEV
+#define	_SC_2_SW_DEV			_SC_2_SW_DEV
     _SC_2_LOCALEDEF,
-#define	_SC_2_LOCALEDEF		_SC_2_LOCALEDEF
+#define	_SC_2_LOCALEDEF			_SC_2_LOCALEDEF
 
     _SC_PII,
-#define	_SC_PII			_SC_PII
+#define	_SC_PII				_SC_PII
     _SC_PII_XTI,
-#define	_SC_PII_XTI		_SC_PII_XTI
+#define	_SC_PII_XTI			_SC_PII_XTI
     _SC_PII_SOCKET,
-#define	_SC_PII_SOCKET		_SC_PII_SOCKET
+#define	_SC_PII_SOCKET			_SC_PII_SOCKET
     _SC_PII_INTERNET,
-#define	_SC_PII_INTERNET	_SC_PII_INTERNET
+#define	_SC_PII_INTERNET		_SC_PII_INTERNET
     _SC_PII_OSI,
-#define	_SC_PII_OSI		_SC_PII_OSI
+#define	_SC_PII_OSI			_SC_PII_OSI
     _SC_POLL,
-#define	_SC_POLL		_SC_POLL
+#define	_SC_POLL			_SC_POLL
     _SC_SELECT,
-#define	_SC_SELECT		_SC_SELECT
+#define	_SC_SELECT			_SC_SELECT
     _SC_UIO_MAXIOV,
-#define	_SC_UIO_MAXIOV		_SC_UIO_MAXIOV
+#define	_SC_UIO_MAXIOV			_SC_UIO_MAXIOV
     _SC_PII_INTERNET_STREAM,
-#define	_SC_PII_INTERNET_STREAM	_SC_PII_INTERNET_STREAM
+#define	_SC_PII_INTERNET_STREAM		_SC_PII_INTERNET_STREAM
     _SC_PII_INTERNET_DGRAM,
-#define	_SC_PII_INTERNET_DGRAM	_SC_PII_INTERNET_DGRAM
+#define	_SC_PII_INTERNET_DGRAM		_SC_PII_INTERNET_DGRAM
     _SC_PII_OSI_COTS,
-#define	_SC_PII_OSI_COTS	_SC_PII_OSI_COTS
+#define	_SC_PII_OSI_COTS		_SC_PII_OSI_COTS
     _SC_PII_OSI_CLTS,
-#define	_SC_PII_OSI_CLTS	_SC_PII_OSI_CLTS
+#define	_SC_PII_OSI_CLTS		_SC_PII_OSI_CLTS
     _SC_PII_OSI_M,
-#define	_SC_PII_OSI_M		_SC_PII_OSI_M
-    _SC_T_IOV_MAX
-#define	_SC_T_IOV_MAX		_SC_T_IOV_MAX
+#define	_SC_PII_OSI_M			_SC_PII_OSI_M
+    _SC_T_IOV_MAX,
+#define	_SC_T_IOV_MAX			_SC_T_IOV_MAX
+
+    /* Values according to POSIX 1003.1c (POSIX threads).  */
+    _SC_THREADS,
+#define	_SC_THREADS			_SC_THREADS
+    _SC_THREAD_SAFE_FUNCTIONS,
+#define _SC_THREAD_SAFE_FUNCTIONS	_SC_THREAD_SAFE_FUNCTIONS
+    _SC_GETGR_R_SIZE_MAX,
+#define	_SC_GETGR_R_SIZE_MAX		_SC_GETGR_R_SIZE_MAX
+    _SC_GETPW_R_SIZE_MAX,
+#define	_SC_GETPW_R_SIZE_MAX		_SC_GETPW_R_SIZE_MAX
+    _SC_LOGIN_NAME_MAX,
+#define	_SC_LOGIN_NAME_MAX		_SC_LOGIN_NAME_MAX
+    _SC_TTY_NAME_MAX,
+#define	_SC_TTY_NAME_MAX		_SC_TTY_NAME_MAX
+    _SC_THREAD_DESTRUCTOR_ITERATIONS,
+#define	_SC_THREAD_DESTRUCTOR_ITERATIONS _SC_THREAD_DESTRUCTOR_ITERATIONS
+    _SC_THREAD_KEYS_MAX,
+#define	_SC_THREAD_KEYS_MAX		_SC_THREAD_KEYS_MAX
+    _SC_THREAD_STACK_MIN,
+#define	_SC_THREAD_STACK_MIN		_SC_THREAD_STACK_MIN
+    _SC_THREAD_THREADS_MAX,
+#define	_SC_THREAD_THREADS_MAX		_SC_THREAD_THREADS_MAX
+    _SC_THREAD_ATTR_STACKADDR,
+#define	_SC_THREAD_ATTR_STACKADDR	_SC_THREAD_ATTR_STACKADDR
+    _SC_THREAD_ATTR_STACKSIZE,
+#define	_SC_THREAD_ATTR_STACKSIZE	_SC_THREAD_ATTR_STACKSIZE
+    _SC_THREAD_PRIORITY_SCHEDULING,
+#define	_SC_THREAD_PRIORITY_SCHEDULING	_SC_THREAD_PRIORITY_SCHEDULING
+    _SC_THREAD_PRIO_INHERIT,
+#define	_SC_THREAD_PRIO_INHERIT		_SC_THREAD_PRIO_INHERIT
+    _SC_THREAD_PRIO_PROTECT,
+#define	_SC_THREAD_PRIO_PROTECT		_SC_THREAD_PRIO_PROTECT
+    _SC_THREAD_PROCESS_SHARED,
+#define	_SC_THREAD_PROCESS_SHARED	_SC_THREAD_PROCESS_SHARED
   };
 
 #ifdef __USE_POSIX2
diff --git a/sysdeps/generic/resourcebits.h b/sysdeps/generic/resourcebits.h
index e343b300cc..74cbcb0e97 100644
--- a/sysdeps/generic/resourcebits.h
+++ b/sysdeps/generic/resourcebits.h
@@ -1,5 +1,5 @@
 /* Bit values for resource limits.  4.4 BSD/generic GNU version.
-Copyright (C) 1994 Free Software Foundation, Inc.
+Copyright (C) 1994, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -27,26 +27,36 @@ enum __rlimit_resource
   {
     /* Per-process CPU limit, in seconds.  */
     RLIMIT_CPU,
+#define	RLIMIT_CPU	RLIMIT_CPU
     /* Largest file that can be created, in bytes.  */
     RLIMIT_FSIZE,
+#define	RLIMIT_FSIZE	RLIMIT_FSIZE
     /* Maximum size of data segment, in bytes.  */
     RLIMIT_DATA,
+#define	RLIMIT_DATA	RLIMIT_DATA
     /* Maximum size of stack segment, in bytes.  */
     RLIMIT_STACK,
+#define	RLIMIT_STACK	RLIMIT_STACK
     /* Largest core file that can be created, in bytes.  */
     RLIMIT_CORE,
+#define	RLIMIT_CORE	RLIMIT_CORE
     /* Largest resident set size, in bytes.
        This affects swapping; processes that are exceeding their
        resident set size will be more likely to have physical memory
        taken from them.  */
     RLIMIT_RSS,
+#define	RLIMIT_RSS	RLIMIT_RSS
     /* Locked-in-memory address space.  */
     RLIMIT_MEMLOCK,
+#define	RLIMIT_MEMLOCK	RLIMIT_MEMLOCK
     /* Number of processes.  */
     RLIMIT_NPROC,
+#define	RLIMIT_NPROC	RLIMIT_NPROC
     /* Number of open files.  */
     RLIMIT_OFILE,
     RLIMIT_NOFILE = RLIMIT_OFILE, /* Another name for the same thing.  */
+#define	RLIMIT_OFILE	RLIMIT_OFILE
+#define	RLIMIT_NOFILE	RLIMIT_NOFILE
 
     RLIMIT_NLIMITS,		/* Number of limit flavors.  */
     RLIM_NLIMITS = RLIMIT_NLIMITS /* Traditional name for same.  */