* [PATCH] 7 more .plt slots killed (in linuxthreads build)
@ 2002-12-31 7:34 Jakub Jelinek
2002-12-31 9:51 ` [PATCH] Fix for 7 more .plt slots patch Jakub Jelinek
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2002-12-31 7:34 UTC (permalink / raw)
To: Ulrich Drepper, Roland McGrath; +Cc: Glibc hackers
Hi!
In NPTL build it will be less (I guess 4), NPTL build is still running.
2002-12-31 Jakub Jelinek <jakub@redhat.com>
* hurd/errno-loc.c (__errno_location): Add libc_hidden_def.
* include/sys/socket.h (accept): Add libc_hidden_proto.
* include/errno.h (__errno_location): Likewise.
* include/netdb.h (__h_errno_location): Likewise.
* include/resolv.h (__res_state): Likewise.
* include/unistd.h (__lseek): Likewise.
* sysdeps/generic/errno-loc.c (__errno_location): Add libc_hidden_def.
* sysdeps/generic/herrno-loc.c (__h_errno_location): Likewise.
* sysdeps/generic/res-state.c (__res_state): Likewise.
* sysdeps/generic/accept.c (accept): Likewise.
* sysdeps/generic/lseek.c (__lseek): Likewise.
* sysdeps/generic/allocrtsig.c (__libc_current_sigrtmin,
__libc_current_sigrtmax): Likewise.
* sysdeps/mach/hurd/accept.c (accept): Likewise.
* sysdeps/mach/hurd/lseek.c (__lseek): Likewise.
* sysdeps/unix/sysv/aix/accept.c (accept): Likewise.
* sysdeps/unix/sysv/aix/lseek.c (__lseek): Likewise.
* sysdeps/unix/sysv/linux/accept.S (accept): Likewise.
* sysdeps/unix/inet/syscalls.list (__GI_accept): New alias to accept.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__GI_accept): Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list (__GI_accept): Likewise.
* sysdeps/unix/sysv/linux/ia64/syscalls.list (__GI___lseek): New
alias to llseek.
(__GI_accept): New alias to accept.
* sysdeps/unix/sysv/linux/mips/syscalls.list (__GI_accept): Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (__GI___lseek):
New alias to llseek.
(__GI_accept): New alias to accept.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list (__GI_accept):
Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list (__GI_accept):
Likewise.
* sysdeps/unix/syscalls.list (__GI___lseek): New alias to lseek.
linuxthreads/
* sysdeps/pthread/errno-loc.c (__errno_location): Add
libc_hidden_def.
* sysdeps/pthread/herrno-loc.c (__h_errno_location): Likewise.
* sysdeps/pthread/res-state.c (__res_state): Likewise.
* sysdeps/unix/sysv/linux/allocrtsig.c (__libc_current_sigrtmin,
__libc_current_sigrtmax): Likewise.
* Versions [libc] (GLIBC_PRIVATE): Remove __libc_internal_tsd_get,
__libc_internal_tsd_set, __libc_internal_tsd_address,
__libc_alloca_cutoff.
[libpthread] (GLIBC_PRIVATE): Remove __libc_internal_tsd_get,
__libc_internal_tsd_set, __libc_internal_tsd_address.
nptl/
* sysdeps/unix/sysv/linux/allocrtsig.c (__libc_current_sigrtmin,
__libc_current_sigrtmax): Add libc_hidden_def.
--- libc/hurd/errno-loc.c.jj 2002-10-18 10:18:44.000000000 +0200
+++ libc/hurd/errno-loc.c 2002-12-31 14:54:30.000000000 +0100
@@ -26,3 +26,4 @@ __errno_location (void)
return (int *) __hurd_threadvar_location (_HURD_THREADVAR_ERRNO);
}
strong_alias (__errno_location, __hurd_errno_location)
+libc_hidden_def (__errno_location)
--- libc/include/sys/socket.h.jj 2002-09-28 22:36:59.000000000 +0200
+++ libc/include/sys/socket.h 2002-12-31 15:06:21.000000000 +0100
@@ -118,6 +118,7 @@ extern int __listen (int __fd, int __n)
extern int __libc_accept (int __fd, __SOCKADDR_ARG __addr,
socklen_t *__restrict __addr_len)
__THROW;
+libc_hidden_proto (accept)
/* Return the length of a `sockaddr' structure. */
#ifdef _HAVE_SA_LEN
--- libc/include/errno.h.jj 2002-11-27 12:29:37.000000000 +0100
+++ libc/include/errno.h 2002-12-31 14:52:59.000000000 +0100
@@ -29,6 +29,8 @@ extern int errno attribute_hidden;
# define errno errno /* For #ifndef errno tests. */
# endif
extern __thread int errno attribute_tls_model_ie;
+# else
+libc_hiden_proto (__errno_location)
# endif
# endif /* RTLD_PRIVATE_ERRNO */
--- libc/include/netdb.h.jj 2002-10-18 10:19:34.000000000 +0200
+++ libc/include/netdb.h 2002-12-31 14:58:36.000000000 +0100
@@ -14,6 +14,7 @@
extern __thread int h_errno attribute_tls_model_ie;
# define __set_h_errno(x) (h_errno = (x))
# else
+libc_hidden_proto (__h_errno_location)
static inline int
__set_h_errno (int __err)
{
--- libc/include/resolv.h.jj 2002-10-18 10:19:34.000000000 +0200
+++ libc/include/resolv.h 2002-12-31 15:01:00.000000000 +0100
@@ -20,6 +20,8 @@
# define _res __libc_res
# endif
extern __thread struct __res_state _res attribute_tls_model_ie;
+# else
+libc_hidden_proto (__res_state)
# endif
# else
# ifndef __BIND_NOSTATIC
--- libc/include/unistd.h.jj 2002-12-31 14:32:56.000000000 +0100
+++ libc/include/unistd.h 2002-12-31 15:18:46.000000000 +0100
@@ -21,6 +21,7 @@ extern int __access (__const char *__nam
extern int __euidaccess (__const char *__name, int __type);
extern __off64_t __lseek64 (int __fd, __off64_t __offset, int __whence);
extern __off_t __lseek (int __fd, __off_t __offset, int __whence);
+libc_hidden_proto (__lseek)
extern __off_t __libc_lseek (int __fd, __off_t __offset, int __whence);
extern __off64_t __libc_lseek64 (int __fd, __off64_t __offset, int __whence);
extern ssize_t __pread (int __fd, void *__buf, size_t __nbytes,
--- libc/linuxthreads/sysdeps/pthread/errno-loc.c.jj 2002-12-28 11:55:45.000000000 +0100
+++ libc/linuxthreads/sysdeps/pthread/errno-loc.c 2002-12-31 14:53:32.000000000 +0100
@@ -42,3 +42,4 @@ __errno_location (void)
#endif
return &errno;
}
+libc_hidden_def (__errno_location)
--- libc/linuxthreads/sysdeps/pthread/herrno-loc.c.jj 2002-12-28 11:55:45.000000000 +0100
+++ libc/linuxthreads/sysdeps/pthread/herrno-loc.c 2002-12-31 14:59:02.000000000 +0100
@@ -39,3 +39,4 @@ __h_errno_location (void)
#endif
return &h_errno;
}
+libc_hidden_def (__h_errno_location)
--- libc/linuxthreads/sysdeps/pthread/res-state.c.jj 2002-12-28 11:55:45.000000000 +0100
+++ libc/linuxthreads/sysdeps/pthread/res-state.c 2002-12-31 15:01:28.000000000 +0100
@@ -41,3 +41,4 @@ __res_state (void)
#endif
return &_res;
}
+libc_hidden_def (__res_state)
--- libc/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c.jj 2002-12-18 13:43:50.000000000 +0100
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c 2002-12-31 15:54:53.000000000 +0100
@@ -57,6 +57,7 @@ __libc_current_sigrtmin (void)
return current_rtmin;
}
strong_alias (__libc_current_sigrtmin, __libc_current_sigrtmin_private);
+libc_hidden_def (__libc_current_sigrtmin)
/* Return number of available real-time signal with lowest priority. */
int
@@ -67,6 +68,7 @@ __libc_current_sigrtmax (void)
return current_rtmax;
}
strong_alias (__libc_current_sigrtmax, __libc_current_sigrtmax_private);
+libc_hidden_def (__libc_current_sigrtmax)
/* Allocate real-time signal with highest/lowest available
priority. Please note that we don't use a lock since we assume
--- libc/linuxthreads/Versions.jj 2002-12-28 11:55:44.000000000 +0100
+++ libc/linuxthreads/Versions 2002-12-31 15:48:45.000000000 +0100
@@ -18,8 +18,6 @@ libc {
}
GLIBC_PRIVATE {
# Internal libc interface to libpthread
- __libc_internal_tsd_get; __libc_internal_tsd_set;
- __libc_internal_tsd_address; __libc_alloca_cutoff;
__libc_dl_error_tsd;
__libc_pthread_init; __libc_current_sigrtmin_private;
@@ -160,8 +158,6 @@ libpthread {
}
GLIBC_PRIVATE {
# Internal libc interface to libpthread
- __libc_internal_tsd_get; __libc_internal_tsd_set;
- __libc_internal_tsd_address;
__pthread_kill_other_threads_np;
}
}
--- libc/sysdeps/generic/errno-loc.c.jj 2002-11-08 01:19:13.000000000 +0100
+++ libc/sysdeps/generic/errno-loc.c 2002-12-31 14:54:05.000000000 +0100
@@ -34,3 +34,4 @@ __errno_location (void)
{
return &errno;
}
+libc_hidden_def (__errno_location)
--- libc/sysdeps/generic/herrno-loc.c.jj 2002-12-28 11:56:20.000000000 +0100
+++ libc/sysdeps/generic/herrno-loc.c 2002-12-31 14:59:25.000000000 +0100
@@ -31,3 +31,4 @@ __h_errno_location (void)
{
return &h_errno;
}
+libc_hidden_def (__h_errno_location)
--- libc/sysdeps/generic/res-state.c.jj 2002-12-28 11:56:21.000000000 +0100
+++ libc/sysdeps/generic/res-state.c 2002-12-31 15:01:54.000000000 +0100
@@ -33,3 +33,4 @@ __res_state (void)
{
return &_res;
}
+libc_hidden_def (__res_state)
--- libc/sysdeps/generic/accept.c.jj 2001-07-09 20:57:55.000000000 +0200
+++ libc/sysdeps/generic/accept.c 2002-12-31 15:05:05.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -33,6 +33,7 @@ accept (fd, addr, addr_len)
__set_errno (ENOSYS);
return -1;
}
+libc_hidden_def (accept)
stub_warning (accept)
--- libc/sysdeps/generic/lseek.c.jj 2001-07-09 20:57:59.000000000 +0200
+++ libc/sysdeps/generic/lseek.c 2002-12-31 15:19:26.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -47,6 +47,7 @@ __lseek (fd, offset, whence)
return -1;
}
stub_warning (lseek)
+libc_hidden_def (__lseek)
weak_alias (__lseek, lseek)
#include <stub-tag.h>
--- libc/sysdeps/generic/allocrtsig.c.jj 2002-11-08 01:19:12.000000000 +0100
+++ libc/sysdeps/generic/allocrtsig.c 2002-12-31 15:55:05.000000000 +0100
@@ -62,6 +62,7 @@ __libc_current_sigrtmin (void)
#endif
return current_rtmin;
}
+libc_hidden_def (__libc_current_sigrtmin)
/* Return number of available real-time signal with lowest priority. */
int
@@ -73,6 +74,7 @@ __libc_current_sigrtmax (void)
#endif
return current_rtmax;
}
+libc_hidden_def (__libc_current_sigrtmax)
/* Allocate real-time signal with highest/lowest available
priority. Please note that we don't use a lock since we assume
--- libc/sysdeps/mach/hurd/accept.c.jj 2001-07-09 20:58:17.000000000 +0200
+++ libc/sysdeps/mach/hurd/accept.c 2002-12-31 15:04:18.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1993, 1994, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1993,1994,1997,1999,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -84,3 +84,4 @@ accept (fd, addrarg, addr_len)
return _hurd_intern_fd (new, O_IGNORE_CTTY, 1);
}
+libc_hidden_def (accept)
--- libc/sysdeps/mach/hurd/lseek.c.jj 2002-06-19 16:41:53.000000000 +0200
+++ libc/sysdeps/mach/hurd/lseek.c 2002-12-31 15:19:43.000000000 +0100
@@ -27,4 +27,5 @@ __libc_lseek (int fd, off_t offset, int
}
weak_alias (__libc_lseek, __lseek)
+libc_hidden_def (__lseek)
weak_alias (__libc_lseek, lseek)
--- libc/sysdeps/unix/inet/syscalls.list.jj 2002-12-16 09:16:31.000000000 +0100
+++ libc/sysdeps/unix/inet/syscalls.list 2002-12-31 15:07:25.000000000 +0100
@@ -1,6 +1,6 @@
# File name Caller Syscall name # args Strong name Weak names
-accept - accept Ci:iBN __libc_accept accept
+accept - accept Ci:iBN __libc_accept accept __GI_accept
bind - bind i:ipi __bind bind
connect - connect Ci:ipi __libc_connect __connect __connect_internal connect
gethostid - gethostid i: gethostid
@@ -21,7 +21,3 @@ setsockopt - setsockopt i:iiibn setsocko
shutdown - shutdown i:ii shutdown
socket - socket i:iii __socket socket
socketpair - socketpair i:iiif socketpair
-
-
-
-
--- libc/sysdeps/unix/sysv/aix/accept.c.jj 2001-07-09 20:58:35.000000000 +0200
+++ libc/sysdeps/unix/sysv/aix/accept.c 2002-12-31 15:04:28.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -27,3 +27,4 @@ accept (int fd, __SOCKADDR_ARG addr, soc
assert (sizeof (socklen_t) == sizeof (int));
return naccept (fd, addr.__sockaddr__, addr_len);
}
+libc_hidden_def (accept)
--- libc/sysdeps/unix/sysv/aix/lseek.c.jj 2000-12-09 17:56:52.000000000 +0100
+++ libc/sysdeps/unix/sysv/aix/lseek.c 2002-12-31 15:20:03.000000000 +0100
@@ -7,3 +7,4 @@ __lseek (int fd, off_t offset, int whenc
return lseek (fd, offset, whence);
}
strong_alias (__lseek, __libc_lseek)
+libc_hidden_def (__lseek)
--- libc/sysdeps/unix/sysv/linux/alpha/syscalls.list.jj 2002-12-18 13:44:33.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/alpha/syscalls.list 2002-12-31 15:07:37.000000000 +0100
@@ -36,7 +36,7 @@ sys_ustat ustat ustat 2 __syscall_ustat
sys_mknod xmknod mknod 3 __syscall_mknod
# proper socket implementations:
-accept - accept C:3 __libc_accept __accept accept
+accept - accept C:3 __libc_accept __accept accept __GI_accept
bind - bind 3 __bind bind
connect - connect C:3 __libc_connect __connect_internal __connect connect
getpeername - getpeername 3 __getpeername getpeername
--- libc/sysdeps/unix/sysv/linux/hppa/syscalls.list.jj 2002-12-18 13:44:34.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/hppa/syscalls.list 2002-12-31 15:07:53.000000000 +0100
@@ -14,7 +14,7 @@ semget - semget i:iii __semget semget
semctl - semctl i:iiii __semctl semctl
# proper socket implementations:
-accept - accept Ci:iBN __libc_accept __accept accept
+accept - accept Ci:iBN __libc_accept __accept accept __GI_accept
bind - bind i:ipi __bind bind
connect - connect Ci:ipi __libc_connect __connect_internal __connect connect
getpeername - getpeername i:ipp __getpeername getpeername
--- libc/sysdeps/unix/sysv/linux/ia64/syscalls.list.jj 2002-12-18 13:44:34.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/ia64/syscalls.list 2002-12-31 15:22:34.000000000 +0100
@@ -3,7 +3,7 @@
umount2 - umount 2 __umount2 umount2
# Whee! 64-bit systems naturally implement llseek.
-llseek EXTRA lseek C:3 __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
+llseek EXTRA lseek C:3 __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64 __GI___lseek
lseek llseek -
pread - pread C:4 __libc_pread __libc_pread64 __pread pread __pread64 pread64
pwrite - pwrite C:4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
@@ -33,7 +33,7 @@ semget - semget i:iii __semget semget
semctl - semctl i:iiii __semctl semctl
# proper socket implementations:
-accept - accept Ci:iBN __libc_accept __accept accept
+accept - accept Ci:iBN __libc_accept __accept accept __GI_accept
bind - bind i:ipi __bind bind
connect - connect Ci:ipi __libc_connect __connect_internal __connect connect
getpeername - getpeername i:ipp __getpeername getpeername
--- libc/sysdeps/unix/sysv/linux/mips/syscalls.list.jj 2002-12-17 16:50:47.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/mips/syscalls.list 2002-12-31 15:08:15.000000000 +0100
@@ -14,7 +14,7 @@ s_sigsuspend sigsuspend sigsuspend i:p _
# Socket functions; Linux/MIPS doesn't use the socketcall(2) wrapper;
# it's provided for compatibility, though.
#
-accept - accept Ci:iBN __libc_accept __accept accept
+accept - accept Ci:iBN __libc_accept __accept accept __GI_accept
bind - bind i:ipi __bind bind
connect - connect Ci:ipi __libc_connect __connect_internal __connect connect
getpeername - getpeername i:ipp __getpeername getpeername
--- libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list.jj 2002-12-18 13:44:34.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list 2002-12-31 15:22:43.000000000 +0100
@@ -1,6 +1,6 @@
# File name Caller Syscall name # args Strong name Weak names
-llseek EXTRA lseek C:3 __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
+llseek EXTRA lseek C:3 __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64 __GI___lseek
lseek llseek -
pread - pread C:4 __libc_pread __libc_pread64 __pread pread __pread64 pread64
pwrite - pwrite C:4 __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
@@ -26,7 +26,7 @@ semget - semget i:iii __semget semget
semctl - semctl i:iiii __semctl semctl
# proper socket implementations:
-accept - accept Ci:iBN __libc_accept __accept accept
+accept - accept Ci:iBN __libc_accept __accept accept __GI_accept
bind - bind i:ipi __bind bind
connect - connect Ci:ipi __libc_connect __connect_internal __connect connect
getpeername - getpeername i:ipp __getpeername getpeername
--- libc/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list.jj 2002-12-16 09:16:33.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list 2002-12-31 15:08:32.000000000 +0100
@@ -16,7 +16,7 @@ sendfile - sendfile i:iipi sendfile send
# Override select.S in parent directory:
select - select C:5 __select select
-accept - accept C:3 __libc_accept __accept accept
+accept - accept C:3 __libc_accept __accept accept __GI_accept
bind - bind 3 __bind bind
connect - connect C:3 __libc_connect __connect_internal __connect connect
getpeername - getpeername 3 __getpeername getpeername
--- libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list.jj 2002-12-18 13:44:34.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/x86_64/syscalls.list 2002-12-31 15:08:40.000000000 +0100
@@ -30,7 +30,7 @@ semctl - semctl i:iiii __semctl semctl
# proper socket implementations:
-accept - accept Ci:iBN __libc_accept __accept accept
+accept - accept Ci:iBN __libc_accept __accept accept __GI_accept
bind - bind i:ipi __bind bind
connect - connect Ci:ipi __libc_connect __connect_internal __connect connect
getpeername - getpeername i:ipp __getpeername getpeername
--- libc/sysdeps/unix/sysv/linux/accept.S.jj 2002-12-16 09:16:32.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/accept.S 2002-12-31 15:04:44.000000000 +0100
@@ -3,3 +3,4 @@
#define NARGS 3
#define NEED_CANCELLATION
#include <socket.S>
+libc_hidden_def (accept)
--- libc/sysdeps/unix/syscalls.list.jj 2002-12-16 09:16:31.000000000 +0100
+++ libc/sysdeps/unix/syscalls.list 2002-12-31 15:22:02.000000000 +0100
@@ -24,7 +24,7 @@ getuid - getuid i: __getuid getuid
ioctl - ioctl i:iiI __ioctl ioctl
kill - kill i:ii __kill kill
link - link i:ss __link link
-lseek - lseek Ci:iii __libc_lseek __lseek lseek
+lseek - lseek Ci:iii __libc_lseek __lseek lseek __GI___lseek
mkdir - mkdir i:si __mkdir mkdir
open - open Ci:siv __libc_open __open open
profil - profil i:piii __profil profil
--- libc/nptl/sysdeps/unix/sysv/linux/allocrtsig.c.jj 2002-11-27 12:30:26.000000000 +0100
+++ libc/nptl/sysdeps/unix/sysv/linux/allocrtsig.c 2002-12-31 15:55:21.000000000 +0100
@@ -32,6 +32,7 @@ __libc_current_sigrtmin (void)
return current_rtmin;
}
strong_alias (__libc_current_sigrtmin, __libc_current_sigrtmin_private)
+libc_hidden_def (__libc_current_sigrtmin)
int
@@ -40,6 +41,7 @@ __libc_current_sigrtmax (void)
return current_rtmax;
}
strong_alias (__libc_current_sigrtmax, __libc_current_sigrtmax_private)
+libc_hidden_def (__libc_current_sigrtmax)
int
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] Fix for 7 more .plt slots patch
2002-12-31 7:34 [PATCH] 7 more .plt slots killed (in linuxthreads build) Jakub Jelinek
@ 2002-12-31 9:51 ` Jakub Jelinek
0 siblings, 0 replies; 2+ messages in thread
From: Jakub Jelinek @ 2002-12-31 9:51 UTC (permalink / raw)
To: Ulrich Drepper, Roland McGrath; +Cc: Glibc hackers
On Tue, Dec 31, 2002 at 04:33:59PM +0100, Jakub Jelinek wrote:
> Hi!
>
> In NPTL build it will be less (I guess 4), NPTL build is still running.
Should have waited for the TLS build to finish. Sorry.
Here is an incremental patch to fix TLS build (which built/checked ok
in non-TLS build too):
2002-12-31 Jakub Jelinek <jakub@redhat.com>
* include/errno.h (__errno_location): Add prototype.
Use libc_hidden_proto unconditionally.
* include/netdb.h (__h_errno_location): Use libc_hidden_proto
unconditionally.
* include/resolv.h (__res_state): Likewise.
--- libc/include/errno.h.jj 2002-12-31 16:14:36.000000000 +0100
+++ libc/include/errno.h 2002-12-31 18:16:10.000000000 +0100
@@ -29,14 +29,17 @@ extern int errno attribute_hidden;
# define errno errno /* For #ifndef errno tests. */
# endif
extern __thread int errno attribute_tls_model_ie;
-# else
-libc_hidden_proto (__errno_location)
# endif
# endif /* RTLD_PRIVATE_ERRNO */
# define __set_errno(val) (errno = (val))
+# ifndef __ASSEMBLER__
+extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+libc_hidden_proto (__errno_location)
+# endif
+
#endif /* _ERRNO_H */
#endif /* ! _ERRNO_H */
--- libc/include/netdb.h.jj 2002-12-31 18:17:17.000000000 +0100
+++ libc/include/netdb.h 2002-12-31 18:17:44.000000000 +0100
@@ -14,7 +14,6 @@
extern __thread int h_errno attribute_tls_model_ie;
# define __set_h_errno(x) (h_errno = (x))
# else
-libc_hidden_proto (__h_errno_location)
static inline int
__set_h_errno (int __err)
{
@@ -38,6 +37,7 @@ libc_hidden_proto (getaddrinfo)
libc_hidden_proto (getnameinfo)
libc_hidden_proto (freeaddrinfo)
libc_hidden_proto (gai_strerror)
+libc_hidden_proto (__h_errno_location)
/* Document internal interfaces. */
extern int __gethostent_r (struct hostent *__restrict __result_buf,
--- libc/include/resolv.h.jj 2002-12-31 18:18:56.000000000 +0100
+++ libc/include/resolv.h 2002-12-31 18:18:56.000000000 +0100
@@ -20,8 +20,6 @@
# define _res __libc_res
# endif
extern __thread struct __res_state _res attribute_tls_model_ie;
-# else
-libc_hidden_proto (__res_state)
# endif
# else
# ifndef __BIND_NOSTATIC
@@ -48,6 +46,7 @@ extern int res_ourserver_p (const res_st
const struct sockaddr_in6 *__inp);
libc_hidden_proto (__res_ninit)
libc_hidden_proto (__res_randomid)
+libc_hidden_proto (__res_state)
int __libc_res_nquery (res_state, const char *, int, int, u_char *, int,
u_char **);
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2002-12-31 17:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-12-31 7:34 [PATCH] 7 more .plt slots killed (in linuxthreads build) Jakub Jelinek
2002-12-31 9:51 ` [PATCH] Fix for 7 more .plt slots patch Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).