update from main archive 960829

diff --git a/bare/Makefile b/bare/Makefile
index 588a713c83bd14a9c9e183c572c1e0e22711e485..573515347cb910c4a8bd4404c02e6a6c97ad4076 100644 (file)
--- a/bare/Makefile
+++ b/bare/Makefile
@@ -48,7 +48,7 @@ $(objpfx)lib$(config-vendor).a: $(bare-routines:%=$(objpfx)%.o)
 # from scratch each time.
        rm -f $@
 ifdef objdir
-       cd $(objdir); $(AR) cq$(verbose) $@ $(^:$(objpfx)%=%)
+       cd $(objpfx); $(AR) cq$(verbose) $(@:$(objpfx)%=%) $(^:$(objpfx)%=%)
 else
        $(AR) cq$(verbose) $@ $^
 endif

diff --git a/sysdeps/unix/sysv/linux/alpha/Dist b/sysdeps/unix/sysv/linux/alpha/Dist
index 5c0e8d1c7eaf5a1bac1d195b7ec97366dbc5e290..79ac03ff90dd567e9c84d16d4104fd7bfac7b969 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/Dist
+++ b/sysdeps/unix/sysv/linux/alpha/Dist
@@ -1,4 +1,5 @@
-alpha/ptrace.h alpha/regdef.h
+alpha/ptrace.halpha/regdef.h
 ieee_get_fp_control.S ieee_set_fp_control.S
 ioperm.c
 init-first.h
+clone.S

diff --git a/sysdeps/unix/sysv/linux/m68k/Dist b/sysdeps/unix/sysv/linux/m68k/Dist
index 2c6d09e88f6cdf53a39445781a37171eb04e5ebf..a281cba3f941863b764236967c7556aa598875b9 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/Dist
+++ b/sysdeps/unix/sysv/linux/m68k/Dist
@@ -1 +1,2 @@
 init-first.h
+clone.S