update from main archive 960818

diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h
index 15aa5325fc028b1d8a8058b7d2acff6663ef2243..f36b9ce2f45923cd15b2cc84cfaf122cb0c288aa 100644 (file)
--- a/sysdeps/m68k/dl-machine.h
+++ b/sysdeps/m68k/dl-machine.h
@@ -174,7 +174,9 @@ _dl_start_user:
        jsr (%a0)
        | Loop to call _dl_init_next for the next initializer.
        jra 0b
-1:     | Pass our finalizer function to the user in %a1.
+1:     | Clear the startup flag.
+       move.l #0, _dl_starting_up@GOT(%a5)
+       | Pass our finalizer function to the user in %a1.
        move.l _dl_fini@GOT(%a5), %a1
        | Initialize %fp with the stack pointer.
        move.l %sp, %fp

diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile
index 9d596719daf18a68ca5348ec312773d22df227a1..3908b5703c173070c64d57de9407d797bf92af7f 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/Makefile
+++ b/sysdeps/unix/sysv/linux/alpha/Makefile
@@ -2,5 +2,5 @@ ifeq ($(subdir), misc)
 sysdep_headers += alpha/ptrace.h alpha/regdef.h
 
 sysdep_routines += ieee_get_fp_control ieee_set_fp_control \
-                  sethae ioperm osf_sigprocmask fstatfs statfs
+                  sethae ioperm osf_sigprocmask fstatfs statfs llseek
 endif

diff --git a/sysdeps/unix/sysv/linux/alpha/ioperm.c b/sysdeps/unix/sysv/linux/alpha/ioperm.c
index d24eabe473b399c0ffe713142038232273c51472..a91608ff240b06fb47125be8eaad109df246a427 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/ioperm.c
+++ b/sysdeps/unix/sysv/linux/alpha/ioperm.c
@@ -52,7 +52,7 @@ I/O address space that's 512MB large!).  */
 #define vuip           volatile unsigned int *
 
 #define JENSEN_IO_BASE         (0xfffffc0300000000UL)
-#define JENSEN_MEM             (0xfffffc0200000000UL)  /* sparse!! */
+#define JENSEN_SPARSE_MEM      (0xfffffc0200000000UL)
 
 /*
  * With respect to the I/O architecture, APECS and LCA are identical,
@@ -94,7 +94,7 @@ static struct platform {
   {"EB64+",    IOSYS_APECS,    APECS_DENSE_MEM,        APECS_SPARSE_MEM},
   {"EB66",     IOSYS_APECS,    APECS_DENSE_MEM,        APECS_SPARSE_MEM},
   {"EB66P",    IOSYS_APECS,    APECS_DENSE_MEM,        APECS_SPARSE_MEM},
-  {"Jensen",   IOSYS_JENSEN,   JENSEN_MEM,             JENSEN_MEM},
+  {"Jensen",   IOSYS_JENSEN,   0,                      JENSEN_SPARSE_MEM},
   {"Mikasa",   IOSYS_APECS,    APECS_DENSE_MEM,        APECS_SPARSE_MEM},
   {"Mustang",  IOSYS_APECS,    APECS_DENSE_MEM,        APECS_SPARSE_MEM},
   {"Noname",   IOSYS_APECS,    APECS_DENSE_MEM,        APECS_SPARSE_MEM},