1998-11-30 Mark Kettenis <kettenis@phys.uva.nl>

	* mach/Versions [libc, GLIBC_2.0]: Add __spin_lock,
	__spin_lock_init,  __mutex_lock, __mutex_trylock,
	__mutex_unlock.
	Remove get_priviliged_ports.  Moved to hurd/Versions.

	* hurd/Versions [libc, GLIBC_2.0]: Add _end.  This makes the Hurd
	brk implementation see the end of the data segment of the program
	instead of the shared library.
	Add __hurd_errno_location.  This inline function is used in user
	programs.
	Add _hurd_critical_section_lock, _hurd_critical_section_unlock,
	_hurd_fd_get, _hurd_port_free, _hurd_port_get,
	_hurd_port_locked_get.  These inline functions are used by macros
	used in mail.local in the Hurd distribution.
	Add get_privileged_ports.  Moved here from mach/Versions.
	Remove __hurd_file_name_lookup,	__hurd_file_name_lookup_retry,
	__hurd_file_name_split, __hurd_file_name_path_lookup.  These are
	not used outside libc.

1998-11-30  Mark Kettenis  <kettenis@phys.uva.nl>

	* hurd/hurdstartup.c: Really include set-hooks.h with <> instead
	of "".

3 files changed, 104 insertions, 50 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d21b59b98..2149287e4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+1998-11-30  Mark Kettenis  <kettenis@phys.uva.nl>
+
+	* mach/Versions [libc, GLIBC_2.0]: Add __spin_lock,
+	__spin_lock_init,  __mutex_lock, __mutex_trylock,
+	__mutex_unlock.
+	Remove get_priviliged_ports.  Moved to hurd/Versions.
+
+	* hurd/Versions [libc, GLIBC_2.0]: Add _end.  This makes the Hurd
+	brk implementation see the end of the data segment of the program
+	instead of the shared library.
+	Add __hurd_errno_location.  This inline function is used in user
+	programs.
+	Add _hurd_critical_section_lock, _hurd_critical_section_unlock,
+	_hurd_fd_get, _hurd_port_free, _hurd_port_get,
+	_hurd_port_locked_get.  These inline functions are used by macros
+	used in mail.local in the Hurd distribution.
+	Add get_privileged_ports.  Moved here from mach/Versions.
+	Remove __hurd_file_name_lookup,	__hurd_file_name_lookup_retry,
+	__hurd_file_name_split, __hurd_file_name_path_lookup.  These are
+	not used outside libc.
+
+1998-11-30  Mark Kettenis  <kettenis@phys.uva.nl>
+
+	* hurd/hurdstartup.c: Really include set-hooks.h with <> instead
+	of "".
+
 1998-11-29  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>
 
 	* sunrpc/Makefile: Add xdr_intXX_t to routines.
