Update.

1998-07-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Make-dist (+sysdep-tsrcs): Add Versions.

1998-07-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* math/Versions: Remove __log1p, __atan2, __fe_dfl_env,
	__fe_enabled_env, __fe_nonieee_env and __fe_nomask_env.
	* sysdeps/powerpc/Versions: New file.
	* csu/Versions: Remove brk, sbrk, environ, __environ, _environ
	and __errno_location.
	* misc/Versions: Add brk and sbrk.
	* posix/Versions: Add environ, __environ and _environ.
	* sysdeps/unix/sysv/linux/Versions: Add __errno_location.

1998-07-10 11:58  Ulrich Drepper  <drepper@cygnus.com>

	* Makerules [no_defs]: Avoid dependency for loading sysd-versions.
	Patch by Zack Weinberg.

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

	* posix/annexc.c (errno_maybe): EACCESS->EACCES.
	(signal_maybe): Remove duplicate entry SIGEV_SIGNAL.
	(mman_maybe): Remove duplicates MS_ASYNC, MS_INVALIDATE.

	* signal/signal.h: Define pid_t also for __USE_XOPEN.

10 files changed, 54 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index adb610ab76..97cbb68511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+1998-07-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* Make-dist (+sysdep-tsrcs): Add Versions.
+
+1998-07-09  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* math/Versions: Remove __log1p, __atan2, __fe_dfl_env,
+	__fe_enabled_env, __fe_nonieee_env and __fe_nomask_env.
+	* sysdeps/powerpc/Versions: New file.
+	* csu/Versions: Remove brk, sbrk, environ, __environ, _environ
+	and __errno_location.
+	* misc/Versions: Add brk and sbrk.
+	* posix/Versions: Add environ, __environ and _environ.
+	* sysdeps/unix/sysv/linux/Versions: Add __errno_location.
+
+1998-07-10 11:58  Ulrich Drepper  <drepper@cygnus.com>
+
+	* Makerules [no_defs]: Avoid dependency for loading sysd-versions.
+	Patch by Zack Weinberg.
+
+1998-07-10  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* posix/annexc.c (errno_maybe): EACCESS->EACCES.
+	(signal_maybe): Remove duplicate entry SIGEV_SIGNAL.
+	(mman_maybe): Remove duplicates MS_ASYNC, MS_INVALIDATE.
+
 1998-07-09  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* sysdeps/unix/sysv/linux/bits/fcntl.h: Fix typo.
@@ -29,7 +55,7 @@
 	* posix/unistd.h: Define *_t types also for __USE_XOPEN.
 	* posix/sys/wait.h: Define pid_t for __USE_XOPEN.
 	* pwd/pwd.h: Define gid_t and pid_t also for __USE_XOPEN.
-	* signal/signal.h: Define pid_t also fir __USE_XOPEN.
+	* signal/signal.h: Define pid_t also for __USE_XOPEN.
 	* sysdeps/unix/sysv/linux/bits/fcntl.h: Define _RSYNC and O_DSYNC also
 	for __USE_POSIX199309.
 	* sysdeps/unix/sysv/linux/bits/termios.h: Define the various B*
diff --git a/Make-dist b/Make-dist
index 30b9749e91..9f9531daae 100644
--- a/Make-dist
+++ b/Make-dist
@@ -179,7 +179,7 @@ foo:=$(shell echo +sysdep-distfiles='$(+sysdep-distfiles)'>&2)
 foo:=$(shell echo '+sysdep-dist=$(+sysdep-dist)' >&2)
 
 +sysdep-tsrcs := $(wildcard $(foreach file,Makefile Implies syscalls.list\
-				           configure configure.in,\
+				           configure configure.in Versions,\
 				      $(addsuffix /$(file),$(sysdep_dirs)))) \
 		 $(+sysdep-dist)
 
diff --git a/Makerules b/Makerules
index a339caa714..dc5f25ead0 100644
--- a/Makerules
+++ b/Makerules
@@ -278,11 +278,11 @@ endif
 
 # Generate version maps.
 ifeq ($(versioning),yes)
+ifndef no_deps
 -include $(common-objpfx)sysd-versions
 $(addprefix $(common-objpfx),$(version-maps)): $(common-objpfx)sysd-versions
 generated += $(version-maps)
 
-ifndef avoid-generated
 $(common-objpfx)sysd-versions: $(..)Versions.def $(..)scripts/versions.awk \
 			       $(wildcard $(all-subdirs:%=$(..)%/Versions)) \
 			       $(wildcard $(+sysdep_dirs:%=%/Versions))
