This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
Re: ready for 2.3?
- From: Marcus Brinkmann <Marcus dot Brinkmann at ruhr-uni-bochum dot de>
- To: libc-alpha at sources dot redhat dot com
- Date: Mon, 30 Sep 2002 14:15:49 +0200
- Subject: Re: ready for 2.3?
Hi,
didn't get the email address right the first time.
----- Forwarded message from Marcus Brinkmann <Marcus.Brinkmann@ruhr-uni-bochum.de> -----
From: Marcus Brinkmann <Marcus.Brinkmann@ruhr-uni-bochum.de>
To: Ulrich Drepper <drepper@redhat.com>
Cc: libc-alpaha@sources.redhat.com
Subject: Re: ready for 2.3?
Hi
Ulrich wrote:
> I haven't seen anybody rushing in to help. And that although they were
> on notivce for a month now. So it cannot be problematic for them.
I was crawling in to help, and spent the whole last week on compiling glibc
'gain and again until I got the overzealous hidden symbols digged out of
their hiding place. A couple of other fixes are already committed by
Roland in the last days.
The below patch seems to do it for us. It allows the minimalistic symbols
in the linker to be overridden by the symbols in glibc.
Thanks,
Marcus
2002-09-29 Marcus Brinkmann <marcus@gnu.org>
* include/stdlib.h: Remove libc_hidden_proto for abort.
* include/unistd.h: Remove libc_hidden_proto for _exit,
__libc_read, __libc_write, __getpid and __close.
* include/sys/stat.h: Remove hidden_proto for __fxstat64 and
__xstat64.
* sysdeps/generic/abort.c: Remove libc_hidden_def for abort.
* sysdeps/mach/hurd/_exit.c: Remove libc_hidden_def for _exit.
* sysdeps/mach/hurd/close.c: Remove libc_hidden_def for __close.
* sysdeps/mach/hurd/dl-sysdep.c: Remove libc_hidden_def for
__libc_read, __libc_write, __fxstat64 and __xstat64.
Remove strong alias for __GI_abort and __GI__exit.
* sysdeps/mach/hurd/read.c: Remove libc_hidden_def for __libc_read.
* sysdeps/mach/hurd/write.c: Remove libc_hidden_def for __libc_write.
* sysdeps/mach/hurd/fxstat64.c: Remove hidden_def for __fxstat64.
* sysdeps/mach/hurd/xstat64.c: Remove hidden_def for __xstat64.
Index: include/stdlib.h
===================================================================
RCS file: /cvs/glibc/libc/include/stdlib.h,v
retrieving revision 1.34
diff -u -p -r1.34 stdlib.h
--- include/stdlib.h 27 Aug 2002 23:36:11 -0000 1.34
+++ include/stdlib.h 29 Sep 2002 18:57:57 -0000
@@ -19,7 +19,6 @@ extern __typeof (strtof_l) __strtof_l;
extern __typeof (strtold_l) __strtold_l;
libc_hidden_proto (exit)
-libc_hidden_proto (abort)
libc_hidden_proto (getenv)
libc_hidden_proto (bsearch)
libc_hidden_proto (qsort)
Index: include/unistd.h
===================================================================
RCS file: /cvs/glibc/libc/include/unistd.h,v
retrieving revision 1.38
diff -u -p -r1.38 unistd.h
--- include/unistd.h 17 Sep 2002 18:41:46 -0000 1.38
+++ include/unistd.h 29 Sep 2002 18:57:57 -0000
@@ -1,7 +1,6 @@
#ifndef _UNISTD_H
# include <posix/unistd.h>
-libc_hidden_proto (_exit, __noreturn__)
libc_hidden_proto (alarm)
libc_hidden_proto (confstr)
libc_hidden_proto (execl)
@@ -41,9 +39,7 @@ libc_hidden_proto (__pwrite64)
extern ssize_t __libc_pwrite64 (int __fd, __const void *__buf, size_t __n,
__off64_t __offset);
extern ssize_t __libc_read (int __fd, void *__buf, size_t __n);
-libc_hidden_proto (__libc_read)
extern ssize_t __libc_write (int __fd, __const void *__buf, size_t __n);
-libc_hidden_proto (__libc_write)
extern int __pipe (int __pipedes[2]);
libc_hidden_proto (__pipe)
extern unsigned int __sleep (unsigned int __seconds);
@@ -79,7 +75,6 @@ extern long int __fpathconf (int __fd, i
extern long int __sysconf (int __name);
libc_hidden_proto (__sysconf)
extern __pid_t __getpid (void);
-libc_hidden_proto (__getpid)
extern __pid_t __getppid (void);
extern __pid_t __setsid (void);
extern __uid_t __getuid (void);
@@ -108,7 +103,6 @@ extern int __profil (unsigned short int
extern int __getdtablesize (void);
extern int __brk (void *__addr);
extern int __close (int __fd);
-libc_hidden_proto (__close)
extern ssize_t __read (int __fd, void *__buf, size_t __nbytes);
libc_hidden_proto (__read)
extern ssize_t __write (int __fd, __const void *__buf, size_t __n);
Index: include/sys/stat.h
===================================================================
RCS file: /cvs/glibc/libc/include/sys/stat.h,v
retrieving revision 1.13
diff -u -p -r1.13 stat.h
--- include/sys/stat.h 13 Aug 2002 00:23:12 -0000 1.13
+++ include/sys/stat.h 29 Sep 2002 18:57:58 -0000
@@ -13,11 +13,9 @@ extern int __mknod (__const char *__path
__mode_t __mode, __dev_t __dev);
#if !defined NOT_IN_libc || defined IS_IN_rtld
hidden_proto (__fxstat)
-hidden_proto (__fxstat64)
hidden_proto (__lxstat)
hidden_proto (__lxstat64)
hidden_proto (__xstat)
-hidden_proto (__xstat64)
#endif
extern __inline__ int __stat (__const char *__path, struct stat *__statbuf)
{
Index: sysdeps/generic/abort.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/generic/abort.c,v
retrieving revision 1.17
diff -u -p -r1.17 abort.c
--- sysdeps/generic/abort.c 4 Aug 2002 01:28:19 -0000 1.17
+++ sysdeps/generic/abort.c 29 Sep 2002 18:58:07 -0000
@@ -137,4 +137,3 @@ abort (void)
/* Try for ever and ever. */
ABORT_INSTRUCTION;
}
-libc_hidden_def (abort)
Index: sysdeps/mach/hurd/_exit.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/_exit.c,v
retrieving revision 1.20
diff -u -p -r1.20 _exit.c
--- sysdeps/mach/hurd/_exit.c 17 Sep 2002 05:42:07 -0000 1.20
+++ sysdeps/mach/hurd/_exit.c 29 Sep 2002 18:58:13 -0000
@@ -52,5 +52,4 @@ _exit (status)
{
_hurd_exit (W_EXITCODE (status, 0));
}
-libc_hidden_def (_exit)
weak_alias (_exit, _Exit)
Index: sysdeps/mach/hurd/close.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/close.c,v
retrieving revision 1.16
diff -u -p -r1.16 close.c
--- sysdeps/mach/hurd/close.c 3 Aug 2002 06:44:39 -0000 1.16
+++ sysdeps/mach/hurd/close.c 29 Sep 2002 18:58:13 -0000
@@ -31,5 +31,4 @@ __close (int fd)
return err ? __hurd_fail (err) : 0;
}
-libc_hidden_def (__close)
weak_alias (__close, close)
Index: sysdeps/mach/hurd/dl-sysdep.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/dl-sysdep.c,v
retrieving revision 1.74
diff -u -p -r1.74 dl-sysdep.c
--- sysdeps/mach/hurd/dl-sysdep.c 28 Sep 2002 19:45:28 -0000 1.74
+++ sysdeps/mach/hurd/dl-sysdep.c 29 Sep 2002 18:58:15 -0000
@@ -378,7 +378,6 @@ __libc_read (int fd, void *buf, size_t n
return nread;
}
-libc_hidden_weak (__libc_read)
__ssize_t weak_function
__libc_write (int fd, const void *buf, size_t nbytes)
@@ -394,7 +393,6 @@ __libc_write (int fd, const void *buf, s
return nwrote;
}
-libc_hidden_weak (__libc_write)
/* This is only used for printing messages (see dl-misc.c). */
__ssize_t weak_function
@@ -513,7 +511,6 @@ __fxstat64 (int vers, int fd, struct sta
return 0;
}
-libc_hidden_def (__fxstat64)
int weak_function
__xstat64 (int vers, const char *file, struct stat64 *buf)
@@ -531,7 +528,6 @@ __xstat64 (int vers, const char *file, s
return 0;
}
-libc_hidden_def (__xstat64)
/* This function is called by the dynamic linker (rtld.c) to check
whether debugging malloc is allowed even for SUID binaries. This
@@ -579,9 +575,6 @@ _exit (int status)
while (__task_terminate (__mach_task_self ()))
__mach_task_self_ = (__mach_task_self) ();
}
-/* We need this alias to satisfy references from libc_pic.a objects
- that were affected by the libc_hidden_proto declaration for _exit. */
-strong_alias (_exit, __GI__exit)
/* Try to get a machine dependent instruction which will make the
program crash. This is used in case everything else fails. */
@@ -606,9 +599,6 @@ abort (void)
ABORT_INSTRUCTION;
}
-/* We need this alias to satisfy references from libc_pic.a objects
- that were affected by the libc_hidden_proto declaration for abort. */
-strong_alias (abort, __GI_abort)
/* This function is called by interruptible RPC stubs. For initial
dynamic linking, just use the normal mach_msg. Since this defn is
Index: sysdeps/mach/hurd/fxstat64.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/fxstat64.c,v
retrieving revision 1.5
diff -u -p -r1.5 fxstat64.c
--- sysdeps/mach/hurd/fxstat64.c 13 Aug 2002 00:23:10 -0000 1.5
+++ sysdeps/mach/hurd/fxstat64.c 29 Sep 2002 18:58:15 -0000
@@ -38,6 +38,5 @@ __fxstat64 (int vers, int fd, struct sta
return 0;
}
-hidden_def (__fxstat64)
#endif
Index: sysdeps/mach/hurd/getpid.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/getpid.c,v
retrieving revision 1.8
diff -u -p -r1.8 getpid.c
--- sysdeps/mach/hurd/getpid.c 4 Aug 2002 03:30:39 -0000 1.8
+++ sysdeps/mach/hurd/getpid.c 29 Sep 2002 18:58:15 -0000
@@ -27,6 +27,5 @@ __getpid ()
/* Assumes atomic word fetch and store, so doesn't lock _hurd_pid_lock. */
return _hurd_pid;
}
-libc_hidden_def (__getpid)
weak_alias (__getpid, getpid)
libc_hidden_weak (getpid)
Index: sysdeps/mach/hurd/read.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/read.c,v
retrieving revision 1.20
diff -u -p -r1.20 read.c
--- sysdeps/mach/hurd/read.c 3 Aug 2002 06:53:03 -0000 1.20
+++ sysdeps/mach/hurd/read.c 29 Sep 2002 18:58:15 -0000
@@ -27,7 +27,6 @@ __libc_read (int fd, void *buf, size_t n
error_t err = HURD_FD_USE (fd, _hurd_fd_read (descriptor, buf, &nbytes, -1));
return err ? __hurd_dfail (fd, err) : nbytes;
}
-libc_hidden_def (__libc_read)
weak_alias (__libc_read, __read)
libc_hidden_weak (__read)
weak_alias (__libc_read, read)
Index: sysdeps/mach/hurd/write.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/write.c,v
retrieving revision 1.20
diff -u -p -r1.20 write.c
--- sysdeps/mach/hurd/write.c 3 Aug 2002 06:54:54 -0000 1.20
+++ sysdeps/mach/hurd/write.c 29 Sep 2002 18:58:15 -0000
@@ -27,7 +27,6 @@ __libc_write (int fd, const void *buf, s
buf, &nbytes, -1));
return err ? __hurd_dfail (fd, err) : nbytes;
}
-libc_hidden_def (__libc_write)
weak_alias (__libc_write, __write)
libc_hidden_weak (__write)
weak_alias (__libc_write, write)
Index: sysdeps/mach/hurd/xstat64.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/xstat64.c,v
retrieving revision 1.4
diff -u -p -r1.4 xstat64.c
--- sysdeps/mach/hurd/xstat64.c 13 Aug 2002 00:23:10 -0000 1.4
+++ sysdeps/mach/hurd/xstat64.c 29 Sep 2002 18:58:16 -0000
@@ -42,6 +42,5 @@ __xstat64 (int vers, const char *file, s
return __hurd_fail (err);
return 0;
}
-hidden_def (__xstat64)
#endif
--
`Rhubarb is no Egyptian god.' GNU http://www.gnu.org marcus@gnu.org
Marcus Brinkmann The Hurd http://www.gnu.org/software/hurd/
Marcus.Brinkmann@ruhr-uni-bochum.de
http://www.marcus-brinkmann.de/