Update.

1998-06-09  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/netinet/ip.h (struct ip_options): Define
	__data member only for gcc.  Reported by ak@muc.de.

	* misc/mntent.h: Undo last patch.
	* sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Undo last patch.
	* misc/tst/mntent.c: Adjust code for this change.

	* io/fts.c: Updated from a slightly more recent BSD version.
	* io/fts.h: Likewise.

	* libc.map: Add __libc_stack_end.

	* db2/Makefile (routines): Add lock_region.
	* db2/config.h: Update from db-2.4.14.
	* db2/db.h: Likewise.
	* db2/db_185.h: Likewise.
	* db2/db_int.h: Likewise.
	* db2/bt_close.c: Likewise.
	* db2/bt_compare.c: Likewise.
	* db2/bt_conv.c: Likewise.
	* db2/bt_cursor.c: Likewise.
	* db2/bt_delete.c: Likewise.
	* db2/bt_open.c: Likewise.
	* db2/bt_page.c: Likewise.
	* db2/bt_put.c: Likewise.
	* db2/bt_rec.c: Likewise.
	* db2/bt_recno.c: Likewise.
	* db2/bt_rsearch.c: Likewise.
	* db2/bt_search.c: Likewise.
	* db2/bt_split.c: Likewise.
	* db2/bt_stat.c: Likewise.
	* db2/btree.src: Likewise.
	* db2/btree_auto.c: Likewise.
	* db2/getlong.c: Likewise.
	* db2/db_appinit.c: Likewise.
	* db2/db_apprec.c: Likewise.
	* db2/db_byteorder.c: Likewise.
	* db2/db_err.c: Likewise.
	* db2/db_log2.c: Likewise.
	* db2/db_region.c: Likewise.
	* db2/db_salloc.c: Likewise.
	* db2/db_shash.c: Likewise.
	* db2/db.c: Likewise.
	* db2/db.src: Likewise.
	* db2/db_auto.c: Likewise.
	* db2/db_conv.c: Likewise.
	* db2/db_dispatch.c: Likewise.
	* db2/db_dup.c: Likewise.
	* db2/db_overflow.c: Likewise.
	* db2/db_pr.c: Likewise.
	* db2/db_rec.c: Likewise.
	* db2/db_ret.c: Likewise.
	* db2/db_thread.c: Likewise.
	* db2/db185.c: Likewise.
	* db2/db185_int.h: Likewise.
	* db2/dbm.c: Likewise.
	* db2/hash.c: Likewise.
	* db2/hash.src: Likewise.
	* db2/hash_auto.c: Likewise.
	* db2/hash_conv.c: Likewise.
	* db2/hash_debug.c: Likewise.
	* db2/hash_dup.c: Likewise.
	* db2/hash_func.c: Likewise.
	* db2/hash_page.c: Likewise.
	* db2/hash_rec.c: Likewise.
	* db2/hash_stat.c: Likewise.
	* db2/btree.h: Likewise.
	* db2/btree_ext.h: Likewise.
	* db2/clib_ext.h: Likewise.
	* db2/common_ext.h: Likewise.
	* db2/cxx_int.h: Likewise.
	* db2/db.h.src: Likewise.
	* db2/db_185.h.src: Likewise.
	* db2/db_am.h: Likewise.
	* db2/db_auto.h: Likewise.
	* db2/db_cxx.h: Likewise.
	* db2/db_dispatch.h: Likewise.
	* db2/db_ext.h: Likewise.
	* db2/db_int.h.src: Likewise.
	* db2/db_page.h: Likewise.
	* db2/db_shash.h: Likewise.
	* db2/db_swap.h: Likewise.
	* db2/hash.h: Likewise.
	* db2/hash_ext.h: Likewise.
	* db2/lock.h: Likewise.
	* db2/lock_ext.h: Likewise.
	* db2/log.h: Likewise.
	* db2/log_ext.h: Likewise.
	* db2/mp.h: Likewise.
	* db2/mp_ext.h: Likewise.
	* db2/mutex_ext.h: Likewise.
	* db2/os_ext.h: Likewise.
	* db2/os_func.h: Likewise.
	* db2/queue.h: Likewise.
	* db2/shqueue.h: Likewise.
	* db2/txn.h: Likewise.
	* db2/lock.c: Likewise.
	* db2/lock_conflict.c: Likewise.
	* db2/lock_deadlock.c: Likewise.
	* db2/lock_region.c: Likewise.
	* db2/lock_util.c: Likewise.
	* db2/log.c: Likewise.
	* db2/log.src: Likewise.
	* db2/log_archive.c: Likewise.
	* db2/log_auto.c: Likewise.
	* db2/log_compare.c: Likewise.
	* db2/log_findckp.c: Likewise.
	* db2/log_get.c: Likewise.
	* db2/log_put.c: Likewise.
	* db2/log_rec.c: Likewise.
	* db2/log_register.c: Likewise.
	* db2/mp_bh.c: Likewise.
	* db2/mp_fget.c: Likewise.
	* db2/mp_fopen.c: Likewise.
	* db2/mp_fput.c: Likewise.
	* db2/mp_fset.c: Likewise.
	* db2/mp_open.c: Likewise.
	* db2/mp_pr.c: Likewise.
	* db2/mp_region.c: Likewise.
	* db2/mp_sync.c: Likewise.
	* db2/68020.gcc: Likewise.
	* db2/mutex.c: Likewise.
	* db2/parisc.gcc: Likewise.
	* db2/parisc.hp: Likewise.
	* db2/sco.cc: Likewise.
	* db2/os_abs.c: Likewise.
	* db2/os_alloc.c: Likewise.
	* db2/os_config.c: Likewise.
	* db2/os_dir.c: Likewise.
	* db2/os_fid.c: Likewise.
	* db2/os_fsync.c: Likewise.
	* db2/os_map.c: Likewise.
	* db2/os_oflags.c: Likewise.
	* db2/os_open.c: Likewise.
	* db2/os_rpath.c: Likewise.
	* db2/os_rw.c: Likewise.
	* db2/os_seek.c: Likewise.
	* db2/os_sleep.c: Likewise.
	* db2/os_spin.c: Likewise.
	* db2/os_stat.c: Likewise.
	* db2/os_unlink.c: Likewise.
	* db2/db_archive.c: Likewise.
	* db2/db_checkpoint.c: Likewise.
	* db2/db_deadlock.c: Likewise.
	* db2/db_dump.c: Likewise.
	* db2/db_dump185.c: Likewise.
	* db2/db_load.c: Likewise.
	* db2/db_printlog.c: Likewise.
	* db2/db_recover.c: Likewise.
	* db2/db_stat.c: Likewise.
	* db2/txn.c: Likewise.
	* db2/txn.src: Likewise.
	* db2/txn_auto.c: Likewise.
	* db2/txn_rec.c: Likewise.

	* elf/rtld.c: Move definition of __libc_stack_end to ...
	* sysdeps/generic/dl-sysdep.h: ...here.

	* sysdeps/unix/sysv/linux/fstatvfs.c: Handle nodiratime option.
	* sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_NODIRATIME.
	* sysdeps/unix/sysv/linux/sys/mount.h: Define MS_NODIRATIME.