diff --git a/csu/Versions b/csu/Versions
index 5cae3c47d0..c69503ba7b 100644
--- a/csu/Versions
+++ b/csu/Versions
@@ -1,23 +1,17 @@
 libc {
   GLIBC_2.0 {
     # global variables
-    _errno; __environ; _environ;
+    _errno;
 
     # helper functions
-    __errno_location; __libc_init_first; __libc_start_main;
+    __libc_init_first; __libc_start_main;
 
     # Exception handling support functions from libgcc
     __register_frame; __register_frame_table; __deregister_frame;
     __register_frame_info; __deregister_frame_info;
 
     # variables in normal name space
-    environ; errno;
-
-    # b*
-    brk;
-
-    # s*
-    sbrk;
+    errno;
   }
   GLIBC_2.1 {
     # global variables
diff --git a/math/Versions b/math/Versions
index 9c71d3233d..8864ef1b87 100644
--- a/math/Versions
+++ b/math/Versions
@@ -88,9 +88,6 @@ libm {
 
     # global variables
     _LIB_VERSION; signgam;
-
-    # functions used in inline functions or macros
-    __log1p; __atan2;
   }
   GLIBC_2.1 {
     # mathematical functions
@@ -151,8 +148,5 @@ libm {
     __finite; __finitef; __finitel;
     __fpclassify; __fpclassifyf; __fpclassifyl;
     __signbit; __signbitf; __signbitl;
-
-    # symbols used in macros from sysdeps/powerpc/bits/fenv.h
-    __fe_dfl_env; __fe_enabled_env; __fe_nonieee_env; __fe_nomask_env;
   }
 }
diff --git a/misc/Versions b/misc/Versions
index abde3e713c..1302c9dcd9 100644
--- a/misc/Versions
+++ b/misc/Versions
@@ -23,6 +23,9 @@ libc {
     # a*
     acct; addmntent; advance;
 
+    # b*
+    brk;
+
     # c*
     chflags; chroot; closelog;
 
@@ -70,7 +73,7 @@ libc {
     readv; remque; revoke;
 
     # s*
-    select; setdomainname; setfsent; sethostent; sethostid; sethostname;
+    sbrk; select; setdomainname; setfsent; sethostent; sethostid; sethostname;
     setlogmask; setmntent; setregid; setreuid; setttyent; setusershell; sstk;
     stty; sync; syscall; syslog;
 
diff --git a/posix/Versions b/posix/Versions
index 049d232629..afb7242359 100644
--- a/posix/Versions
+++ b/posix/Versions
@@ -15,8 +15,12 @@ libc {
     __sched_getparam; __sched_getscheduler; __sched_setscheduler;
     __sched_yield; __fork; __getpid; __wait;
 
+    # global variables
+    __environ; _environ;
+
     # variables in normal name space
-    optarg; opterr; optind; optopt; re_max_failures; re_syntax_options;
+    environ; optarg; opterr; optind; optopt;
+    re_max_failures; re_syntax_options;
 
     # a*
     alarm;
diff --git a/posix/annexc.c b/posix/annexc.c
index 8b95311314..cd387fe6ca 100644
--- a/posix/annexc.c
+++ b/posix/annexc.c
@@ -93,7 +93,7 @@ static const char *const dirent_maybe[] =
 /* <errno.h>.  */
 static const char *const errno_syms[] =
 {
-  "E2BIG", "EACCESS", "EAGAIN", "EBADF", "EBADMSG", "EBUSY", "ECANCELED",
+  "E2BIG", "EACCES", "EAGAIN", "EBADF", "EBADMSG", "EBUSY", "ECANCELED",
   "ECHILD", "EDEADLK", "EDOM", "EEXIST", "EFAULT", "EFBIG", "EINPROGRESS",
   "EINTR", "EINVAL", "EIO", "EISDIR", "EMFILE", "EMLINK", "EMSGSIZE",
   "ENAMETOOLONG", "ENFILE", "ENODEV", "ENOENT", "ENOEXEC", "ENOLCK",
@@ -316,7 +316,7 @@ static const char *const setjmp_maybe[] =
 static const char *const signal_syms[] =
 {
   "SA_NOCLDSTOP", "SA_SIGINFO", "SIGABRT", "SIGALRM", "SIGBUS", "SIGCHLD",
-  "SIGCONT", "SIGEV_NONE", "SIGEV_SIGNAL", "SIGEV_SIGNAL", "SIGEV_THREAD",
+  "SIGCONT", "SIGEV_NONE", "SIGEV_SIGNAL", "SIGEV_THREAD",
   "SIGFPE", "SIGHUP", "SIGILL", "SIGINT", "SIGKILL", "SIGPIPE", "SIGQUIT",
   "SIGRTMAX", "SIGRTMIN", "SIGSEGV", "SIGSTOP", "SIGTERM", "SIGTSTP",
   "SIGTTIN", "SIGTTOU", "SIGUSR1", "SIGUSR2", "SIG_BLOCK", "SIG_DFL",
@@ -397,8 +397,8 @@ static const char *const string_maybe[] =
 static const char *const mman_syms[] =
 {
   "MAP_FAILED", "MAP_FIXED", "MAP_PRIVATE", "MAP_SHARED", "MCL_CURRENT",
-  "MCL_FUTURE", "MS_ASYNC", "MS_INVALIDATE", "MS_ASYNC", "MS_INVALIDATE",
-  "MS_SYNC", "PROT_EXEC", "PROT_NONE", "PROT_READ", "PROT_WRITE"
+  "MCL_FUTURE", "MS_ASYNC", "MS_INVALIDATE", "MS_SYNC", "PROT_EXEC",
+  "PROT_NONE", "PROT_READ", "PROT_WRITE"
 };
 static const char *const mman_maybe[] =
 {
diff --git a/sysdeps/powerpc/Versions b/sysdeps/powerpc/Versions
new file mode 100644
index 0000000000..b7d5bf904b
--- /dev/null
+++ b/sysdeps/powerpc/Versions
@@ -0,0 +1,6 @@
+libm {
+  GLIBC_2.1 {
+    # symbols used in macros from sysdeps/powerpc/bits/fenv.h
+    __fe_dfl_env; __fe_enabled_env; __fe_nonieee_env; __fe_nomask_env;
+  }
+}
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index 52de4aa251..8a7f0f85c3 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -6,6 +6,9 @@ libc {
     # functions used in other libraries
     __clone;
 
+    # helper functions
+    __errno_location;
+
     # b*
     bdflush;