diff --git a/hurd/Versions b/hurd/Versions
index 46e92797aa..8a7054f7da 100644
--- a/hurd/Versions
+++ b/hurd/Versions
@@ -1,50 +1,18 @@
 libc {
   GLIBC_2.0 {
-    # Hurd-specific variables
+    # necessary for the Hurd brk implementation
+    _end;
+
+    # variables used in macros & inline functions
     __hurd_sigthread_stack_base; __hurd_sigthread_stack_end;
-    __hurd_sigthread_variables; __hurd_threadvar_max;
+    __hurd_sigthread_variables;
+    __hurd_threadvar_max;
     __hurd_threadvar_stack_mask; __hurd_threadvar_stack_offset;
-    _hurd_device_master; _hurd_host_priv;
-
-    # Hurd-specific exported functions from <hurd.h>
-    _hurd_ports; _hurd_ports_use;
-    getcrdir; getcwdir; getauth; getproc; getcttyid;
-    setcrdir; setcwdir; setauth; setproc; setcttyid;
-    file_name_split; file_name_lookup; file_name_lookup_under;
-    file_name_path_lookup;
-    openport; fopenport; task2pid; pid2task; getdport; vpprintf;
-    hurd_thread_self; hurd_thread_cancel; hurd_check_cancel;
-    hurd_safe_memset;
-    _hurd_init; _hurd_proc_init;
-    _hurd_exec;
-    _hurd_canonicalize_directory_name_internal;
-    geteuids; seteuids;
-
-    # XXX ought to exist on all platforms
-    getumask;
-
-    # <hurd/lookup.h>
-    hurd_file_name_lookup; __hurd_file_name_lookup;
-    hurd_file_name_lookup_retry; __hurd_file_name_lookup_retry;
-    hurd_file_name_split; __hurd_file_name_split;
-    hurd_file_name_path_lookup; __hurd_file_name_path_lookup;
-
-    # <hurd/signal.h>
-    _hurd_thread_sigstate; _hurd_msgport;
-    _hurd_exception2signal;
-    hurd_sig_post;
 
-    # <hurd/sigpreempt.h>
-    hurd_catch_signal;
-    hurd_preempt_signals;
-
-    # <hurd/port.h>
-    _hurd_port_cleanup;
+    # functions used in macros & inline functions
+    __hurd_errno_location;
 
-    # <hurd/fd.h>
-    _hurd_dtable; _hurd_dtablesize; _hurd_dtable_lock; _hurd_intern_fd;
-
-    # Internal functions referenced by libmachuser and libhurduser.
+    # functions used in libmachuser and libhurduser
     _S_catch_exception_raise;
     _S_msg_add_auth; _S_msg_del_auth;
     _S_msg_describe_ports;
@@ -59,5 +27,68 @@ libc {
     _S_msg_proc_newids; _S_msg_report_wait;
     _S_msg_sig_post; _S_msg_sig_post_untraced;
     _hurd_intr_rpc_mach_msg; _hurdsig_fault_catch_exception_raise;
+
+    # "quasi-internal" variables
+    _hurd_device_master;
+    _hurd_dtable; _hurd_dtablesize; _hurd_dtable_lock;
+    _hurd_host_priv;
+    _hurd_msgport;
+    _hurd_ports;
+
+    # "quasi-internal" functions
+    _hurd_canonicalize_directory_name_internal;
+    _hurd_critical_section_lock;
+    _hurd_critical_section_unlock;
+    _hurd_exception2signal;
+    _hurd_exec;
+    _hurd_fd_get;
+    _hurd_init;
+    _hurd_intern_fd;
+    _hurd_port_cleanup;
+    _hurd_port_free;
+    _hurd_port_get;
+    _hurd_port_locked_get;
+    _hurd_ports_use;
+    _hurd_proc_init;
+    _hurd_thread_sigstate;
+
+    # functions in normal name space
+
+    # f*
+    file_name_lookup; file_name_lookup_under; file_name_path_lookup;
+    file_name_split;
+    fopenport;
+
+    # g*
+    get_privileged_ports;
+    getauth; getcrdir; getcwdir; getcttyid; getdport; geteuids;
+    getproc; getumask;
+
+    # h*
+    hurd_catch_signal;
+    hurd_check_cancel;
+    hurd_file_name_lookup; hurd_file_name_lookup_retry;
+    hurd_file_name_path_lookup; hurd_file_name_split;
+    hurd_preempt_signals;
+    hurd_safe_copyin; hurd_safe_copyout;
+    hurd_safe_memmove; hurd_safe_memset;
+    hurd_sig_post;
+    hurd_thread_cancel; hurd_thread_self;
+    hurd_unpreemt_signals;
+
+    # o*
+    openport;
+
+    # p*
+    pid2task;
+
+    # s*
+    setauth; setcrdir; setcwdir; seteuids; setproc; setcttyid;
+
+    # t*
+    task2pid;
+
+    # v*
+    vpprintf;
   }
 }
diff --git a/mach/Versions b/mach/Versions
index 34dfabe11a..23fe6d7e99 100644
--- a/mach/Versions
+++ b/mach/Versions
@@ -4,12 +4,12 @@ libc {
     __mach_task_self_;
     __vm_page_size;
 
-    # functions used in inline functions
-    __mach_thread_self;
-    __mutex_lock_solid; __mutex_unlock_solid;
-    __spin_lock_solid; __spin_try_lock; __spin_unlock;
-    __mutex_init;
-    __mach_port_deallocate;
+    # functions used in inline functions and macros
+    __mach_port_deallocate; __mach_thread_self;
+    __mutex_init; __mutex_lock; __mutex_lock_solid; __mutex_trylock;
+    __mutex_unlock; __mutex_unlock_solid;
+    __spin_lock; __spin_lock_init; __spin_lock_solid; __spin_try_lock;
+    __spin_unlock;
 
     # functions used by RPC stubs
     __mach_msg;
@@ -24,9 +24,6 @@ libc {
     # e*
     evc_wait;
 
-    # g*
-    get_privileged_ports;
-
     # m*
     mach_error; mach_error_string; mach_error_type;
     mach_host_self;