1998-06-08 21:44  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/fstatvfs.c: Handle constant option string
	from mntent correctly.

1998-06-06  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* sunrpc/Makefile (generated): Correct typo.

1998-06-04  Philip Blundell  <philb@gnu.org>

	* elf/elf.h (EM_ARM, et al.): New definitions.
	* sysdeps/arm/dl-machine.h: Update for new draft ARM ELF ABI.

1 files changed, 66 insertions, 54 deletions

diff --git a/db2/os/os_config.c b/db2/os/os_config.c
index 7a89ba58ab..4150c843e4 100644
--- a/db2/os/os_config.c
+++ b/db2/os/os_config.c
@@ -1,14 +1,14 @@
 /*-
  * See the file LICENSE for redistribution information.
  *
- * Copyright (c) 1997
+ * Copyright (c) 1997, 1998
  *	Sleepycat Software.  All rights reserved.
  */
 
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)os_config.c	10.12 (Sleepycat) 1/8/98";
+static const char sccsid[] = "@(#)os_config.c	10.26 (Sleepycat) 5/23/98";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -20,22 +20,6 @@ static const char sccsid[] = "@(#)os_config.c	10.12 (Sleepycat) 1/8/98";
 #include "db_int.h"
 
 /*
- * __os_oldwin --
- *	Return if Windows 95 (as opposed to Windows NT).
- *
- * PUBLIC: int __os_oldwin __P((void));
- */
-int
-__os_oldwin()
-{
-#ifdef _WIN32
-	return ((GetVersion() & 0x80000000) != 0);
-#else
-	return (0);
-#endif
-}
-
-/*
  * XXX
  * We provide our own extern declarations so that we don't collide with
  * systems that get them wrong, e.g., SunOS.
@@ -47,13 +31,20 @@ __os_oldwin()
 #define imported
 #endif
 
+/*
+ * XXX
+ * HP/UX MPE doesn't have fsync, but you can build one using FCONTROL.
+ */
+#ifdef __hp3000s900
+#define	fsync	__mpe_fsync
+#endif
+
 imported extern int	 close __P((int));
 imported extern void	 free __P((void *));
 imported extern int	 fsync __P((int));
 imported extern void    *malloc __P((size_t));
 imported extern int	 open __P((const char *, int, ...));
 imported extern ssize_t	 read __P((int, void *, size_t));
