Update.

	* elf/Versions [libc, GLIBC_2.01]: Add _dl_global_scope_alloc.
	* elf/dl-open.c (_dl_global_scope_alloc): Move definition to
	* elf/dl-deps.c: ...here.
	* elf/dl-open.c (dl_open_worker): Call _dl_map_object_deps with
	new parameter and expect result.  Remove code handling RTLD_GLOBAL.
	Add return value of _dl_map_object_deps to
	_dl_main_searchlist->r_nlist.
	* elf/dl-deps.c (_dl_map_object_deps): Change to return value.
	If we parameter GLOBAL is nonzero add object and dependencies to
	the global scope.
	* elf/ldsodefs.h: Adapt prototype for _dl_map_object_deps.
	* elf/rtld.c (dl_main): Call _dl_map_object_deps with new parameter.
	Mark all objects as in global scope.
	* elf/dl-object.c (_dl_new_object): Initialize l_global to zero.

	* sysdeps/unix/sysv/linux/bits/sockunion.h: Add Econet support.

	* sysdeps/unix/sysv/linux/i386/sysdep.h: Add .L prefix to symbols
	used in macro magic.

1998-11-02  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
 
        * sysdeps/unix/sysv/linux/netatalk/at.h: Include <linux/atalk.h> 
        before <sys/socket.h> to make sockaddr_at available to 
        <sys/socket.h>. 

	* posix/glob.h: Remove __P from parameter lists of declarations.
 
1998-11-02  Andreas Jaeger  <aj@arthur.rhein-neckar.de> 
 
	* time/tzset.c (tz_compute): Remove unused parameter timer. 
	Change caller. 
 
1998-11-02  Mark Kettenis  <kettenis@phys.uva.nl> 
 
	* sysdeps/generic/bits/types.h (__ipc_pid_t): New typedef. 
 
1998-11-02  Ulrich Drepper  <drepper@cygnus.com>

4 files changed, 17 insertions, 12 deletions

diff --git a/sysdeps/generic/bits/types.h b/sysdeps/generic/bits/types.h
index 8bb6c78b6a..e34ad727a9 100644
--- a/sysdeps/generic/bits/types.h
+++ b/sysdeps/generic/bits/types.h
@@ -109,6 +109,9 @@ typedef struct
 #endif
   } __fd_set;
 
+/* XXX Used in `struct shmid_ds'.  */
+typedef unsigned short int __ipc_pid_t;
+
 
 /* Types from the Large File Support interface.  */
 
diff --git a/sysdeps/unix/sysv/linux/bits/sockunion.h b/sysdeps/unix/sysv/linux/bits/sockunion.h
index 1645e6e87d..c65cf84b0a 100644
--- a/sysdeps/unix/sysv/linux/bits/sockunion.h
+++ b/sysdeps/unix/sysv/linux/bits/sockunion.h
@@ -24,6 +24,7 @@
 #include <netash/ash.h>
 #include <netatalk/at.h>
 #include <netax25/ax25.h>
+#include <neteconet/ec.h>
 #include <netinet/in.h>
 #include <netipx/ipx.h>
 #include <netrose/rose.h>
@@ -37,6 +38,7 @@ union sockaddr_union
     struct sockaddr_ash sash;
     struct sockaddr_at sat;
     struct sockaddr_ax25 sax25;
+    struct sockaddr_ec sec;
     struct sockaddr_in sin;
     struct sockaddr_in6 sin6;
     struct sockaddr_ipx sipx;
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 910cf3fe8c..a6971ff45f 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -202,14 +202,14 @@
 
 /* We need some help from the assembler to generate optimal code.  We
    define some macros here which later will be used.  */
-asm ("__X'%ebx = 1\n\t"
-     "__X'%ecx = 2\n\t"
-     "__X'%edx = 2\n\t"
-     "__X'%eax = 3\n\t"
-     "__X'%esi = 3\n\t"
-     "__X'%edi = 3\n\t"
-     "__X'%ebp = 3\n\t"
-     "__X'%esp = 3\n\t"
+asm (".L__X'%ebx = 1\n\t"
+     ".L__X'%ecx = 2\n\t"
+     ".L__X'%edx = 2\n\t"
+     ".L__X'%eax = 3\n\t"
+     ".L__X'%esi = 3\n\t"
+     ".L__X'%edi = 3\n\t"
+     ".L__X'%ebp = 3\n\t"
+     ".L__X'%esp = 3\n\t"
      ".macro bpushl name reg\n\t"
      ".if 1 - \\name\n\t"
      ".if 2 - \\name\n\t"
@@ -243,11 +243,11 @@ asm ("__X'%ebx = 1\n\t"
   ({									      \
     unsigned int resultvar;						      \
     asm volatile (							      \
-    "bpushl __X'%k2, %k2\n\t"						      \
-    "bmovl __X'%k2, %k2\n\t"						      \
+    "bpushl .L__X'%k2, %k2\n\t"						      \
+    "bmovl .L__X'%k2, %k2\n\t"						      \
     "movl %1, %%eax\n\t"						      \
     "int $0x80\n\t"							      \
-    "bpopl __X'%k2, %k2\n\t"						      \
+    "bpopl .L__X'%k2, %k2\n\t"						      \
     : "=a" (resultvar)							      \
     : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc");		      \
     if (resultvar >= 0xfffff001)					      \
diff --git a/sysdeps/unix/sysv/linux/netatalk/at.h b/sysdeps/unix/sysv/linux/netatalk/at.h
index 4c586106c6..83a94f39b9 100644
--- a/sysdeps/unix/sysv/linux/netatalk/at.h
+++ b/sysdeps/unix/sysv/linux/netatalk/at.h
@@ -20,8 +20,8 @@
 #define _NETATALK_AT_H 1
 
 #include <asm/types.h>
-#include <sys/socket.h>
 #include <linux/atalk.h>
+#include <sys/socket.h>
 
 #define SOL_ATALK       258     /* sockopt level for atalk */