diff --git a/ChangeLog b/ChangeLog
index aaca161caa..e70932b50f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
+Mon Mar 13 01:48:16 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* Makefile ($(libc.a)(__.SYMDEF)): Target removed.
+	[$(build-shared)=yes] (lib): Depend on $(common-objpfx)libc.so.
+
 Sun Mar 12 18:21:10 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* sysdeps/stub/ulimit.c: Don't include gnu-stabs.h.
+	* sysdeps/stub/pause.c: Likewise.
+	* sysdeps/stub/time.c: Likewise.
+
+	* stdlib/mbtowc.c: #if 0 out code for non-ASCII chars until the
+ 	locale data format is implemented.
+	* stdlib/wctomb.c: Likewise.
+
+	* mach/Makefile ($(objpfx)errsystems.c): Reenable this rule; the
+ 	gcc bug is fixed.
+	* mach/errsystems.c: File removed.
+
+	* Makeconfig (libc.a): Variable removed.
+	(+link): Don't use it.
+
+	* configure.in (AC_ARG_ENABLE calls): Use $enableval instead of
+ 	assuming `yes'.
+
 	* malloc/malloc.h (_malloc_internal, _realloc_internal): Declare these.
 	* malloc/realloc.c (_realloc_internal): Renamed from realloc;
  	don't use __realloc_hook.
diff --git a/Makefile b/Makefile
index 3b1cefa7ae..e3ec603ced 100644
--- a/Makefile
+++ b/Makefile
@@ -103,8 +103,13 @@ include Makerules
 # Install from subdirectories too.
 install: subdir_install
 
-lib-noranlib $(libc.a)(__.SYMDEF): subdir_lib
+# Build subdirectory lib objects.
+lib-noranlib: subdir_lib
 
+ifeq (yes,$(build-shared))
+# Build the shared object from the PIC object library.
+lib: $(common-objpfx)libc.so
+endif
 
 $(objpfx)sysd-dirs: $(+sysdir_pfx)config.make
 	(echo define sysdep-subdirs;					      \
diff --git a/sysdeps/stub/pause.c b/sysdeps/stub/pause.c
index 6d268643aa..b2a7adde76 100644
--- a/sysdeps/stub/pause.c
+++ b/sysdeps/stub/pause.c
@@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#include <ansidecl.h>
 #include <errno.h>
 #include <unistd.h>
 
@@ -25,18 +24,10 @@ Cambridge, MA 02139, USA.  */
    This is supposed to always return -1 and set errno to EINTR,
    but rules were meant to be broken.  */
 int
-DEFUN_VOID(pause)
+pause ()
 {
   errno = ENOSYS;
-  return(-1);
+  return -1;
 }
 
-
-
-#ifdef	 HAVE_GNU_LD
-
-#include <gnu-stabs.h>
-
-stub_warning(pause);
-
-#endif	/* GNU stabs.  */
+stub_warning (pause)
diff --git a/sysdeps/stub/time.c b/sysdeps/stub/time.c
index bc1d3fccfe..cb208bcf0b 100644
--- a/sysdeps/stub/time.c
+++ b/sysdeps/stub/time.c
@@ -16,14 +16,13 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#include <ansidecl.h>
 #include <errno.h>
 #include <time.h>
 
-
 /* Return the time now, and store it in *TIMER if not NULL.  */
 time_t
-DEFUN(time, (timer), time_t *timer)
+time (timer)
+     time_t *timer;
 {
   errno = ENOSYS;
 
@@ -32,12 +31,4 @@ DEFUN(time, (timer), time_t *timer)
   return (time_t) -1;
 }
 
-
-
-#ifdef	 HAVE_GNU_LD
-
-#include <gnu-stabs.h>
-
-stub_warning(time);
-
-#endif	/* GNU stabs.  */
+stub_warning (time)
diff --git a/sysdeps/stub/ulimit.c b/sysdeps/stub/ulimit.c
index aa9e515983..84633c4e14 100644
--- a/sysdeps/stub/ulimit.c
+++ b/sysdeps/stub/ulimit.c
@@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#include <ansidecl.h>
 #include <sys/resource.h>
 #include <errno.h>
 
@@ -29,17 +28,13 @@ Cambridge, MA 02139, USA.  */
        can open.
    Returns -1 on errors.  */
 long int
-DEFUN(__ulimit, (cmd, newlimit), int cmd AND long int newlimit)
+__ulimit (cmd, newlimit)
+     int cmd;
+     long int newlimit;
 {
   errno = ENOSYS;
   return -1;
 }
+weak_alias (__ulimit, ulimit)
 
-
-#ifdef	 HAVE_GNU_LD
-
-#include <gnu-stabs.h>
-
-stub_warning(__ulimit);
-
-#endif	/* GNU stabs.  */
+stub_warning (ulimit)