-imported extern char	*strdup __P((const char *));
 imported extern void    *realloc __P((void *, size_t));
 imported extern int	 unlink __P((const char *));
 imported extern ssize_t	 write __P((int, const void *, size_t));
@@ -63,7 +54,7 @@ imported extern ssize_t	 write __P((int, const void *, size_t));
  *	This list of interfaces that applications can replace.  In some
  *	cases, the user is permitted to replace the standard ANSI C or
  *	POSIX 1003.1 call, e.g., malloc or read.  In others, we provide
- *	a local interface to the functionality, e.g., __os_map.
+ *	a local interface to the functionality, e.g., __os_ioinfo.
  */
 struct __db_jumptab __db_jump = {
 	close,				/* DB_FUNC_CLOSE */
@@ -74,20 +65,26 @@ struct __db_jumptab __db_jump = {
 	fsync,				/* DB_FUNC_FSYNC */
 	__os_ioinfo,			/* DB_FUNC_IOINFO */
 	malloc,				/* DB_FUNC_MALLOC */
-	__os_map,			/* DB_FUNC_MAP */
+	NULL,				/* DB_FUNC_MAP */
 	open,				/* DB_FUNC_OPEN */
 	read,				/* DB_FUNC_READ */
 	realloc,			/* DB_FUNC_REALLOC */
+	NULL,				/* DB_FUNC_RUNLINK */
 	__os_seek,			/* DB_FUNC_SEEK */
 	__os_sleep,			/* DB_FUNC_SLEEP */
-	strdup,				/* DB_FUNC_STRDUP */
 	unlink,				/* DB_FUNC_UNLINK */
-	__os_unmap,			/* DB_FUNC_UNMAP */
+	NULL,				/* DB_FUNC_UNMAP */
 	write,				/* DB_FUNC_WRITE */
 	NULL				/* DB_FUNC_YIELD */
 };
 
-int __db_tsl_spins;			/* DB_TSL_SPINS */
+DB_GLOBALS __db_global_values = {
+	1,				/* DB_MUTEXLOCKS */
+	0,				/* DB_REGION_ANON, DB_REGION_NAME */
+	0,				/* DB_REGION_INIT */
+	0,				/* DB_TSL_SPINS */
+	0				/* DB_PAGEYIELD */
+};
 
 /*
  * db_jump_set --
@@ -99,74 +96,68 @@ db_jump_set(func, which)
 	int which;
 {
 	switch (which) {
-	case DB_FUNC_CALLOC:
-		/*
-		 * XXX
-		 * Obsolete, calloc is no longer called by DB.
-		 */
-		 break;
 	case DB_FUNC_CLOSE:
-		__db_jump.db_close = (int (*) __P((int)))func;
+		__db_jump.j_close = (int (*) __P((int)))func;
 		break;
 	case DB_FUNC_DIRFREE:
-		__db_jump.db_dirfree = (void (*) __P((char **, int)))func;
+		__db_jump.j_dirfree = (void (*) __P((char **, int)))func;
 		break;
 	case DB_FUNC_DIRLIST:
-		__db_jump.db_dirlist =
+		__db_jump.j_dirlist =
 		    (int (*) __P((const char *, char ***, int *)))func;
 		break;
 	case DB_FUNC_EXISTS:
-		__db_jump.db_exists = (int (*) __P((const char *, int *)))func;
+		__db_jump.j_exists = (int (*) __P((const char *, int *)))func;
 		break;
 	case DB_FUNC_FREE:
-		__db_jump.db_free = (void (*) __P((void *)))func;
+		__db_jump.j_free = (void (*) __P((void *)))func;
 		break;
 	case DB_FUNC_FSYNC:
-		__db_jump.db_fsync = (int (*) __P((int)))func;
+		__db_jump.j_fsync = (int (*) __P((int)))func;
 		break;
 	case DB_FUNC_IOINFO:
-		__db_jump.db_ioinfo = (int (*) __P((const char *,
+		__db_jump.j_ioinfo = (int (*) __P((const char *,
 		    int, u_int32_t *, u_int32_t *, u_int32_t *)))func;
 		break;
 	case DB_FUNC_MALLOC:
-		__db_jump.db_malloc = (void *(*) __P((size_t)))func;
+		__db_jump.j_malloc = (void *(*) __P((size_t)))func;
 		break;
 	case DB_FUNC_MAP:
-		__db_jump.db_map =
-		    (int (*) __P((int, size_t, int, int, void **)))func;
+		__db_jump.j_map = (int (*)
+		    __P((char *, int, size_t, int, int, int, void **)))func;
 		break;
 	case DB_FUNC_OPEN:
-		__db_jump.db_open = (int (*) __P((const char *, int, ...)))func;
+		__db_jump.j_open = (int (*) __P((const char *, int, ...)))func;
 		break;
 	case DB_FUNC_READ:
-		__db_jump.db_read =
+		__db_jump.j_read =
 		    (ssize_t (*) __P((int, void *, size_t)))func;
 		break;
 	case DB_FUNC_REALLOC:
-		__db_jump.db_realloc = (void *(*) __P((void *, size_t)))func;
+		__db_jump.j_realloc = (void *(*) __P((void *, size_t)))func;
+		break;
+	case DB_FUNC_RUNLINK:
+		__db_jump.j_runlink = (int (*) __P((char *)))func;
 		break;
 	case DB_FUNC_SEEK:
-		__db_jump.db_seek =
-		    (int (*) __P((int, size_t, db_pgno_t, u_long, int)))func;
+		__db_jump.j_seek = (int (*)
+		    __P((int, size_t, db_pgno_t, u_int32_t, int, int)))func;
 		break;
 	case DB_FUNC_SLEEP:
-		__db_jump.db_sleep = (int (*) __P((u_long, u_long)))func;
-		break;
-	case DB_FUNC_STRDUP:
-		__db_jump.db_strdup = (char *(*) __P((const char *)))func;
+		__db_jump.j_sleep = (int (*) __P((u_long, u_long)))func;
 		break;
 	case DB_FUNC_UNLINK:
-		__db_jump.db_unlink = (int (*) __P((const char *)))func;
+		__db_jump.j_unlink = (int (*) __P((const char *)))func;
 		break;
 	case DB_FUNC_UNMAP:
-		__db_jump.db_unmap = (int (*) __P((void *, size_t)))func;
+		__db_jump.j_unmap = (int (*) __P((void *, size_t)))func;
 		break;
 	case DB_FUNC_WRITE:
-		__db_jump.db_write =
+		__db_jump.j_write =
 		    (ssize_t (*) __P((int, const void *, size_t)))func;
 		break;
 	case DB_FUNC_YIELD:
-		__db_jump.db_yield = (int (*) __P((void)))func;
+		__db_jump.j_yield = (int (*) __P((void)))func;
 		break;
 	default:
 		return (EINVAL);
@@ -182,11 +173,32 @@ int
 db_value_set(value, which)
 	int value, which;
 {
+	int ret;
+
 	switch (which) {
+	case DB_MUTEXLOCKS:
+		DB_GLOBAL(db_mutexlocks) = value;
+		break;
+	case DB_PAGEYIELD:
+		DB_GLOBAL(db_pageyield) = value;
+		break;
+	case DB_REGION_ANON:
+		if (value != 0 && (ret = __db_mapanon_ok(0)) != 0)
+			return (ret);
+		DB_GLOBAL(db_region_anon) = value;
+		break;
+	case DB_REGION_INIT:
+		DB_GLOBAL(db_region_init) = value;
+		break;
+	case DB_REGION_NAME:
+		if (value != 0 && (ret = __db_mapanon_ok(1)) != 0)
+			return (ret);
+		DB_GLOBAL(db_region_anon) = value;
+		break;
 	case DB_TSL_SPINS:
 		if (value <= 0)
 			return (EINVAL);
-		__db_tsl_spins = value;
+		DB_GLOBAL(db_tsl_spins) = value;
 		break;
 	default:
 		return (EINVAL);