GNU C Library master sources branch hjl/pr18822 created. glibc-2.26-178-g1410696
hjl@sourceware.org
hjl@sourceware.org
Mon Aug 21 13:18:00 GMT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, hjl/pr18822 has been created
at 1410696aaede92ac13171ac7250bcc7d41bbdd72 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1410696aaede92ac13171ac7250bcc7d41bbdd72
commit 1410696aaede92ac13171ac7250bcc7d41bbdd72
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Mon Aug 21 06:10:22 2017 -0700
Hide internal __mremap function [BZ #18822]
Hide internal __mremap function to allow direct access within libc.so and
libc.a without using GOT nor PLT.
__GI___mremap is defined when sysdeps/unix/syscalls.list is used to
generate ioctl. Otherwise libc_hidden_def is needed explicitly.
[BZ #18822]
* include/sys/mman.h (__mremap): Add libc_hidden_proto.
* sysdeps/unix/sysv/linux/m68k/mremap.S (__mremap): Add
libc_hidden_def.
diff --git a/include/sys/mman.h b/include/sys/mman.h
index 8b996fc..503edaa 100644
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -20,6 +20,7 @@ libc_hidden_proto (__madvise)
/* This one is Linux specific. */
extern void *__mremap (void *__addr, size_t __old_len,
size_t __new_len, int __flags, ...);
+libc_hidden_proto (__mremap)
# if IS_IN (rtld)
# include <dl-mman.h>
diff --git a/sysdeps/unix/sysv/linux/m68k/mremap.S b/sysdeps/unix/sysv/linux/m68k/mremap.S
index 01be848..5cb7c1b 100644
--- a/sysdeps/unix/sysv/linux/m68k/mremap.S
+++ b/sysdeps/unix/sysv/linux/m68k/mremap.S
@@ -25,4 +25,5 @@ PSEUDO (__mremap, mremap, 5)
move.l %d0, %a0
rts
PSEUDO_END (__mremap)
+libc_hidden_def (__mremap)
weak_alias (__mremap, mremap)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=06649921f056311988c722d6b7b60578c3141dca
commit 06649921f056311988c722d6b7b60578c3141dca
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Mon Aug 21 06:07:11 2017 -0700
Hide internal __malloc_check_init function [BZ #18822]
Hide internal __malloc_check_init function to allow direct access within
libc.so and libc.a without using GOT nor PLT.
* include/malloc.h (__malloc_check_init): Add attribute_hidden.
diff --git a/include/malloc.h b/include/malloc.h
index 70d32c7..d4cd9a5 100644
--- a/include/malloc.h
+++ b/include/malloc.h
@@ -9,6 +9,8 @@
/* Nonzero if the malloc is already initialized. */
extern int __malloc_initialized attribute_hidden;
+extern __typeof (__malloc_check_init) __malloc_check_init attribute_hidden;
+
struct malloc_state;
typedef struct malloc_state *mstate;
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9ffe75b51b6fa7a6848873f3a1a8599e83a9a58d
commit 9ffe75b51b6fa7a6848873f3a1a8599e83a9a58d
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Aug 20 11:53:06 2017 -0700
Hide internal __ioctl function [BZ #18822]
Hide internal __ioctl function to allow direct access within libc.so and
libc.a without using GOT nor PLT.
__GI___ioctl is defined when sysdeps/unix/syscalls.list is used to
generate ioctl. Otherwise libc_hidden_def is needed explicitly.
[BZ #18822]
* include/sys/ioctl.h (__ioctl): Add libc_hidden_proto.
* misc/ioctl.c (__ioctl): Add libc_hidden_def.
* sysdeps/mach/hurd/ioctl.c (__ioctl): Likewise.
* sysdeps/unix/sysv/linux/aarch64/ioctl.S (__ioctl): Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S (__ioctl):
Likewise.
* sysdeps/unix/sysv/linux/powerpc/ioctl.c (__ioctl): Likewise.
* sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S (__ioctl): Likewise.
diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h
index bfc6909..dd7c3c7 100644
--- a/include/sys/ioctl.h
+++ b/include/sys/ioctl.h
@@ -5,6 +5,7 @@
/* Now define the internal interfaces. */
extern int __ioctl (int __fd, unsigned long int __request, ...);
+libc_hidden_proto (__ioctl)
# endif /* !_ISOMAC */
#endif
diff --git a/misc/ioctl.c b/misc/ioctl.c
index 9b90102..7e1c8cc 100644
--- a/misc/ioctl.c
+++ b/misc/ioctl.c
@@ -28,4 +28,5 @@ __ioctl (int fd, unsigned long int request, ...)
}
stub_warning (ioctl)
+libc_hidden_def (__ioctl)
weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/mach/hurd/ioctl.c b/sysdeps/mach/hurd/ioctl.c
index 7ce521c..d6b4583 100644
--- a/sysdeps/mach/hurd/ioctl.c
+++ b/sysdeps/mach/hurd/ioctl.c
@@ -323,4 +323,5 @@ __ioctl (int fd, unsigned long int request, ...)
}
}
+libc_hidden_def (__ioctl)
weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/unix/sysv/linux/aarch64/ioctl.S b/sysdeps/unix/sysv/linux/aarch64/ioctl.S
index 866d6ef..61b3804 100644
--- a/sysdeps/unix/sysv/linux/aarch64/ioctl.S
+++ b/sysdeps/unix/sysv/linux/aarch64/ioctl.S
@@ -28,4 +28,5 @@ ENTRY(__ioctl)
ret
PSEUDO_END (__ioctl)
+libc_hidden_def (__ioctl)
weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S b/sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S
index ee5d11d..54d1866 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/ioctl.S
@@ -38,4 +38,5 @@ L(error):
PSEUDO_END (__ioctl)
+libc_hidden_def (__ioctl)
weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/unix/sysv/linux/powerpc/ioctl.c b/sysdeps/unix/sysv/linux/powerpc/ioctl.c
index 1437d1d..9efccbd 100644
--- a/sysdeps/unix/sysv/linux/powerpc/ioctl.c
+++ b/sysdeps/unix/sysv/linux/powerpc/ioctl.c
@@ -61,4 +61,5 @@ __ioctl (int fd, unsigned long int request, ...)
return result;
}
+libc_hidden_def (__ioctl)
weak_alias (__ioctl, ioctl)
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S b/sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S
index e2bf44c..43f9563 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S
+++ b/sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S
@@ -38,4 +38,5 @@ ENTRY (__ioctl)
BNEZ r1, 0f
jrp lr
PSEUDO_END (__ioctl)
+libc_hidden_def (__ioctl)
weak_alias (__ioctl, ioctl)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=816438f0b94590c9dd9b9e25e848c02e909caba3
commit 816438f0b94590c9dd9b9e25e848c02e909caba3
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Aug 20 11:40:26 2017 -0700
Mark internal intl functions with attribute_hidden [BZ #18822]
Mark internal intl functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* intl/gettextP.h (__dcngettext): Add attribute_hidden.
(__dcigettext): Likewise.
diff --git a/intl/gettextP.h b/intl/gettextP.h
index f88cd78..178ba52 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -49,11 +49,12 @@ extern char *__dngettext (const char *__domainname,
unsigned long int n);
extern char *__dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
- unsigned long int __n, int __category);
+ unsigned long int __n, int __category)
+ attribute_hidden;
extern char *__dcigettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
int __plural, unsigned long int __n,
- int __category);
+ int __category) attribute_hidden;
extern char *__textdomain (const char *__domainname);
extern char *__bindtextdomain (const char *__domainname,
const char *__dirname);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4f53f065ff0adedf184ad0eb365904b318198cde
commit 4f53f065ff0adedf184ad0eb365904b318198cde
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Aug 20 11:25:56 2017 -0700
Hide internal sysinfo functions [BZ #18822]
Hide internal sysinfo functions to allow direct access within libc.so
and libc.a without using GOT nor PLT.
[BZ #18822]
* include/sys/sysinfo.h (__get_nprocs_conf): Add
libc_hidden_proto.
(__get_nprocs): Likewise.
(__get_phys_pages): Likewise.
(__get_avphys_pages): Likewise.
(__get_child_max): Add attribute_hidden.
* misc/getsysstats.c (__get_nprocs_conf): Add libc_hidden_def.
(__get_nprocs): Likewise.
(__get_phys_pages): Likewise.
(__get_avphys_pages): Likewise.
* sysdeps/mach/getsysstats.c (__get_nprocs_conf): Add
libc_hidden_def.
(__get_nprocs): Likewise.
(__get_phys_pages): Likewise.
(__get_avphys_pages): Likewise.
* sysdeps/unix/sysv/linux/getsysstats.c (__get_nprocs): Add
libc_hidden_def.
(__get_nprocs_conf): Likewise.
(__get_phys_pages): Likewise.
(__get_avphys_pages): Likewise.
diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h
index c33eae2..7388356 100644
--- a/include/sys/sysinfo.h
+++ b/include/sys/sysinfo.h
@@ -7,18 +7,22 @@
/* Return number of configured processors. */
extern int __get_nprocs_conf (void);
+libc_hidden_proto (__get_nprocs_conf)
/* Return number of available processors. */
extern int __get_nprocs (void);
+libc_hidden_proto (__get_nprocs)
/* Return number of physical pages of memory in the system. */
extern long int __get_phys_pages (void);
+libc_hidden_proto (__get_phys_pages)
/* Return number of available physical pages of memory in the system. */
extern long int __get_avphys_pages (void);
+libc_hidden_proto (__get_avphys_pages)
/* Return maximum number of processes this real user ID can have. */
-extern long int __get_child_max (void);
+extern long int __get_child_max (void) attribute_hidden;
# endif /* !_ISOMAC */
#endif /* sys/sysinfo.h */
diff --git a/misc/getsysstats.c b/misc/getsysstats.c
index d25770e..cbad87a 100644
--- a/misc/getsysstats.c
+++ b/misc/getsysstats.c
@@ -26,6 +26,7 @@ __get_nprocs_conf (void)
/* We don't know how to determine the number. Simply return always 1. */
return 1;
}
+libc_hidden_def (__get_nprocs_conf)
weak_alias (__get_nprocs_conf, get_nprocs_conf)
link_warning (get_nprocs_conf, "warning: get_nprocs_conf will always return 1")
@@ -38,6 +39,7 @@ __get_nprocs (void)
/* We don't know how to determine the number. Simply return always 1. */
return 1;
}
+libc_hidden_def (__get_nprocs)
weak_alias (__get_nprocs, get_nprocs)
link_warning (get_nprocs, "warning: get_nprocs will always return 1")
@@ -50,6 +52,7 @@ __get_phys_pages (void)
__set_errno (ENOSYS);
return -1;
}
+libc_hidden_def (__get_phys_pages)
weak_alias (__get_phys_pages, get_phys_pages)
stub_warning (get_phys_pages)
@@ -62,6 +65,7 @@ __get_avphys_pages (void)
__set_errno (ENOSYS);
return -1;
}
+libc_hidden_def (__get_avphys_pages)
weak_alias (__get_avphys_pages, get_avphys_pages)
stub_warning (get_avphys_pages)
diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c
index 0dacab0..3aabd61 100644
--- a/sysdeps/mach/getsysstats.c
+++ b/sysdeps/mach/getsysstats.c
@@ -39,6 +39,7 @@ __get_nprocs_conf (void)
return hbi.max_cpus;
}
+libc_hidden_def (__get_nprocs_conf)
weak_alias (__get_nprocs_conf, get_nprocs_conf)
/* Return the number of processors currently available on the system. */
@@ -58,6 +59,7 @@ __get_nprocs (void)
return hbi.avail_cpus;
}
+libc_hidden_def (__get_nprocs)
weak_alias (__get_nprocs, get_nprocs)
/* Return the number of physical pages on the system. */
@@ -77,6 +79,7 @@ __get_phys_pages (void)
return hbi.memory_size / __vm_page_size;
}
+libc_hidden_def (__get_phys_pages)
weak_alias (__get_phys_pages, get_phys_pages)
/* Return the number of available physical pages */
@@ -102,4 +105,5 @@ __get_avphys_pages (void)
return vs.free_count;
}
+libc_hidden_def (__get_avphys_pages)
weak_alias (__get_avphys_pages, get_avphys_pages)
diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
index d02c86d..c245b3c 100644
--- a/sysdeps/unix/sysv/linux/getsysstats.c
+++ b/sysdeps/unix/sysv/linux/getsysstats.c
@@ -226,6 +226,7 @@ __get_nprocs (void)
return result;
}
+libc_hidden_def (__get_nprocs)
weak_alias (__get_nprocs, get_nprocs)
@@ -279,6 +280,7 @@ __get_nprocs_conf (void)
return result;
}
+libc_hidden_def (__get_nprocs_conf)
weak_alias (__get_nprocs_conf, get_nprocs_conf)
@@ -320,6 +322,7 @@ __get_phys_pages (void)
__sysinfo (&info);
return sysinfo_mempages (info.totalram, info.mem_unit);
}
+libc_hidden_def (__get_phys_pages)
weak_alias (__get_phys_pages, get_phys_pages)
long int
@@ -330,4 +333,5 @@ __get_avphys_pages (void)
__sysinfo (&info);
return sysinfo_mempages (info.freeram, info.mem_unit);
}
+libc_hidden_def (__get_avphys_pages)
weak_alias (__get_avphys_pages, get_avphys_pages)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=477c60c26f2733bfa7932b5e1c5b1da97ed7f1b1
commit 477c60c26f2733bfa7932b5e1c5b1da97ed7f1b1
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Aug 20 11:13:02 2017 -0700
Hide __chmod and __mkdir [BZ #18822]
Hide internal __chmod and __mkdir functions to allow direct access
within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/sys/stat.h (__chmod): Add libc_hidden_proto.
(__mkdir): Likewise.
* io/chmod.c (__chmod): Add libc_hidden_def.
* io/mkdir.c (__mkdir): Likewise.
* sysdeps/mach/hurd/chmod.c (__chmod): Likewise.
* sysdeps/mach/hurd/mkdir.c (__mkdir): Likewise.
* sysdeps/unix/sysv/linux/generic/chmod.c (__chmod): Likewise.
* sysdeps/unix/sysv/linux/generic/mkdir.c (__mkdir): Likewise.
diff --git a/include/sys/stat.h b/include/sys/stat.h
index 4f31c00..eb44754 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -7,9 +7,11 @@ extern int __stat (const char *__file, struct stat *__buf);
extern int __fstat (int __fd, struct stat *__buf);
extern int __lstat (const char *__file, struct stat *__buf);
extern int __chmod (const char *__file, __mode_t __mode);
+libc_hidden_proto (__chmod)
extern int __fchmod (int __fd, __mode_t __mode);
extern __mode_t __umask (__mode_t __mask);
extern int __mkdir (const char *__path, __mode_t __mode);
+libc_hidden_proto (__mkdir)
extern int __mknod (const char *__path,
__mode_t __mode, __dev_t __dev);
#if IS_IN (libc) || IS_IN (rtld)
diff --git a/io/chmod.c b/io/chmod.c
index 0b85565..3cacbf6 100644
--- a/io/chmod.c
+++ b/io/chmod.c
@@ -35,4 +35,5 @@ __chmod (const char *file, mode_t mode)
}
stub_warning (chmod)
+libc_hidden_def (__chmod)
weak_alias (__chmod, chmod)
diff --git a/io/mkdir.c b/io/mkdir.c
index 0b8499a..43a790d 100644
--- a/io/mkdir.c
+++ b/io/mkdir.c
@@ -36,4 +36,5 @@ __mkdir (const char *path, mode_t mode)
}
stub_warning (mkdir)
+libc_hidden_def (__mkdir)
weak_alias (__mkdir, mkdir)
diff --git a/sysdeps/mach/hurd/chmod.c b/sysdeps/mach/hurd/chmod.c
index 943f985..612e62d 100644
--- a/sysdeps/mach/hurd/chmod.c
+++ b/sysdeps/mach/hurd/chmod.c
@@ -35,4 +35,5 @@ __chmod (const char *file, mode_t mode)
return 0;
}
+libc_hidden_def (__chmod)
weak_alias (__chmod, chmod)
diff --git a/sysdeps/mach/hurd/mkdir.c b/sysdeps/mach/hurd/mkdir.c
index 58c2ac4..1efac94 100644
--- a/sysdeps/mach/hurd/mkdir.c
+++ b/sysdeps/mach/hurd/mkdir.c
@@ -40,4 +40,5 @@ __mkdir (const char *file_name, mode_t mode)
return 0;
}
+libc_hidden_def (__mkdir)
weak_alias (__mkdir, mkdir)
diff --git a/sysdeps/unix/sysv/linux/generic/chmod.c b/sysdeps/unix/sysv/linux/generic/chmod.c
index 41d6d98..551c67c 100644
--- a/sysdeps/unix/sysv/linux/generic/chmod.c
+++ b/sysdeps/unix/sysv/linux/generic/chmod.c
@@ -28,4 +28,6 @@ __chmod (const char *file, mode_t mode)
{
return INLINE_SYSCALL (fchmodat, 3, AT_FDCWD, file, mode);
}
+
+libc_hidden_def (__chmod)
weak_alias (__chmod, chmod)
diff --git a/sysdeps/unix/sysv/linux/generic/mkdir.c b/sysdeps/unix/sysv/linux/generic/mkdir.c
index 6571d29..7eebe90 100644
--- a/sysdeps/unix/sysv/linux/generic/mkdir.c
+++ b/sysdeps/unix/sysv/linux/generic/mkdir.c
@@ -30,4 +30,6 @@ __mkdir (const char *path, mode_t mode)
{
return INLINE_SYSCALL (mkdirat, 3, AT_FDCWD, path, mode);
}
+
+libc_hidden_def (__mkdir)
weak_alias (__mkdir, mkdir)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9aa1cf8c878fc0a3965196ace8166c5fcb505b81
commit 9aa1cf8c878fc0a3965196ace8166c5fcb505b81
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Aug 20 10:38:46 2017 -0700
Mark internal netlink functions with attribute_hidden [BZ #18822]
Mark internal netlink functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* sysdeps/unix/sysv/linux/netlinkaccess.h (__netlink_open): Add
attribute_hidden.
(__netlink_close): Likewise.
(__netlink_free_handle): Likewise.
(__netlink_request): Likewise.
diff --git a/sysdeps/unix/sysv/linux/netlinkaccess.h b/sysdeps/unix/sysv/linux/netlinkaccess.h
index 66bbbe6..f4973e2 100644
--- a/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ b/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -44,10 +44,12 @@ struct netlink_handle
};
-extern int __netlink_open (struct netlink_handle *h);
-extern void __netlink_close (struct netlink_handle *h);
-extern void __netlink_free_handle (struct netlink_handle *h);
-extern int __netlink_request (struct netlink_handle *h, int type);
+extern int __netlink_open (struct netlink_handle *h) attribute_hidden;
+extern void __netlink_close (struct netlink_handle *h) attribute_hidden;
+extern void __netlink_free_handle (struct netlink_handle *h)
+ attribute_hidden;
+extern int __netlink_request (struct netlink_handle *h, int type)
+ attribute_hidden;
/* Terminate the process if RESULT is an invalid recvmsg result for
the netlink socket FD. */
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cfbc0e90818e689b29db019fdd2ff201475e5117
commit cfbc0e90818e689b29db019fdd2ff201475e5117
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Aug 20 10:22:10 2017 -0700
Mark internal rpc functions with attribute_hidden [BZ #18822]
Mark internal rpc functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/rpc/rpc.h (__rpc_thread_variables): Add
attribute_hidden.
(__rpc_thread_svc_cleanup): Likewise.
(__rpc_thread_clnt_cleanup): Likewise.
(__rpc_thread_key_cleanup): Likewise.
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 60c7896..1fb925e 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -41,10 +41,10 @@ struct rpc_thread_variables {
};
extern struct rpc_thread_variables *__rpc_thread_variables(void)
- __attribute__ ((const));
-extern void __rpc_thread_svc_cleanup (void);
-extern void __rpc_thread_clnt_cleanup (void);
-extern void __rpc_thread_key_cleanup (void);
+ __attribute__ ((const)) attribute_hidden;
+extern void __rpc_thread_svc_cleanup (void) attribute_hidden;
+extern void __rpc_thread_clnt_cleanup (void) attribute_hidden;
+extern void __rpc_thread_key_cleanup (void) attribute_hidden;
extern void __rpc_thread_destroy (void);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ce655e2acbe6387d35031e2aa70881234a21dac1
commit ce655e2acbe6387d35031e2aa70881234a21dac1
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Aug 20 10:11:38 2017 -0700
string/stratcliff.c: Replace int with size_t [BZ #21982]
Fix GCC 7 errors when string/stratcliff.c is compiled with -O3:
stratcliff.c: In function ‘do_test’:
cc1: error: assuming signed overflow does not occur when assuming that (X - c) <= X is always true [-Werror=strict-overflow]
[BZ #21982]
* string/stratcliff.c (do_test): Declare size, nchars, inner,
middle and outer with size_t instead of int. Repleace %d with
%Zd in printf.
diff --git a/string/stratcliff.c b/string/stratcliff.c
index e28b0c5..ae78037 100644
--- a/string/stratcliff.c
+++ b/string/stratcliff.c
@@ -58,8 +58,8 @@
int
do_test (void)
{
- int size = sysconf (_SC_PAGESIZE);
- int nchars = size / sizeof (CHAR);
+ size_t size = sysconf (_SC_PAGESIZE);
+ size_t nchars = size / sizeof (CHAR);
CHAR *adr;
CHAR *dest;
int result = 0;
@@ -80,7 +80,7 @@ do_test (void)
}
else
{
- int inner, middle, outer;
+ size_t inner, middle, outer;
mprotect (adr, size, PROT_NONE);
mprotect (adr + 2 * nchars, size, PROT_NONE);
@@ -101,7 +101,7 @@ do_test (void)
if (STRLEN (&adr[outer]) != (size_t) (inner - outer))
{
- printf ("%s flunked for outer = %d, inner = %d\n",
+ printf ("%s flunked for outer = %Zd, inner = %Zd\n",
STRINGIFY (STRLEN), outer, inner);
result = 1;
}
@@ -120,7 +120,7 @@ do_test (void)
if (STRNLEN (&adr[outer], inner - outer + 1)
!= (size_t) (inner - outer))
{
- printf ("%s flunked for outer = %d, inner = %d\n",
+ printf ("%s flunked for outer = %Zd, inner = %Zd\n",
STRINGIFY (STRNLEN), outer, inner);
result = 1;
}
@@ -135,7 +135,7 @@ do_test (void)
if (STRNLEN (&adr[outer], inner - outer)
!= (size_t) (inner - outer))
{
- printf ("%s flunked bounded for outer = %d, inner = %d\n",
+ printf ("%s flunked bounded for outer = %Zd, inner = %Zd\n",
STRINGIFY (STRNLEN), outer, inner);
result = 1;
}
@@ -158,8 +158,8 @@ do_test (void)
|| (inner != middle
&& (cp - &adr[outer]) != middle - outer))
{
- printf ("%s flunked for outer = %d, middle = %d, "
- "inner = %d\n",
+ printf ("%s flunked for outer = %Zd, middle = %Zd, "
+ "inner = %Zd\n",
STRINGIFY (STRCHR), outer, middle, inner);
result = 1;
}
@@ -195,8 +195,8 @@ do_test (void)
|| (inner != middle
&& (cp - &adr[outer]) != middle - outer))
{
- printf ("%s flunked for outer = %d, middle = %d, "
- "inner = %d\n",
+ printf ("%s flunked for outer = %Zd, middle = %Zd, "
+ "inner = %Zd\n",
STRINGIFY (STRRCHR), outer, middle, inner);
result = 1;
}
@@ -218,7 +218,7 @@ do_test (void)
if (cp - &adr[outer] != middle - outer)
{
- printf ("%s flunked for outer = %d, middle = %d\n",
+ printf ("%s flunked for outer = %Zd, middle = %Zd\n",
STRINGIFY (MEMCHR), outer, middle);
result = 1;
}
@@ -232,7 +232,7 @@ do_test (void)
if (cp != NULL)
{
- printf ("%s flunked for outer = %d\n",
+ printf ("%s flunked for outer = %Zd\n",
STRINGIFY (MEMCHR), outer);
result = 1;
}
@@ -251,7 +251,7 @@ do_test (void)
if (cp - &adr[outer] != middle - outer)
{
- printf ("%s flunked for outer = %d, middle = %d\n",
+ printf ("%s flunked for outer = %Zd, middle = %Zd\n",
STRINGIFY (rawmemchr), outer, middle);
result = 1;
}
@@ -271,7 +271,7 @@ do_test (void)
if (cp - &adr[outer] != middle - outer)
{
- printf ("%s flunked for outer = %d, middle = %d\n",
+ printf ("%s flunked for outer = %Zd, middle = %Zd\n",
STRINGIFY (memrchr), outer, middle);
result = 1;
}
@@ -285,7 +285,7 @@ do_test (void)
if (cp != NULL)
{
- printf ("%s flunked for outer = %d\n",
+ printf ("%s flunked for outer = %Zd\n",
STRINGIFY (memrchr), outer);
result = 1;
}
@@ -302,7 +302,7 @@ do_test (void)
if (STRCPY (dest, &adr[outer]) != dest
|| STRLEN (dest) != (size_t) (inner - outer))
{
- printf ("%s flunked for outer = %d, inner = %d\n",
+ printf ("%s flunked for outer = %Zd, inner = %Zd\n",
STRINGIFY (STRCPY), outer, inner);
result = 1;
}
@@ -322,14 +322,14 @@ do_test (void)
if (STRCMP (adr + middle, dest + nchars - outer) <= 0)
{
- printf ("%s 1 flunked for outer = %d, middle = %d\n",
+ printf ("%s 1 flunked for outer = %Zd, middle = %Zd\n",
STRINGIFY (STRCMP), outer, middle);
result = 1;
}
if (STRCMP (dest + nchars - outer, adr + middle) >= 0)
{
- printf ("%s 2 flunked for outer = %d, middle = %d\n",
+ printf ("%s 2 flunked for outer = %Zd, middle = %Zd\n",
STRINGIFY (STRCMP), outer, middle);
result = 1;
}
@@ -348,16 +348,16 @@ do_test (void)
{
if (STRNCMP (adr + middle, dest + nchars - outer, inner) != 0)
{
- printf ("%s 1 flunked for outer = %d, middle = %d, "
- "inner = %d\n",
+ printf ("%s 1 flunked for outer = %Zd, middle = %Zd, "
+ "inner = %Zd\n",
STRINGIFY (STRNCMP), outer, middle, inner);
result = 1;
}
if (STRNCMP (dest + nchars - outer, adr + middle, inner) != 0)
{
- printf ("%s 2 flunked for outer = %d, middle = %d, "
- "inner = %d\n",
+ printf ("%s 2 flunked for outer = %Zd, middle = %Zd, "
+ "inner = %Zd\n",
STRINGIFY (STRNCMP), outer, middle, inner);
result = 1;
}
@@ -365,14 +365,14 @@ do_test (void)
if (STRNCMP (adr + middle, dest + nchars - outer, outer) >= 0)
{
- printf ("%s 1 flunked for outer = %d, middle = %d, full\n",
+ printf ("%s 1 flunked for outer = %Zd, middle = %Zd, full\n",
STRINGIFY (STRNCMP), outer, middle);
result = 1;
}
if (STRNCMP (dest + nchars - outer, adr + middle, outer) <= 0)
{
- printf ("%s 2 flunked for outer = %d, middle = %d, full\n",
+ printf ("%s 2 flunked for outer = %Zd, middle = %Zd, full\n",
STRINGIFY (STRNCMP), outer, middle);
result = 1;
}
@@ -389,7 +389,7 @@ do_test (void)
if (STRNCPY (dest, &adr[outer], len) != dest
|| MEMCMP (dest, &adr[outer], len) != 0)
{
- printf ("outer %s flunked for outer = %d, len = %Zd\n",
+ printf ("outer %s flunked for outer = %Zd, len = %Zd\n",
STRINGIFY (STRNCPY), outer, len);
result = 1;
}
@@ -413,7 +413,7 @@ do_test (void)
|| (inner - outer < len
&& STRLEN (dest) != (inner - outer)))
{
- printf ("%s flunked for outer = %d, inner = %d, "
+ printf ("%s flunked for outer = %Zd, inner = %Zd, "
"len = %Zd\n",
STRINGIFY (STRNCPY), outer, inner, len);
result = 1;
@@ -424,7 +424,7 @@ do_test (void)
|| (inner - outer < len
&& STRLEN (dest + 1) != (inner - outer)))
{
- printf ("%s+1 flunked for outer = %d, inner = %d, "
+ printf ("%s+1 flunked for outer = %Zd, inner = %Zd, "
"len = %Zd\n",
STRINGIFY (STRNCPY), outer, inner, len);
result = 1;
@@ -444,7 +444,7 @@ do_test (void)
if ((STPCPY (dest, &adr[outer]) - dest) != inner - outer)
{
- printf ("%s flunked for outer = %d, inner = %d\n",
+ printf ("%s flunked for outer = %Zd, inner = %Zd\n",
STRINGIFY (STPCPY), outer, inner);
result = 1;
}
@@ -464,7 +464,7 @@ do_test (void)
if (STPNCPY (dest, &adr[outer], len) != dest + len
|| MEMCMP (dest, &adr[outer], len) != 0)
{
- printf ("outer %s flunked for outer = %d, len = %Zd\n",
+ printf ("outer %s flunked for outer = %Zd, len = %Zd\n",
STRINGIFY (STPNCPY), outer, len);
result = 1;
}
@@ -483,8 +483,8 @@ do_test (void)
if ((STPNCPY (dest, &adr[outer], inner) - dest)
!= MIN (inner, middle - outer))
{
- printf ("%s flunked for outer = %d, middle = %d, "
- "inner = %d\n",
+ printf ("%s flunked for outer = %Zd, middle = %Zd, "
+ "inner = %Zd\n",
STRINGIFY (STPNCPY), outer, middle, inner);
result = 1;
}
@@ -499,7 +499,7 @@ do_test (void)
for (inner = 0; inner < nchars - outer; ++inner)
if (MEMCPY (dest, &adr[outer], inner) != dest)
{
- printf ("%s flunked for outer = %d, inner = %d\n",
+ printf ("%s flunked for outer = %Zd, inner = %Zd\n",
STRINGIFY (MEMCPY), outer, inner);
result = 1;
}
@@ -509,7 +509,7 @@ do_test (void)
for (inner = 0; inner < nchars - outer; ++inner)
if (MEMPCPY (dest, &adr[outer], inner) != dest + inner)
{
- printf ("%s flunked for outer = %d, inner = %d\n",
+ printf ("%s flunked for outer = %Zd, inner = %Zd\n",
STRINGIFY (MEMPCPY), outer, inner);
result = 1;
}
@@ -522,7 +522,7 @@ do_test (void)
for (inner = 0; inner < nchars - outer; ++inner)
if (memccpy (dest, &adr[outer], L('\1'), inner) != NULL)
{
- printf ("memccpy flunked full copy for outer = %d, inner = %d\n",
+ printf ("memccpy flunked full copy for outer = %Zd, inner = %Zd\n",
outer, inner);
result = 1;
}
@@ -538,14 +538,14 @@ do_test (void)
!= dest + inner + 1)
{
printf ("\
-memccpy flunked partial copy for outer = %d, middle = %d, inner = %d\n",
+memccpy flunked partial copy for outer = %Zd, middle = %Zd, inner = %Zd\n",
outer, middle, inner);
result = 1;
}
else if (dest[inner + 1] != L('\2'))
{
printf ("\
-memccpy copied too much for outer = %d, middle = %d, inner = %d\n",
+memccpy copied too much for outer = %Zd, middle = %Zd, inner = %Zd\n",
outer, middle, inner);
result = 1;
}
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f7f85ffbeda0fd26f62db17660b24553f7da29f1
commit f7f85ffbeda0fd26f62db17660b24553f7da29f1
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Aug 20 08:05:25 2017 -0700
Hide __readv and __writev [BZ #18822]
Hide internal __readv and __writev functions to allow direct access
within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/sys/uio.h (__readv): Add libc_hidden_proto.
(__writev): Likewise.
* misc/readv.c (__readv): Add libc_hidden_def.
* misc/writev.c (__writev): Likewise.
* sysdeps/posix/readv.c (__readv): Likewise.
* sysdeps/posix/writev.c (__writev): Likewise.
* sysdeps/unix/sysv/linux/readv.c: Include <sys/uio.h>.
(__readv): Likewise.
* sysdeps/unix/sysv/linux/writev.c: Include <sys/uio.h>.
(__writev): Likewise.
diff --git a/include/sys/uio.h b/include/sys/uio.h
index 20860bf..204c4b9 100644
--- a/include/sys/uio.h
+++ b/include/sys/uio.h
@@ -5,8 +5,10 @@
/* Now define the internal interfaces. */
extern ssize_t __readv (int __fd, const struct iovec *__iovec,
int __count);
+libc_hidden_proto (__readv)
extern ssize_t __writev (int __fd, const struct iovec *__iovec,
int __count);
+libc_hidden_proto (__writev)
/* Used for p{read,write}{v64}v2 implementation. */
libc_hidden_proto (preadv)
diff --git a/misc/readv.c b/misc/readv.c
index 064f885..9ad94d3 100644
--- a/misc/readv.c
+++ b/misc/readv.c
@@ -30,6 +30,7 @@ __readv (int fd, const struct iovec *vector, int count)
__set_errno (ENOSYS);
return -1;
}
+libc_hidden_def (__readv)
weak_alias (__readv, readv)
stub_warning (readv)
diff --git a/misc/writev.c b/misc/writev.c
index c8d222e..8bd2edd 100644
--- a/misc/writev.c
+++ b/misc/writev.c
@@ -30,6 +30,7 @@ __writev (int fd, const struct iovec *vector, int count)
__set_errno (ENOSYS);
return -1;
}
+libc_hidden_def (__writev)
weak_alias (__writev, writev)
stub_warning (writev)
diff --git a/sysdeps/posix/readv.c b/sysdeps/posix/readv.c
index 5b0c124..2875c76 100644
--- a/sysdeps/posix/readv.c
+++ b/sysdeps/posix/readv.c
@@ -88,4 +88,5 @@ __readv (int fd, const struct iovec *vector, int count)
return bytes_read;
}
+libc_hidden_def (__readv)
weak_alias (__readv, readv)
diff --git a/sysdeps/posix/writev.c b/sysdeps/posix/writev.c
index 7ce1deb..89d4630 100644
--- a/sysdeps/posix/writev.c
+++ b/sysdeps/posix/writev.c
@@ -88,4 +88,5 @@ __writev (int fd, const struct iovec *vector, int count)
return bytes_written;
}
+libc_hidden_def (__writev)
weak_alias (__writev, writev)
diff --git a/sysdeps/unix/sysv/linux/readv.c b/sysdeps/unix/sysv/linux/readv.c
index 142a0a9..e471300 100644
--- a/sysdeps/unix/sysv/linux/readv.c
+++ b/sysdeps/unix/sysv/linux/readv.c
@@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */
#include <unistd.h>
+#include <sys/uio.h>
#include <sysdep-cancel.h>
ssize_t
@@ -24,4 +25,5 @@ __readv (int fd, const struct iovec *iov, int iovcnt)
{
return SYSCALL_CANCEL (readv, fd, iov, iovcnt);
}
+libc_hidden_def (__readv)
weak_alias (__readv, readv)
diff --git a/sysdeps/unix/sysv/linux/writev.c b/sysdeps/unix/sysv/linux/writev.c
index 1b56cbb..2495fd9 100644
--- a/sysdeps/unix/sysv/linux/writev.c
+++ b/sysdeps/unix/sysv/linux/writev.c
@@ -17,6 +17,7 @@
<http://www.gnu.org/licenses/>. */
#include <unistd.h>
+#include <sys/uio.h>
#include <sysdep-cancel.h>
ssize_t
@@ -24,4 +25,5 @@ __writev (int fd, const struct iovec *iov, int iovcnt)
{
return SYSCALL_CANCEL (writev, fd, iov, iovcnt);
}
+libc_hidden_def (__writev)
weak_alias (__writev, writev)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ee265573246df91bdf77f28fdda0ae78f6750873
commit ee265573246df91bdf77f28fdda0ae78f6750873
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Aug 20 07:28:23 2017 -0700
Hide internal regex functions [BZ #18822]
Hide internal regex functions to allow direct access within libc.so and
libc.a without using GOT nor PLT.
[BZ #18822]
* include/regex.h (__re_compile_fastmap): Add attribute_hidden.
(__regcomp): Add libc_hidden_proto.
(__regexec): Likewise.
(__regfree): Likewise.
* posix/regcomp.c (__regcomp): Add libc_hidden_def.
(__regfree): Likewise.
* posix/regexec.c (__regexec): Likewise.
diff --git a/include/regex.h b/include/regex.h
index fd4beef..24eca2c 100644
--- a/include/regex.h
+++ b/include/regex.h
@@ -8,7 +8,8 @@ extern reg_syntax_t __re_set_syntax (reg_syntax_t syntax);
extern const char *__re_compile_pattern (const char *pattern, size_t length,
struct re_pattern_buffer *buffer);
-extern int __re_compile_fastmap (struct re_pattern_buffer *buffer);
+extern int __re_compile_fastmap (struct re_pattern_buffer *buffer)
+ attribute_hidden;
extern int __re_search (struct re_pattern_buffer *buffer, const char *string,
int length, int start, int range,
@@ -33,13 +34,16 @@ extern void __re_set_registers
unsigned num_regs, regoff_t *starts, regoff_t *ends);
extern int __regcomp (regex_t *__preg, const char *__pattern, int __cflags);
+libc_hidden_proto (__regcomp)
extern int __regexec (const regex_t *__preg, const char *__string,
size_t __nmatch, regmatch_t __pmatch[], int __eflags);
+libc_hidden_proto (__regexec)
extern size_t __regerror (int __errcode, const regex_t *__preg,
char *__errbuf, size_t __errbuf_size);
extern void __regfree (regex_t *__preg);
+libc_hidden_proto (__regfree)
#endif
#endif
diff --git a/posix/regcomp.c b/posix/regcomp.c
index b724ee3..c395479 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -517,6 +517,7 @@ regcomp (regex_t *__restrict preg, const char *__restrict pattern, int cflags)
return (int) ret;
}
#ifdef _LIBC
+libc_hidden_def (__regcomp)
weak_alias (__regcomp, regcomp)
#endif
@@ -644,6 +645,7 @@ regfree (regex_t *preg)
preg->translate = NULL;
}
#ifdef _LIBC
+libc_hidden_def (__regfree)
weak_alias (__regfree, regfree)
#endif
diff --git a/posix/regexec.c b/posix/regexec.c
index 8eb09dc..17a9540 100644
--- a/posix/regexec.c
+++ b/posix/regexec.c
@@ -252,6 +252,8 @@ regexec (const regex_t *__restrict preg, const char *__restrict string,
}
#ifdef _LIBC
+libc_hidden_def (__regexec)
+
# include <shlib-compat.h>
versioned_symbol (libc, __regexec, regexec, GLIBC_2_3_4);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fd522820bc61db98d99ba8372ccd2337954883e9
commit fd522820bc61db98d99ba8372ccd2337954883e9
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Aug 19 16:47:56 2017 -0700
Mark internal stdlib functions with attribute_hidden [BZ #18822]
Mark internal stdlib functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT. __realpath
is hidden with libc_hidden_proto and libc_hidden_def since the exported
realpath is an alias of __realpath.
[BZ #18822]
* include/stdlib.h (__random): Add attribute_hidden.
(__random_r): Likewise.
(__srandom_r): Likewise.
(__initstate_r): Likewise.
(__setstate_r): Likewise.
(__erand48_r): Likewise.
(__nrand48_r): Likewise.
(__jrand48_r): Likewise.
(__srand48_r): Likewise.
(__seed48_r): Likewise.
(__lcong48_r): Likewise.
(__drand48_iterate): Likewise.
(__setenv): Likewise.
(__unsetenv): Likewise.
(__clearenv): Likewise.
(__ptsname_r): Likewise.
(__posix_openpt): Likewise.
(__add_to_environ): Likewise.
(__ecvt_r): Likewise.
(__fcvt_r): Likewise.
(__qecvt_r): Likewise.
(__qfcvt_r): Likewise.
(__realpath): Add libc_hidden_proto.
* stdlib/canonicalize.c (__realpath): Add libc_hidden_def.
diff --git a/include/stdlib.h b/include/stdlib.h
index d0dcbf8..61a15cb 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -40,56 +40,65 @@ libc_hidden_proto (__qsort_r)
libc_hidden_proto (lrand48_r)
libc_hidden_proto (wctomb)
-extern long int __random (void);
+extern long int __random (void) attribute_hidden;
extern void __srandom (unsigned int __seed);
extern char *__initstate (unsigned int __seed, char *__statebuf,
size_t __statelen);
extern char *__setstate (char *__statebuf);
-extern int __random_r (struct random_data *__buf, int32_t *__result);
-extern int __srandom_r (unsigned int __seed, struct random_data *__buf);
+extern int __random_r (struct random_data *__buf, int32_t *__result)
+ attribute_hidden;
+extern int __srandom_r (unsigned int __seed, struct random_data *__buf)
+ attribute_hidden;
extern int __initstate_r (unsigned int __seed, char *__statebuf,
- size_t __statelen, struct random_data *__buf);
-extern int __setstate_r (char *__statebuf, struct random_data *__buf);
+ size_t __statelen, struct random_data *__buf)
+ attribute_hidden;
+extern int __setstate_r (char *__statebuf, struct random_data *__buf)
+ attribute_hidden;
extern int __rand_r (unsigned int *__seed);
extern int __erand48_r (unsigned short int __xsubi[3],
- struct drand48_data *__buffer, double *__result);
+ struct drand48_data *__buffer, double *__result)
+ attribute_hidden;
extern int __nrand48_r (unsigned short int __xsubi[3],
struct drand48_data *__buffer,
- long int *__result);
+ long int *__result) attribute_hidden;
extern int __jrand48_r (unsigned short int __xsubi[3],
struct drand48_data *__buffer,
- long int *__result);
+ long int *__result) attribute_hidden;
extern int __srand48_r (long int __seedval,
- struct drand48_data *__buffer);
+ struct drand48_data *__buffer) attribute_hidden;
extern int __seed48_r (unsigned short int __seed16v[3],
- struct drand48_data *__buffer);
+ struct drand48_data *__buffer) attribute_hidden;
extern int __lcong48_r (unsigned short int __param[7],
- struct drand48_data *__buffer);
+ struct drand48_data *__buffer) attribute_hidden;
/* Internal function to compute next state of the generator. */
extern int __drand48_iterate (unsigned short int __xsubi[3],
- struct drand48_data *__buffer);
+ struct drand48_data *__buffer)
+ attribute_hidden;
/* Global state for non-reentrant functions. Defined in drand48-iter.c. */
extern struct drand48_data __libc_drand48_data attribute_hidden;
-extern int __setenv (const char *__name, const char *__value, int __replace);
-extern int __unsetenv (const char *__name);
-extern int __clearenv (void);
+extern int __setenv (const char *__name, const char *__value, int __replace)
+ attribute_hidden;
+extern int __unsetenv (const char *__name) attribute_hidden;
+extern int __clearenv (void) attribute_hidden;
extern char *__mktemp (char *__template) __THROW __nonnull ((1));
extern char *__canonicalize_file_name (const char *__name);
extern char *__realpath (const char *__name, char *__resolved);
-extern int __ptsname_r (int __fd, char *__buf, size_t __buflen);
+libc_hidden_proto (__realpath)
+extern int __ptsname_r (int __fd, char *__buf, size_t __buflen)
+ attribute_hidden;
# ifndef _ISOMAC
extern int __ptsname_internal (int fd, char *buf, size_t buflen,
struct stat64 *stp) attribute_hidden;
# endif
extern int __getpt (void);
-extern int __posix_openpt (int __oflag);
+extern int __posix_openpt (int __oflag) attribute_hidden;
extern int __add_to_environ (const char *name, const char *value,
- const char *combines, int replace);
-
+ const char *combines, int replace)
+ attribute_hidden;
extern void _quicksort (void *const pbase, size_t total_elems,
size_t size, __compar_d_fn_t cmp, void *arg);
@@ -253,10 +262,10 @@ extern char *__fcvt (double __value, int __ndigit, int *__restrict __decpt,
extern char *__gcvt (double __value, int __ndigit, char *__buf);
extern int __ecvt_r (double __value, int __ndigit, int *__restrict __decpt,
int *__restrict __sign, char *__restrict __buf,
- size_t __len);
+ size_t __len) attribute_hidden;
extern int __fcvt_r (double __value, int __ndigit, int *__restrict __decpt,
int *__restrict __sign, char *__restrict __buf,
- size_t __len);
+ size_t __len) attribute_hidden;
extern char *__qecvt (long double __value, int __ndigit,
int *__restrict __decpt, int *__restrict __sign);
extern char *__qfcvt (long double __value, int __ndigit,
@@ -264,10 +273,12 @@ extern char *__qfcvt (long double __value, int __ndigit,
extern char *__qgcvt (long double __value, int __ndigit, char *__buf);
extern int __qecvt_r (long double __value, int __ndigit,
int *__restrict __decpt, int *__restrict __sign,
- char *__restrict __buf, size_t __len);
+ char *__restrict __buf, size_t __len)
+ attribute_hidden;
extern int __qfcvt_r (long double __value, int __ndigit,
int *__restrict __decpt, int *__restrict __sign,
- char *__restrict __buf, size_t __len);
+ char *__restrict __buf, size_t __len)
+ attribute_hidden;
# if IS_IN (libc)
# undef MB_CUR_MAX
diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c
index c3d892c..4ff7e0f 100644
--- a/stdlib/canonicalize.c
+++ b/stdlib/canonicalize.c
@@ -218,6 +218,7 @@ error:
free (rpath);
return NULL;
}
+libc_hidden_def (__realpath)
versioned_symbol (libc, __realpath, realpath, GLIBC_2_3);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f186c1edc566cf66ecca94db4295b545621676c3
commit f186c1edc566cf66ecca94db4295b545621676c3
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Aug 19 16:29:20 2017 -0700
Mark internal utmp functions with attribute_hidden [BZ #18822]
Mark internal utmp functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/utmp.h (__updwtmp): Add attribute_hidden.
(__utmpname): Likewise.
(__getutent): Likewise.
(__setutent): Likewise.
(__endutent): Likewise.
(__getutid): Likewise.
(__getutline): Likewise.
(__pututline): Likewise.
(__getutent_r): Likewise.
(__getutid_r): Likewise.
(__getutline_r): Likewise.
diff --git a/include/utmp.h b/include/utmp.h
index 6b2e262..3853896 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -4,19 +4,25 @@
# ifndef _ISOMAC
/* Now define the internal interfaces. */
-extern void __updwtmp (const char *__wtmp_file, const struct utmp *__utmp);
-extern int __utmpname (const char *__file);
-extern struct utmp *__getutent (void);
-extern void __setutent (void);
-extern void __endutent (void);
-extern struct utmp *__getutid (const struct utmp *__id);
-extern struct utmp *__getutline (const struct utmp *__line);
-extern struct utmp *__pututline (const struct utmp *__utmp_ptr);
-extern int __getutent_r (struct utmp *__buffer, struct utmp **__result);
+extern void __updwtmp (const char *__wtmp_file, const struct utmp *__utmp)
+ attribute_hidden;
+extern int __utmpname (const char *__file) attribute_hidden;
+extern struct utmp *__getutent (void) attribute_hidden;
+extern void __setutent (void) attribute_hidden;
+extern void __endutent (void) attribute_hidden;
+extern struct utmp *__getutid (const struct utmp *__id) attribute_hidden;
+extern struct utmp *__getutline (const struct utmp *__line)
+ attribute_hidden;
+extern struct utmp *__pututline (const struct utmp *__utmp_ptr)
+ attribute_hidden;
+extern int __getutent_r (struct utmp *__buffer, struct utmp **__result)
+ attribute_hidden;
extern int __getutid_r (const struct utmp *__id, struct utmp *__buffer,
- struct utmp **__result);
+ struct utmp **__result)
+ attribute_hidden;
extern int __getutline_r (const struct utmp *__line,
- struct utmp *__buffer, struct utmp **__result);
+ struct utmp *__buffer, struct utmp **__result)
+ attribute_hidden;
libutil_hidden_proto (login_tty)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=523458c7009d74ded620750d11a9f2908d473a84
commit 523458c7009d74ded620750d11a9f2908d473a84
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Aug 19 16:23:58 2017 -0700
Mark internal dirent functions with attribute_hidden [BZ #18822]
Mark internal dirent functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT. __readdir64
is hidden with libc_hidden_proto and libc_hidden_def since the exported
readdir64 is an alias of __readdir64.
[BZ #18822]
* include/dirent.h (__opendir): Always add attribute_hidden.
(__fdopendir): Likewise.
(__closedir): Likewise.
(__readdir): Likewise.
(__readdir64): Add libc_hidden_proto.
* sysdeps/mach/hurd/readdir64.c (__readdir64): Add libc_hidden_def.
* sysdeps/unix/sysv/linux/i386/readdir64.c (__readdir64): Likewise.
* sysdeps/unix/sysv/linux/readdir64.c (__readdir64): Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/readdir.c (__GI___readdir64):
New alias.
diff --git a/include/dirent.h b/include/dirent.h
index c792e53..818dbf4 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -15,13 +15,14 @@ struct scandir_cancel_struct
};
/* Now define the internal interfaces. */
-extern DIR *__opendir (const char *__name);
+extern DIR *__opendir (const char *__name) attribute_hidden;
extern DIR *__opendirat (int dfd, const char *__name)
internal_function attribute_hidden;
-extern DIR *__fdopendir (int __fd);
-extern int __closedir (DIR *__dirp);
-extern struct dirent *__readdir (DIR *__dirp);
+extern DIR *__fdopendir (int __fd) attribute_hidden;
+extern int __closedir (DIR *__dirp) attribute_hidden;
+extern struct dirent *__readdir (DIR *__dirp) attribute_hidden;
extern struct dirent64 *__readdir64 (DIR *__dirp);
+libc_hidden_proto (__readdir64)
extern int __readdir_r (DIR *__dirp, struct dirent *__entry,
struct dirent **__result);
extern int __readdir64_r (DIR *__dirp, struct dirent64 *__entry,
@@ -77,10 +78,6 @@ libc_hidden_proto (__scandirat)
libc_hidden_proto (scandirat64)
# if IS_IN (rtld)
-extern __typeof (__closedir) __closedir attribute_hidden;
-extern __typeof (__fdopendir) __fdopendir attribute_hidden;
-extern __typeof (__readdir) __readdir attribute_hidden;
-extern __typeof (__readdir64) __readdir64 attribute_hidden;
extern __typeof (__rewinddir) __rewinddir attribute_hidden;
# endif
# endif
diff --git a/sysdeps/mach/hurd/readdir64.c b/sysdeps/mach/hurd/readdir64.c
index f422fcf..bad0bcb 100644
--- a/sysdeps/mach/hurd/readdir64.c
+++ b/sysdeps/mach/hurd/readdir64.c
@@ -98,4 +98,5 @@ __readdir64 (DIR *dirp)
return dp;
}
+libc_hidden_def (__readdir64)
weak_alias (__readdir64, readdir64)
diff --git a/sysdeps/unix/sysv/linux/i386/readdir64.c b/sysdeps/unix/sysv/linux/i386/readdir64.c
index de8669f..8c235f9 100644
--- a/sysdeps/unix/sysv/linux/i386/readdir64.c
+++ b/sysdeps/unix/sysv/linux/i386/readdir64.c
@@ -27,6 +27,7 @@
#undef __GETDENTS
#undef DIRENT_TYPE
+libc_hidden_def (__readdir64)
versioned_symbol (libc, __readdir64, readdir64, GLIBC_2_2);
#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
diff --git a/sysdeps/unix/sysv/linux/readdir64.c b/sysdeps/unix/sysv/linux/readdir64.c
index 224f53d..6d154fe 100644
--- a/sysdeps/unix/sysv/linux/readdir64.c
+++ b/sysdeps/unix/sysv/linux/readdir64.c
@@ -4,4 +4,5 @@
#include <sysdeps/posix/readdir.c>
+libc_hidden_def (__readdir64)
weak_alias (__readdir64, readdir64)
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/readdir.c b/sysdeps/unix/sysv/linux/wordsize-64/readdir.c
index e197d93..0d57988 100644
--- a/sysdeps/unix/sysv/linux/wordsize-64/readdir.c
+++ b/sysdeps/unix/sysv/linux/wordsize-64/readdir.c
@@ -3,5 +3,6 @@
#include <sysdeps/posix/readdir.c>
#undef __readdir64
strong_alias (__readdir, __readdir64)
+strong_alias (__readdir, __GI___readdir64)
#undef readdir64
weak_alias (__readdir, readdir64)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8c7a18bf3de44db5ddbf0f32fc1ec1235fffa00d
commit 8c7a18bf3de44db5ddbf0f32fc1ec1235fffa00d
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Aug 19 15:49:08 2017 -0700
Mark internal getXXXbyYYY functions with attribute_hidden [BZ #18822]
Mark internal getXXXbyYYY functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/aliases.h (__getaliasbyname_r): Add attribute_hidden.
* include/netdb.h (__gethostbyaddr_r): Likewise.
(__gethostbyname_r): Likewise.
(__gethostbyname2_r): Likewise.
(__getnetbyaddr_r): Likewise.
(__getnetbyname_r): Likewise.
(__getservbyname_r): Likewise.
(__getservbyport_r): Likewise.
(__getprotobyname_r): Likewise.
(__getprotobynumber_r): Likewise.
(__getnetgrent_r): Likewise.
* include/rpc/netdb.h (__getrpcbyname_r): Likewise.
(__getrpcbynumber_r): Likewise.
diff --git a/include/aliases.h b/include/aliases.h
index ece69eb..11b81d4 100644
--- a/include/aliases.h
+++ b/include/aliases.h
@@ -14,7 +14,8 @@ extern int __old_getaliasent_r (struct aliasent *__restrict __result_buf,
extern int __getaliasbyname_r (const char *__restrict __name,
struct aliasent *__restrict __result_buf,
char *__restrict __buffer, size_t __buflen,
- struct aliasent **__restrict __result);
+ struct aliasent **__restrict __result)
+ attribute_hidden;
extern int __old_getaliasbyname_r (const char *__restrict __name,
struct aliasent *__restrict __result_buf,
char *__restrict __buffer, size_t __buflen,
diff --git a/include/netdb.h b/include/netdb.h
index d425a64..e230b1f 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -43,7 +43,8 @@ extern int __gethostbyaddr_r (const void *__restrict __addr,
struct hostent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct hostent **__restrict __result,
- int *__restrict __h_errnop);
+ int *__restrict __h_errnop)
+ attribute_hidden;
extern int __old_gethostbyaddr_r (const void *__restrict __addr,
socklen_t __len, int __type,
struct hostent *__restrict __result_buf,
@@ -63,7 +64,8 @@ extern int __gethostbyname_r (const char *__restrict __name,
struct hostent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct hostent **__restrict __result,
- int *__restrict __h_errnop);
+ int *__restrict __h_errnop)
+ attribute_hidden;
extern int __old_gethostbyname_r (const char *__restrict __name,
struct hostent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
@@ -74,7 +76,8 @@ extern int __gethostbyname2_r (const char *__restrict __name, int __af,
struct hostent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct hostent **__restrict __result,
- int *__restrict __h_errnop);
+ int *__restrict __h_errnop)
+ attribute_hidden;
extern int __old_gethostbyname2_r (const char *__restrict __name, int __af,
struct hostent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
@@ -101,7 +104,8 @@ extern int __getnetbyaddr_r (uint32_t __net, int __type,
struct netent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct netent **__restrict __result,
- int *__restrict __h_errnop);
+ int *__restrict __h_errnop)
+ attribute_hidden;
extern int __old_getnetbyaddr_r (uint32_t __net, int __type,
struct netent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
@@ -112,7 +116,8 @@ extern int __getnetbyname_r (const char *__restrict __name,
struct netent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct netent **__restrict __result,
- int *__restrict __h_errnop);
+ int *__restrict __h_errnop)
+ attribute_hidden;
extern int __old_getnetbyname_r (const char *__restrict __name,
struct netent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
@@ -131,7 +136,8 @@ extern int __getservbyname_r (const char *__restrict __name,
const char *__restrict __proto,
struct servent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
- struct servent **__restrict __result);
+ struct servent **__restrict __result)
+ attribute_hidden;
extern int __old_getservbyname_r (const char *__restrict __name,
const char *__restrict __proto,
struct servent *__restrict __result_buf,
@@ -142,7 +148,8 @@ extern int __getservbyport_r (int __port,
const char *__restrict __proto,
struct servent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
- struct servent **__restrict __result);
+ struct servent **__restrict __result)
+ attribute_hidden;
extern int __old_getservbyport_r (int __port,
const char *__restrict __proto,
struct servent *__restrict __result_buf,
@@ -160,7 +167,8 @@ extern int __old_getprotoent_r (struct protoent *__restrict __result_buf,
extern int __getprotobyname_r (const char *__restrict __name,
struct protoent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
- struct protoent **__restrict __result);
+ struct protoent **__restrict __result)
+ attribute_hidden;
extern int __old_getprotobyname_r (const char *__restrict __name,
struct protoent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
@@ -169,7 +177,8 @@ extern int __old_getprotobyname_r (const char *__restrict __name,
extern int __getprotobynumber_r (int __proto,
struct protoent *__restrict __res_buf,
char *__restrict __buf, size_t __buflen,
- struct protoent **__restrict __result);
+ struct protoent **__restrict __result)
+ attribute_hidden;
extern int __old_getprotobynumber_r (int __proto,
struct protoent *__restrict __res_buf,
char *__restrict __buf, size_t __buflen,
@@ -178,7 +187,8 @@ extern int __old_getprotobynumber_r (int __proto,
extern int __getnetgrent_r (char **__restrict __hostp,
char **__restrict __userp,
char **__restrict __domainp,
- char *__restrict __buffer, size_t __buflen);
+ char *__restrict __buffer, size_t __buflen)
+ attribute_hidden;
extern int ruserpass (const char *host, const char **aname,
const char **apass);
diff --git a/include/rpc/netdb.h b/include/rpc/netdb.h
index 9b84668..eb75f3f 100644
--- a/include/rpc/netdb.h
+++ b/include/rpc/netdb.h
@@ -5,7 +5,7 @@
extern int __getrpcbyname_r (const char *__name, struct rpcent *__result_buf,
char *__buffer, size_t __buflen,
- struct rpcent **__result);
+ struct rpcent **__result) attribute_hidden;
extern int __old_getrpcbyname_r (const char *__name,
struct rpcent *__result_buf,
char *__buffer, size_t __buflen,
@@ -13,7 +13,7 @@ extern int __old_getrpcbyname_r (const char *__name,
extern int __getrpcbynumber_r (int __number, struct rpcent *__result_buf,
char *__buffer, size_t __buflen,
- struct rpcent **__result);
+ struct rpcent **__result) attribute_hidden;
extern int __old_getrpcbynumber_r (int __number, struct rpcent *__result_buf,
char *__buffer, size_t __buflen,
struct rpcent **__result);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a2a07f1af999b385f18c13dd34b04c787513f023
commit a2a07f1af999b385f18c13dd34b04c787513f023
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Aug 19 15:45:30 2017 -0700
Mark internal stdio functions with attribute_hidden [BZ #18822]
Mark internal stdio functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/stdio.h (__fcloseall): Add attribute_hidden.
(__getline): Likewise.
(__path_search): Likewise.
(__gen_tempname): Likewise.
(__libc_message): Likewise.
(__flockfile): Likewise.
(__funlockfile): Likewise.
(__fxprintf): Likewise.
(__fxprintf_nocancel): Likewise.
diff --git a/include/stdio.h b/include/stdio.h
index 5c0ef8e..8a76eb1 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -4,7 +4,7 @@
/* Now define the internal interfaces. */
-extern int __fcloseall (void);
+extern int __fcloseall (void) attribute_hidden;
extern int __snprintf (char *__restrict __s, size_t __maxlen,
const char *__restrict __format, ...)
__attribute__ ((__format__ (__printf__, 3, 4)));
@@ -21,7 +21,7 @@ extern int __vscanf (const char *__restrict __format,
_G_va_list __arg)
__attribute__ ((__format__ (__scanf__, 1, 0)));
extern _IO_ssize_t __getline (char **__lineptr, size_t *__n,
- FILE *__stream);
+ FILE *__stream) attribute_hidden;
extern int __vsscanf (const char *__restrict __s,
const char *__restrict __format,
_G_va_list __arg)
@@ -77,10 +77,10 @@ extern FILE *__old_tmpfile (void);
/* Generate a unique file name (and possibly open it). */
extern int __path_search (char *__tmpl, size_t __tmpl_len,
const char *__dir, const char *__pfx,
- int __try_tempdir);
+ int __try_tempdir) attribute_hidden;
extern int __gen_tempname (char *__tmpl, int __suffixlen, int __flags,
- int __kind);
+ int __kind) attribute_hidden;
/* The __kind argument to __gen_tempname may be one of: */
# define __GT_FILE 0 /* create a file */
# define __GT_DIR 1 /* create a directory */
@@ -97,7 +97,7 @@ enum __libc_message_action
extern void __libc_fatal (const char *__message)
__attribute__ ((__noreturn__));
extern void __libc_message (enum __libc_message_action action,
- const char *__fnt, ...);
+ const char *__fnt, ...) attribute_hidden;
extern void __fortify_fail (const char *msg) __attribute__ ((__noreturn__));
extern void __fortify_fail_abort (_Bool, const char *msg)
__attribute__ ((__noreturn__)) attribute_hidden;
@@ -105,10 +105,10 @@ libc_hidden_proto (__fortify_fail)
libc_hidden_proto (__fortify_fail_abort)
/* Acquire ownership of STREAM. */
-extern void __flockfile (FILE *__stream);
+extern void __flockfile (FILE *__stream) attribute_hidden;
/* Relinquish the ownership granted for STREAM. */
-extern void __funlockfile (FILE *__stream);
+extern void __funlockfile (FILE *__stream) attribute_hidden;
/* Try to acquire ownership of STREAM but do not block if it is not
possible. */
@@ -118,9 +118,9 @@ extern int __getc_unlocked (FILE *__fp);
extern wint_t __getwc_unlocked (FILE *__fp);
extern int __fxprintf (FILE *__fp, const char *__fmt, ...)
- __attribute__ ((__format__ (__printf__, 2, 3)));
+ __attribute__ ((__format__ (__printf__, 2, 3))) attribute_hidden;
extern int __fxprintf_nocancel (FILE *__fp, const char *__fmt, ...)
- __attribute__ ((__format__ (__printf__, 2, 3)));
+ __attribute__ ((__format__ (__printf__, 2, 3))) attribute_hidden;
extern const char *const _sys_errlist_internal[] attribute_hidden;
extern int _sys_nerr_internal attribute_hidden;
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7a9429114fc130eb548623d5b3f9d56eddd51e1d
commit 7a9429114fc130eb548623d5b3f9d56eddd51e1d
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Aug 19 15:44:27 2017 -0700
Mark internal gshadow functions with attribute_hidden [BZ #18822]
Mark internal gshadow functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/gshadow.h (__fgetsgent_r): Add attribute_hidden.
(__sgetsgent_r): Likewise.
diff --git a/include/gshadow.h b/include/gshadow.h
index 532801a..aa6a5a6 100644
--- a/include/gshadow.h
+++ b/include/gshadow.h
@@ -4,9 +4,11 @@
# ifndef _ISOMAC
extern int __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char *buffer,
- size_t buflen, struct sgrp **result);
+ size_t buflen, struct sgrp **result)
+ attribute_hidden;
extern int __sgetsgent_r (const char *string, struct sgrp *resbuf,
- char *buffer, size_t buflen, struct sgrp **result);
+ char *buffer, size_t buflen, struct sgrp **result)
+ attribute_hidden;
struct parser_data;
extern int _nss_files_parse_sgent (char *line, struct sgrp *result,
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5df5a6815931fdb2c95dccf5c331ffc059dd923b
commit 5df5a6815931fdb2c95dccf5c331ffc059dd923b
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sat Aug 19 15:37:42 2017 -0700
Mark internal statfs functions with attribute_hidden [BZ #18822]
Mark internal statfs functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/sys/statfs.h (__fstatfs): Add attribute_hidden.
(__statfs64): Likewise.
(__fstatfs64): Likewise.
* include/sys/statvfs.h (__statvfs64): Likewise.
(__fstatvfs64): Likewise.
* sysdeps/unix/sysv/linux/pathconf.h (__statfs_link_max): Likewise.
(__statfs_filesize_max): Likewise.
(__statfs_symlinks): Likewise.
(__statfs_chown_restricted): Likewise.
diff --git a/include/sys/statfs.h b/include/sys/statfs.h
index 3fac4a3..8a9f5a7 100644
--- a/include/sys/statfs.h
+++ b/include/sys/statfs.h
@@ -6,9 +6,12 @@
/* Now define the internal interfaces. */
extern int __statfs (const char *__file, struct statfs *__buf);
libc_hidden_proto (__statfs)
-extern int __fstatfs (int __fildes, struct statfs *__buf);
-extern int __statfs64 (const char *__file, struct statfs64 *__buf);
-extern int __fstatfs64 (int __fildes, struct statfs64 *__buf);
+extern int __fstatfs (int __fildes, struct statfs *__buf)
+ attribute_hidden;
+extern int __statfs64 (const char *__file, struct statfs64 *__buf)
+ attribute_hidden;
+extern int __fstatfs64 (int __fildes, struct statfs64 *__buf)
+ attribute_hidden;
# endif /* !_ISOMAC */
#endif
diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h
index fa30453..4cd1977 100644
--- a/include/sys/statvfs.h
+++ b/include/sys/statvfs.h
@@ -3,8 +3,10 @@
#ifndef _ISOMAC
/* Now define the internal interfaces. */
-extern int __statvfs64 (const char *__file, struct statvfs64 *__buf);
-extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf);
+extern int __statvfs64 (const char *__file, struct statvfs64 *__buf)
+ attribute_hidden;
+extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf)
+ attribute_hidden;
libc_hidden_proto (statvfs)
libc_hidden_proto (fstatvfs)
diff --git a/sysdeps/unix/sysv/linux/pathconf.h b/sysdeps/unix/sysv/linux/pathconf.h
index 5de2915..b9de04f 100644
--- a/sysdeps/unix/sysv/linux/pathconf.h
+++ b/sysdeps/unix/sysv/linux/pathconf.h
@@ -24,17 +24,21 @@
/* Used like: return __statfs_link_max (__statfs (name, &buf), &buf,
name, -1); */
extern long int __statfs_link_max (int result, const struct statfs *fsbuf,
- const char *file, int fd);
+ const char *file, int fd)
+ attribute_hidden;
/* Used like: return __statfs_filesize_max (__statfs (name, &buf), &buf); */
-extern long int __statfs_filesize_max (int result, const struct statfs *fsbuf);
+extern long int __statfs_filesize_max (int result, const struct statfs *fsbuf)
+ attribute_hidden;
/* Used like: return __statfs_link_max (__statfs (name, &buf), &buf); */
-extern long int __statfs_symlinks (int result, const struct statfs *fsbuf);
+extern long int __statfs_symlinks (int result, const struct statfs *fsbuf)
+ attribute_hidden;
/* Used like: return __statfs_chown_restricted (__statfs (name, &buf), &buf);*/
extern long int __statfs_chown_restricted (int result,
- const struct statfs *fsbuf);
+ const struct statfs *fsbuf)
+ attribute_hidden;
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3b1e3605fa2e73953f87b61d2a2df057b0766178
commit 3b1e3605fa2e73953f87b61d2a2df057b0766178
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Aug 18 17:30:29 2017 -0700
Mark internal time functions with attribute_hidden [BZ #18822]
Mark internal time functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/time.h (__tzstring): Add attribute_hidden.
(__tzfile_read): Likewise.
(__tzfile_compute): Likewise.
(__tzfile_default): Likewise.
(__tzset_parse_tz): Likewise.
(__offtime): Likewise.
(__asctime_r): Likewise.
(__tzset): Likewise.
(__tz_convert): Likewise.
(__getdate_r): Likewise.
(__getclktck): Likewise.
diff --git a/include/time.h b/include/time.h
index 0fc429a..e5f4c7e 100644
--- a/include/time.h
+++ b/include/time.h
@@ -33,18 +33,19 @@ extern const unsigned short int __mon_yday[2][13] attribute_hidden;
extern struct tm _tmbuf attribute_hidden;
/* Defined in tzset.c. */
-extern char *__tzstring (const char *string);
+extern char *__tzstring (const char *string) attribute_hidden;
extern int __use_tzfile attribute_hidden;
extern void __tzfile_read (const char *file, size_t extra,
- char **extrap);
+ char **extrap) attribute_hidden;
extern void __tzfile_compute (time_t timer, int use_localtime,
long int *leap_correct, int *leap_hit,
- struct tm *tp);
+ struct tm *tp) attribute_hidden;
extern void __tzfile_default (const char *std, const char *dst,
- long int stdoff, long int dstoff);
-extern void __tzset_parse_tz (const char *tz);
+ long int stdoff, long int dstoff)
+ attribute_hidden;
+extern void __tzset_parse_tz (const char *tz) attribute_hidden;
extern void __tz_compute (time_t timer, struct tm *tm, int use_localtime)
__THROW internal_function attribute_hidden;
@@ -68,13 +69,15 @@ libc_hidden_proto (__gmtime_r)
Return nonzero if successful. */
extern int __offtime (const time_t *__timer,
long int __offset,
- struct tm *__tp);
+ struct tm *__tp) attribute_hidden;
-extern char *__asctime_r (const struct tm *__tp, char *__buf);
-extern void __tzset (void);
+extern char *__asctime_r (const struct tm *__tp, char *__buf)
+ attribute_hidden;
+extern void __tzset (void) attribute_hidden;
/* Prototype for the internal function to get information based on TZ. */
-extern struct tm *__tz_convert (const time_t *timer, int use_localtime, struct tm *tp);
+extern struct tm *__tz_convert (const time_t *timer, int use_localtime,
+ struct tm *tp) attribute_hidden;
extern int __nanosleep (const struct timespec *__requested_time,
struct timespec *__remaining);
@@ -82,11 +85,12 @@ hidden_proto (__nanosleep)
extern int __nanosleep_nocancel (const struct timespec *__requested_time,
struct timespec *__remaining)
attribute_hidden;
-extern int __getdate_r (const char *__string, struct tm *__resbufp);
+extern int __getdate_r (const char *__string, struct tm *__resbufp)
+ attribute_hidden;
/* Determine CLK_TCK value. */
-extern int __getclktck (void);
+extern int __getclktck (void) attribute_hidden;
/* strptime support. */
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=eabaefac7b4b1c79b4fb7114f39cc64902447717
commit eabaefac7b4b1c79b4fb7114f39cc64902447717
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Aug 18 17:16:26 2017 -0700
Mark internal nscd functions with attribute_hidden [BZ #18822]
Mark internal nscd functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* nscd/nscd-client.h (__nscd_get_map_ref): Add attribute_hidden.
(__nscd_unmap): Likewise.
(__nscd_cache_search): Likewise.
(__nscd_get_nl_timestamp): Likewise.
(__nscd_getpwnam_r): Likewise.
(__nscd_getpwuid_r): Likewise.
(__nscd_getgrnam_r): Likewise.
(__nscd_getgrgid_r): Likewise.
(__nscd_gethostbyname_r): Likewise.
(__nscd_gethostbyname2_r): Likewise.
(__nscd_gethostbyaddr_r): Likewise.
(__nscd_getai): Likewise.
(__nscd_getgrouplist): Likewise.
(__nscd_getservbyname_r): Likewise.
(__nscd_getservbyport_r): Likewise.
(__nscd_innetgr): Likewise.
(__nscd_setnetgrent): Likewise.
diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
index 96170bf..9155218 100644
--- a/nscd/nscd-client.h
+++ b/nscd/nscd-client.h
@@ -400,10 +400,12 @@ extern struct mapped_database *__nscd_get_mapping (request_type type,
extern struct mapped_database *__nscd_get_map_ref (request_type type,
const char *name,
volatile struct locked_map_ptr *mapptr,
- int *gc_cyclep);
+ int *gc_cyclep)
+ attribute_hidden;
/* Unmap database. */
-extern void __nscd_unmap (struct mapped_database *mapped);
+extern void __nscd_unmap (struct mapped_database *mapped)
+ attribute_hidden;
/* Drop reference of mapping. */
static int
@@ -433,7 +435,8 @@ extern struct datahead *__nscd_cache_search (request_type type,
const char *key,
size_t keylen,
const struct mapped_database *mapped,
- size_t datalen);
+ size_t datalen)
+ attribute_hidden;
/* Wrappers around read, readv and write that only read/write less than LEN
bytes on error or EOF. */
@@ -447,6 +450,7 @@ extern ssize_t sendfileall (int tofd, int fromfd, off_t off, size_t len)
attribute_hidden;
/* Get netlink timestamp counter from mapped area or zero. */
-extern uint32_t __nscd_get_nl_timestamp (void);
+extern uint32_t __nscd_get_nl_timestamp (void)
+ attribute_hidden;
#endif /* nscd.h */
diff --git a/nscd/nscd_proto.h b/nscd/nscd_proto.h
index 7c61821..2ec0885 100644
--- a/nscd/nscd_proto.h
+++ b/nscd/nscd_proto.h
@@ -39,41 +39,49 @@ extern int __nss_not_use_nscd_netgroup attribute_hidden;
extern int __nscd_getpwnam_r (const char *name, struct passwd *resultbuf,
char *buffer, size_t buflen,
- struct passwd **result);
+ struct passwd **result) attribute_hidden;
extern int __nscd_getpwuid_r (uid_t uid, struct passwd *resultbuf,
char *buffer, size_t buflen,
- struct passwd **result);
+ struct passwd **result) attribute_hidden;
extern int __nscd_getgrnam_r (const char *name, struct group *resultbuf,
char *buffer, size_t buflen,
- struct group **result);
+ struct group **result) attribute_hidden;
extern int __nscd_getgrgid_r (gid_t gid, struct group *resultbuf,
char *buffer, size_t buflen,
- struct group **result);
+ struct group **result) attribute_hidden;
extern int __nscd_gethostbyname_r (const char *name,
struct hostent *resultbuf,
char *buffer, size_t buflen,
- struct hostent **result, int *h_errnop);
+ struct hostent **result, int *h_errnop)
+ attribute_hidden;
extern int __nscd_gethostbyname2_r (const char *name, int af,
struct hostent *resultbuf,
char *buffer, size_t buflen,
- struct hostent **result, int *h_errnop);
+ struct hostent **result, int *h_errnop)
+ attribute_hidden;
extern int __nscd_gethostbyaddr_r (const void *addr, socklen_t len, int type,
struct hostent *resultbuf,
char *buffer, size_t buflen,
- struct hostent **result, int *h_errnop);
+ struct hostent **result, int *h_errnop)
+ attribute_hidden;
extern int __nscd_getai (const char *key, struct nscd_ai_result **result,
- int *h_errnop);
+ int *h_errnop) attribute_hidden;
extern int __nscd_getgrouplist (const char *user, gid_t group, long int *size,
- gid_t **groupsp, long int limit);
+ gid_t **groupsp, long int limit)
+ attribute_hidden;
extern int __nscd_getservbyname_r (const char *name, const char *proto,
struct servent *result_buf, char *buf,
- size_t buflen, struct servent **result);
+ size_t buflen, struct servent **result)
+ attribute_hidden;
extern int __nscd_getservbyport_r (int port, const char *proto,
struct servent *result_buf, char *buf,
- size_t buflen, struct servent **result);
+ size_t buflen, struct servent **result)
+ attribute_hidden;
extern int __nscd_innetgr (const char *netgroup, const char *host,
- const char *user, const char *domain);
-extern int __nscd_setnetgrent (const char *group, struct __netgrent *datap);
+ const char *user, const char *domain)
+ attribute_hidden;
+extern int __nscd_setnetgrent (const char *group, struct __netgrent *datap)
+ attribute_hidden;
#endif /* _NSCD_PROTO_H */
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d7e24e19bc04107e0b209f26483d92751eedd2f6
commit d7e24e19bc04107e0b209f26483d92751eedd2f6
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Aug 18 17:04:20 2017 -0700
Mark internal gmp functions with attribute_hidden [BZ #18822]
Mark internal gmp functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/gmp.h: Declare internal functions only if _ISOMAC is
undefined.
(__mpn_extract_double): Add attribute_hidden.
(__mpn_extract_long_double): Likewise.
(__mpn_extract_float128): Likewise.
(__mpn_construct_float): Likewise.
(__mpn_construct_double): Likewise.
(__mpn_construct_long_double): Likewise.
(__mpn_construct_float128): Likewise.
(mpn_add_1): Likewise.
(mpn_addmul_1): Likewise.
(mpn_add_n): Likewise.
(mpn_cmp): Likewise.
(mpn_divrem): Likewise.
(mpn_lshift): Likewise.
(mpn_mul): Likewise.
(mpn_mul_1): Likewise.
(mpn_rshift): Likewise.
(mpn_sub_1): Likewise.
(mpn_submul_1): Likewise.
(mpn_sub_n): Likewise.
diff --git a/include/gmp.h b/include/gmp.h
index 3590acf..657c7a0 100644
--- a/include/gmp.h
+++ b/include/gmp.h
@@ -8,32 +8,51 @@
#include <bits/floatn.h>
+#ifndef _ISOMAC
/* Now define the internal interfaces. */
extern mp_size_t __mpn_extract_double (mp_ptr res_ptr, mp_size_t size,
int *expt, int *is_neg,
- double value);
+ double value) attribute_hidden;
extern mp_size_t __mpn_extract_long_double (mp_ptr res_ptr, mp_size_t size,
int *expt, int *is_neg,
- long double value);
+ long double value)
+ attribute_hidden;
#if __HAVE_DISTINCT_FLOAT128
extern mp_size_t __mpn_extract_float128 (mp_ptr res_ptr, mp_size_t size,
int *expt, int *is_neg,
- _Float128 value);
+ _Float128 value)
+ attribute_hidden;
#endif
-extern float __mpn_construct_float (mp_srcptr frac_ptr, int expt, int sign);
+extern float __mpn_construct_float (mp_srcptr frac_ptr, int expt, int sign)
+ attribute_hidden;
extern double __mpn_construct_double (mp_srcptr frac_ptr, int expt,
- int negative);
+ int negative) attribute_hidden;
extern long double __mpn_construct_long_double (mp_srcptr frac_ptr, int expt,
- int sign);
+ int sign)
+ attribute_hidden;
#if __HAVE_DISTINCT_FLOAT128
extern _Float128 __mpn_construct_float128 (mp_srcptr frac_ptr, int expt,
- int sign);
+ int sign) attribute_hidden;
+#endif
+
+extern __typeof (mpn_add_1) mpn_add_1 attribute_hidden;
+extern __typeof (mpn_addmul_1) mpn_addmul_1 attribute_hidden;
+extern __typeof (mpn_add_n) mpn_add_n attribute_hidden;
+extern __typeof (mpn_cmp) mpn_cmp attribute_hidden;
+extern __typeof (mpn_divrem) mpn_divrem attribute_hidden;
+extern __typeof (mpn_lshift) mpn_lshift attribute_hidden;
+extern __typeof (mpn_mul) mpn_mul attribute_hidden;
+extern __typeof (mpn_mul_1) mpn_mul_1 attribute_hidden;
+extern __typeof (mpn_rshift) mpn_rshift attribute_hidden;
+extern __typeof (mpn_sub_1) mpn_sub_1 attribute_hidden;
+extern __typeof (mpn_submul_1) mpn_submul_1 attribute_hidden;
+extern __typeof (mpn_sub_n) mpn_sub_n attribute_hidden;
#endif
#endif
diff --git a/stdlib/gmp-impl.h b/stdlib/gmp-impl.h
index 42d3e4a..cbbf947 100644
--- a/stdlib/gmp-impl.h
+++ b/stdlib/gmp-impl.h
@@ -308,13 +308,17 @@ typedef unsigned int UHWtype;
/* Prototypes for internal mpn calls. */
extern void impn_mul_n_basecase _PROTO ((mp_ptr prodp, mp_srcptr up,
- mp_srcptr vp, mp_size_t size));
+ mp_srcptr vp, mp_size_t size))
+ attribute_hidden;
extern void impn_mul_n _PROTO ((mp_ptr prodp, mp_srcptr up, mp_srcptr vp,
- mp_size_t size, mp_ptr tspace));
+ mp_size_t size, mp_ptr tspace))
+ attribute_hidden;
extern void impn_sqr_n_basecase _PROTO ((mp_ptr prodp, mp_srcptr up,
- mp_size_t size));
+ mp_size_t size))
+ attribute_hidden;
extern void impn_sqr_n _PROTO ((mp_ptr prodp, mp_srcptr up, mp_size_t size,
- mp_ptr tspace));
+ mp_ptr tspace))
+ attribute_hidden;
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a11e4b7509038cd6d3ace5c92a8d2db2827c785b
commit a11e4b7509038cd6d3ace5c92a8d2db2827c785b
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Aug 18 13:24:43 2017 -0700
Mark internal wchar functions with attribute_hidden [BZ #18822]
Mark internal wchar functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/wchar.h (__wcsnlen): Add attribute_hidden.
(__wcscat): Likewise.
(__btowc): Likewise.
(__wcrtomb): Likewise.
(__mbsrtowcs): Likewise.
(__wcsrtombs): Likewise.
(__mbsnrtowcs): Likewise.
(__wcsnrtombs): Likewise.
(__wcsncpy): Likewise.
(__wcpncpy): Likewise.
(__wmemcpy): Likewise.
(__wmempcpy): Likewise.
(__wmemmove): Likewise.
(__wcschrnul): Likewise.
(__vfwscanf): Likewise.
(__vswprintf): Likewise.
(__fwprintf): Likewise.
(__vfwprintf): Likewise.
diff --git a/include/wchar.h b/include/wchar.h
index eb472da..24b2eaa 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -152,9 +152,10 @@ extern int __wcsncasecmp (const wchar_t *__s1, const wchar_t *__s2,
__attribute_pure__;
extern size_t __wcslen (const wchar_t *__s) __attribute_pure__;
extern size_t __wcsnlen (const wchar_t *__s, size_t __maxlen)
- __attribute_pure__;
-extern wchar_t *__wcscat (wchar_t *dest, const wchar_t *src);
-extern wint_t __btowc (int __c);
+ attribute_hidden __attribute_pure__;
+extern wchar_t *__wcscat (wchar_t *dest, const wchar_t *src)
+ attribute_hidden;
+extern wint_t __btowc (int __c) attribute_hidden;
extern int __mbsinit (const __mbstate_t *__ps);
extern size_t __mbrtowc (wchar_t *__restrict __pwc,
const char *__restrict __s, size_t __n,
@@ -162,34 +163,39 @@ extern size_t __mbrtowc (wchar_t *__restrict __pwc,
libc_hidden_proto (__mbrtowc)
libc_hidden_proto (__mbrlen)
extern size_t __wcrtomb (char *__restrict __s, wchar_t __wc,
- __mbstate_t *__restrict __ps);
+ __mbstate_t *__restrict __ps) attribute_hidden;
extern size_t __mbsrtowcs (wchar_t *__restrict __dst,
const char **__restrict __src,
- size_t __len, __mbstate_t *__restrict __ps);
+ size_t __len, __mbstate_t *__restrict __ps)
+ attribute_hidden;
extern size_t __wcsrtombs (char *__restrict __dst,
const wchar_t **__restrict __src,
- size_t __len, __mbstate_t *__restrict __ps);
+ size_t __len, __mbstate_t *__restrict __ps)
+ attribute_hidden;
extern size_t __mbsnrtowcs (wchar_t *__restrict __dst,
const char **__restrict __src, size_t __nmc,
- size_t __len, __mbstate_t *__restrict __ps);
+ size_t __len, __mbstate_t *__restrict __ps)
+ attribute_hidden;
extern size_t __wcsnrtombs (char *__restrict __dst,
const wchar_t **__restrict __src,
size_t __nwc, size_t __len,
- __mbstate_t *__restrict __ps);
+ __mbstate_t *__restrict __ps)
+ attribute_hidden;
extern wchar_t *__wcsncpy (wchar_t *__restrict __dest,
- const wchar_t *__restrict __src, size_t __n);
+ const wchar_t *__restrict __src, size_t __n)
+ attribute_hidden;
extern wchar_t *__wcpcpy (wchar_t *__dest, const wchar_t *__src);
extern wchar_t *__wcpncpy (wchar_t *__dest, const wchar_t *__src,
- size_t __n);
+ size_t __n) attribute_hidden;
extern wchar_t *__wmemcpy (wchar_t *__s1, const wchar_t *s2,
- size_t __n);
+ size_t __n) attribute_hidden;
extern wchar_t *__wmempcpy (wchar_t *__restrict __s1,
const wchar_t *__restrict __s2,
- size_t __n);
+ size_t __n) attribute_hidden;
extern wchar_t *__wmemmove (wchar_t *__s1, const wchar_t *__s2,
- size_t __n);
+ size_t __n) attribute_hidden;
extern wchar_t *__wcschrnul (const wchar_t *__s, wchar_t __wc)
- __attribute_pure__;
+ attribute_hidden __attribute_pure__;
extern wchar_t *__wmemset_chk (wchar_t *__s, wchar_t __c, size_t __n,
size_t __ns) __THROW;
@@ -197,17 +203,21 @@ extern wchar_t *__wmemset_chk (wchar_t *__s, wchar_t __c, size_t __n,
extern int __vfwscanf (__FILE *__restrict __s,
const wchar_t *__restrict __format,
__gnuc_va_list __arg)
+ attribute_hidden
/* __attribute__ ((__format__ (__wscanf__, 2, 0)) */;
extern int __vswprintf (wchar_t *__restrict __s, size_t __n,
const wchar_t *__restrict __format,
__gnuc_va_list __arg)
+ attribute_hidden
/* __attribute__ ((__format__ (__wprintf__, 3, 0))) */;
extern int __fwprintf (__FILE *__restrict __s,
const wchar_t *__restrict __format, ...)
+ attribute_hidden
/* __attribute__ ((__format__ (__wprintf__, 2, 3))) */;
extern int __vfwprintf (__FILE *__restrict __s,
const wchar_t *__restrict __format,
__gnuc_va_list __arg)
+ attribute_hidden
/* __attribute__ ((__format__ (__wprintf__, 2, 0))) */;
extern int __vfwprintf_chk (FILE *__restrict __s, int __flag,
const wchar_t *__restrict __format,
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e7fb5098ab52f70621181b9ccf2bfb9119a24e50
commit e7fb5098ab52f70621181b9ccf2bfb9119a24e50
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Aug 18 09:52:52 2017 -0700
Mark __dso_handle as hidden [BZ #18822]
Since __dso_handle is always defined by either crtbegin.o from GCC or
dso_handle.c, it should be marked as hidden and be passed directly.
[BZ #18822]
* dlfcn/modatexit.c (foo): Remove __dso_handle check.
* dlfcn/modcxaatexit.c (__dso_handle): Remove declaration.
* dlfcn/tstatexit.c (__dso_handle): Removed.
(main): Don't check __dso_handle.
* dlfcn/tstcxaatexit.c (__dso_handle): Removed.
(main): Don't check __dso_handle.
* include/stdlib.h (__dso_handle): New.
* malloc/mtrace.c (__dso_handle): Remove declaration.
(mtrace): Pass __dso_handle directly.
* nptl/pthread_atfork.c (__dso_handle): Remove declaration.
(__pthread_atfork): Pass __dso_handle directly.
* nptl/tst-atfork2mod.c (__dso_handle): Removed.
* posix/wordexp-test.c (__dso_handle): Remove declaration.
(__app_register_atfork): Pass __dso_handle directly.
* stdlib/at_quick_exit.c (__dso_handle): Remove declaration.
(at_quick_exit): Pass __dso_handle directly.
* stdlib/atexit.c (__dso_handle): Remove declaration.
(atexit): Pass __dso_handle directly.
* stdlib/tst-tls-atexit-lib.c (__dso_handle): Removed.
diff --git a/dlfcn/modatexit.c b/dlfcn/modatexit.c
index e620d10..95c18dc 100644
--- a/dlfcn/modatexit.c
+++ b/dlfcn/modatexit.c
@@ -35,9 +35,7 @@ dummy (void)
void
foo (void *p)
{
- extern void *__dso_handle __attribute__ ((__weak__));
printf ("This is %s\n", __FUNCTION__);
atexit (dummy);
- if (&__dso_handle) puts ("have dso handle"); else puts ("no dso handle");
ip = p;
}
diff --git a/dlfcn/modcxaatexit.c b/dlfcn/modcxaatexit.c
index fbda2f3..b921b5c 100644
--- a/dlfcn/modcxaatexit.c
+++ b/dlfcn/modcxaatexit.c
@@ -34,7 +34,6 @@ fluffy (void *p)
void
bar (void *p)
{
- extern void *__dso_handle;
printf ("This is %s\n", __FUNCTION__);
__cxa_atexit (fluffy, p, __dso_handle);
}
diff --git a/dlfcn/tstatexit.c b/dlfcn/tstatexit.c
index 2073843..e25a3f8 100644
--- a/dlfcn/tstatexit.c
+++ b/dlfcn/tstatexit.c
@@ -20,8 +20,6 @@
#include <stdlib.h>
-extern void *__dso_handle __attribute__ ((__weak__));
-
int
main (void)
{
@@ -30,12 +28,6 @@ main (void)
void (*fp) (void *);
int v = 0;
- if (&__dso_handle == NULL)
- {
- puts ("__dso_handle not available, cannot perform the test");
- exit (0);
- }
-
h = dlopen (fname, RTLD_NOW);
if (h == NULL)
{
diff --git a/dlfcn/tstcxaatexit.c b/dlfcn/tstcxaatexit.c
index fde645c..37f25d6 100644
--- a/dlfcn/tstcxaatexit.c
+++ b/dlfcn/tstcxaatexit.c
@@ -19,8 +19,6 @@
#include <stdio.h>
#include <stdlib.h>
-extern void *__dso_handle __attribute__ ((__weak__));
-
int
main (void)
{
@@ -29,12 +27,6 @@ main (void)
void (*fp) (void *);
int v = 0;
- if (&__dso_handle == NULL)
- {
- puts ("__dso_handle not available, cannot perform the test");
- exit (0);
- }
-
h = dlopen (fname, RTLD_LAZY);
if (h == NULL)
{
diff --git a/include/stdlib.h b/include/stdlib.h
index 2274790..d0dcbf8 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -5,6 +5,10 @@
#endif
#include <stdlib/stdlib.h>
+/* __dso_handle is always defined by either crtbegin.o from GCC or our
+ dso_handle.c. */
+extern void *__dso_handle __attribute__ ((visibility ("hidden")));
+
/* Now define the internal interfaces. */
#if !defined _ISOMAC
# include <sys/stat.h>
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index d6eb497..7ff6d23 100644
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -315,10 +315,9 @@ mtrace (void)
#ifdef _LIBC
if (!added_atexit_handler)
{
- extern void *__dso_handle __attribute__ ((__weak__));
added_atexit_handler = 1;
__cxa_atexit ((void (*)(void *))release_libc_mem, NULL,
- &__dso_handle ? __dso_handle : NULL);
+ __dso_handle);
}
#endif
}
diff --git a/nptl/pthread_atfork.c b/nptl/pthread_atfork.c
index dc2ea07..dd328b7 100644
--- a/nptl/pthread_atfork.c
+++ b/nptl/pthread_atfork.c
@@ -36,10 +36,6 @@
#include "pthreadP.h"
#include <fork.h>
-/* This is defined by newer gcc version unique for each module. */
-extern void *__dso_handle __attribute__ ((__weak__,
- __visibility__ ("hidden")));
-
/* Hide the symbol so that no definition but the one locally in the
executable or DSO is used. */
@@ -51,8 +47,7 @@ attribute_hidden
__pthread_atfork (void (*prepare) (void), void (*parent) (void),
void (*child) (void))
{
- return __register_atfork (prepare, parent, child,
- &__dso_handle == NULL ? NULL : __dso_handle);
+ return __register_atfork (prepare, parent, child, __dso_handle);
}
#ifndef __pthread_atfork
extern int pthread_atfork (void (*prepare) (void), void (*parent) (void),
diff --git a/nptl/tst-atfork2mod.c b/nptl/tst-atfork2mod.c
index fe64046..1e49612 100644
--- a/nptl/tst-atfork2mod.c
+++ b/nptl/tst-atfork2mod.c
@@ -46,7 +46,6 @@ static void
__attribute__ ((constructor))
init (void)
{
- extern void *__dso_handle;
printf ("dsohandle = %p\n", __dso_handle);
if (pthread_atfork (prepare, parent, child) != 0)
diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c
index 17ae812..6ae7696 100644
--- a/posix/wordexp-test.c
+++ b/posix/wordexp-test.c
@@ -30,13 +30,11 @@
#define IFS " \n\t"
-extern void *__dso_handle __attribute__ ((__weak__, __visibility__ ("hidden")));
extern int __register_atfork (void (*) (void), void (*) (void), void (*) (void), void *);
static int __app_register_atfork (void (*prepare) (void), void (*parent) (void), void (*child) (void))
{
- return __register_atfork (prepare, parent, child,
- &__dso_handle == NULL ? NULL : __dso_handle);
+ return __register_atfork (prepare, parent, child, __dso_handle);
}
/* Number of forks seen. */
diff --git a/stdlib/at_quick_exit.c b/stdlib/at_quick_exit.c
index 3b74d0a..ca54c3f 100644
--- a/stdlib/at_quick_exit.c
+++ b/stdlib/at_quick_exit.c
@@ -36,15 +36,10 @@
#include "exit.h"
-/* This is defined by newer gcc version unique for each module. */
-extern void *__dso_handle __attribute__ ((__weak__));
-
-
/* Register FUNC to be executed by `quick_exit'. */
int
attribute_hidden
at_quick_exit (void (*func) (void))
{
- return __cxa_at_quick_exit ((void (*) (void *)) func,
- &__dso_handle == NULL ? NULL : __dso_handle);
+ return __cxa_at_quick_exit ((void (*) (void *)) func, __dso_handle);
}
diff --git a/stdlib/atexit.c b/stdlib/atexit.c
index f28b6ba..aec7f5c 100644
--- a/stdlib/atexit.c
+++ b/stdlib/atexit.c
@@ -35,11 +35,6 @@
#include <stdlib.h>
#include "exit.h"
-
-/* This is defined by newer gcc version unique for each module. */
-extern void *__dso_handle __attribute__ ((__weak__));
-
-
/* Register FUNC to be executed by `exit'. */
int
#ifndef atexit
@@ -47,6 +42,5 @@ attribute_hidden
#endif
atexit (void (*func) (void))
{
- return __cxa_atexit ((void (*) (void *)) func, NULL,
- &__dso_handle == NULL ? NULL : __dso_handle);
+ return __cxa_atexit ((void (*) (void *)) func, NULL, __dso_handle);
}
diff --git a/stdlib/tst-tls-atexit-lib.c b/stdlib/tst-tls-atexit-lib.c
index a227e46..9bdd690 100644
--- a/stdlib/tst-tls-atexit-lib.c
+++ b/stdlib/tst-tls-atexit-lib.c
@@ -18,8 +18,6 @@
#include <stdlib.h>
-extern void *__dso_handle;
-
typedef struct
{
void *val;
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=118ab8d99f92a42db0f3fa2ed4c7ebe711c2ca87
commit 118ab8d99f92a42db0f3fa2ed4c7ebe711c2ca87
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Aug 18 09:00:24 2017 -0700
Mark internal grp/pwd/shadow functions with attribute_hidden [BZ #18822]
Mark internal grp/pwd/shadow functions with attribute_hidden to allow
direct access within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/grp.h (__fgetgrent_r): Add attribute_hidden.
(__getgrgid_r): Likewise.
(__getgrnam_r): Likewise.
* include/pwd.h (__getpwuid_r): Likewise.
(__getpwnam_r): Likewise.
(__fgetpwent_r): Likewise.
* include/shadow.h (__getspnam_r): Likewise.
(__sgetspent_r): Likewise.
(__fgetspent_r): Likewise.
diff --git a/include/grp.h b/include/grp.h
index 0fb5c9a..871701a 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -12,12 +12,12 @@ extern int __old_getgrent_r (struct group *__resultbuf, char *buffer,
size_t __buflen, struct group **__result);
extern int __fgetgrent_r (FILE * __stream, struct group *__resultbuf,
char *buffer, size_t __buflen,
- struct group **__result);
+ struct group **__result) attribute_hidden;
/* Search for an entry with a matching group ID. */
extern int __getgrgid_r (__gid_t __gid, struct group *__resultbuf,
char *__buffer, size_t __buflen,
- struct group **__result);
+ struct group **__result) attribute_hidden;
extern int __old_getgrgid_r (__gid_t __gid, struct group *__resultbuf,
char *__buffer, size_t __buflen,
struct group **__result);
@@ -25,7 +25,7 @@ extern int __old_getgrgid_r (__gid_t __gid, struct group *__resultbuf,
/* Search for an entry with a matching group name. */
extern int __getgrnam_r (const char *__name, struct group *__resultbuf,
char *__buffer, size_t __buflen,
- struct group **__result);
+ struct group **__result) attribute_hidden;
extern int __old_getgrnam_r (const char *__name, struct group *__resultbuf,
char *__buffer, size_t __buflen,
struct group **__result);
diff --git a/include/pwd.h b/include/pwd.h
index 3b0f725..fc99506 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -10,19 +10,19 @@ extern int __old_getpwent_r (struct passwd *__resultbuf, char *__buffer,
size_t __buflen, struct passwd **__result);
extern int __getpwuid_r (__uid_t __uid, struct passwd *__resultbuf,
char *__buffer, size_t __buflen,
- struct passwd **__result);
+ struct passwd **__result) attribute_hidden;
extern int __old_getpwuid_r (__uid_t __uid, struct passwd *__resultbuf,
char *__buffer, size_t __buflen,
struct passwd **__result);
extern int __getpwnam_r (const char *__name, struct passwd *__resultbuf,
char *__buffer, size_t __buflen,
- struct passwd **__result);
+ struct passwd **__result) attribute_hidden;
extern int __old_getpwnam_r (const char *__name, struct passwd *__resultbuf,
char *__buffer, size_t __buflen,
struct passwd **__result);
extern int __fgetpwent_r (FILE * __stream, struct passwd *__resultbuf,
char *__buffer, size_t __buflen,
- struct passwd **__result);
+ struct passwd **__result) attribute_hidden;
#include <nss.h>
diff --git a/include/shadow.h b/include/shadow.h
index 124a1ab..366ea83 100644
--- a/include/shadow.h
+++ b/include/shadow.h
@@ -11,16 +11,17 @@ extern int __old_getspent_r (struct spwd *__result_buf, char *__buffer,
size_t __buflen, struct spwd **__result);
extern int __getspnam_r (const char *__name, struct spwd *__result_buf,
char *__buffer, size_t __buflen,
- struct spwd **__result);
+ struct spwd **__result) attribute_hidden;
extern int __old_getspnam_r (const char *__name, struct spwd *__result_buf,
char *__buffer, size_t __buflen,
struct spwd **__result);
extern int __sgetspent_r (const char *__string,
struct spwd *__result_buf, char *__buffer,
- size_t __buflen, struct spwd **__result);
+ size_t __buflen, struct spwd **__result)
+ attribute_hidden;
extern int __fgetspent_r (FILE *__stream, struct spwd *__result_buf,
char *__buffer, size_t __buflen,
- struct spwd **__result);
+ struct spwd **__result) attribute_hidden;
extern int __lckpwdf (void);
extern int __ulckpwdf (void);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=08365c3afffdae09b98b321eb8dbc13683f82801
commit 08365c3afffdae09b98b321eb8dbc13683f82801
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Aug 18 05:43:12 2017 -0700
Mark internal unistd functions with attribute_hidden [BZ #18822]
Mark internal unistd functions with attribute_hidden to allow direct
access to them within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* include/unistd.h (__access): Add attribute_hidden.
(__lseek64): Likewise.
(__libc_pread64): Likewise.
(__pipe2): Likewise.
(__sleep): Likewise.
(__chdir): Likewise.
(__fchdir): Likewise.
(__getcwd): Likewise.
(__rmdir): Likewise.
(__execvpe): Likewise.
(__execve): Likewise.
(__setsid): Likewise.
(__getuid): Likewise.
(__geteuid): Likewise.
(__getgid): Likewise.
(__getegid): Likewise.
(__getgroups): Likewise.
(__group_member): Likewise.
(__ttyname_r): Likewise.
(__isatty): Likewise.
(__readlink): Likewise.
(__unlink): Likewise.
(__gethostname): Likewise.
(__profil): Likewise.
(__getdtablesize): Likewise.
(__brk): Likewise.
(__ftruncate): Likewise.
(__ftruncate64): Likewise.
diff --git a/include/unistd.h b/include/unistd.h
index 7f1c2cc..6fffbcd 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -23,9 +23,10 @@ libc_hidden_proto (tcgetpgrp)
libc_hidden_proto (readlinkat)
/* Now define the internal interfaces. */
-extern int __access (const char *__name, int __type);
+extern int __access (const char *__name, int __type) attribute_hidden;
extern int __euidaccess (const char *__name, int __type);
-extern __off64_t __lseek64 (int __fd, __off64_t __offset, int __whence);
+extern __off64_t __lseek64 (int __fd, __off64_t __offset, int __whence)
+ attribute_hidden;
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);
@@ -39,7 +40,7 @@ extern ssize_t __pread64 (int __fd, void *__buf, size_t __nbytes,
__off64_t __offset);
libc_hidden_proto (__pread64);
extern ssize_t __libc_pread64 (int __fd, void *__buf, size_t __nbytes,
- __off64_t __offset);
+ __off64_t __offset) attribute_hidden;
extern ssize_t __pwrite (int __fd, const void *__buf, size_t __n,
__off_t __offset);
libc_hidden_proto (__pwrite)
@@ -58,8 +59,8 @@ libc_hidden_proto (__libc_write)
libc_hidden_proto (write)
extern int __pipe (int __pipedes[2]);
libc_hidden_proto (__pipe)
-extern int __pipe2 (int __pipedes[2], int __flags);
-extern unsigned int __sleep (unsigned int __seconds);
+extern int __pipe2 (int __pipedes[2], int __flags) attribute_hidden;
+extern unsigned int __sleep (unsigned int __seconds) attribute_hidden;
extern int __chown (const char *__file,
__uid_t __owner, __gid_t __group);
libc_hidden_proto (__chown)
@@ -67,12 +68,12 @@ extern int __fchown (int __fd,
__uid_t __owner, __gid_t __group);
extern int __lchown (const char *__file, __uid_t __owner,
__gid_t __group);
-extern int __chdir (const char *__path);
-extern int __fchdir (int __fd);
-extern char *__getcwd (char *__buf, size_t __size);
-extern int __rmdir (const char *__path);
+extern int __chdir (const char *__path) attribute_hidden;
+extern int __fchdir (int __fd) attribute_hidden;
+extern char *__getcwd (char *__buf, size_t __size) attribute_hidden;
+extern int __rmdir (const char *__path) attribute_hidden;
extern int __execvpe (const char *file, char *const argv[],
- char *const envp[]);
+ char *const envp[]) attribute_hidden;
/* Get the canonical absolute name of the named directory, and put it in SIZE
bytes of BUF. Returns NULL if the directory couldn't be determined or
@@ -91,7 +92,7 @@ libc_hidden_proto (__dup2)
extern int __dup3 (int __fd, int __fd2, int flags);
libc_hidden_proto (__dup3)
extern int __execve (const char *__path, char *const __argv[],
- char *const __envp[]);
+ char *const __envp[]) attribute_hidden;
extern long int __pathconf (const char *__path, int __name);
extern long int __fpathconf (int __fd, int __name);
extern long int __sysconf (int __name);
@@ -99,14 +100,14 @@ 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);
-extern __uid_t __geteuid (void);
-extern __gid_t __getgid (void);
-extern __gid_t __getegid (void);
-extern int __getgroups (int __size, __gid_t __list[]);
+extern __pid_t __setsid (void) attribute_hidden;
+extern __uid_t __getuid (void) attribute_hidden;
+extern __uid_t __geteuid (void) attribute_hidden;
+extern __gid_t __getgid (void) attribute_hidden;
+extern __gid_t __getegid (void) attribute_hidden;
+extern int __getgroups (int __size, __gid_t __list[]) attribute_hidden;
libc_hidden_proto (__getpgid)
-extern int __group_member (__gid_t __gid);
+extern int __group_member (__gid_t __gid) attribute_hidden;
extern int __setuid (__uid_t __uid);
extern int __setreuid (__uid_t __ruid, __uid_t __euid);
extern int __setgid (__gid_t __gid);
@@ -123,17 +124,20 @@ libc_hidden_proto (__setresuid)
libc_hidden_proto (__setresgid)
extern __pid_t __vfork (void);
libc_hidden_proto (__vfork)
-extern int __ttyname_r (int __fd, char *__buf, size_t __buflen);
-extern int __isatty (int __fd);
+extern int __ttyname_r (int __fd, char *__buf, size_t __buflen)
+ attribute_hidden;
+extern int __isatty (int __fd) attribute_hidden;
extern int __link (const char *__from, const char *__to);
extern int __symlink (const char *__from, const char *__to);
-extern ssize_t __readlink (const char *__path, char *__buf, size_t __len);
-extern int __unlink (const char *__name);
-extern int __gethostname (char *__name, size_t __len);
+extern ssize_t __readlink (const char *__path, char *__buf, size_t __len)
+ attribute_hidden;
+extern int __unlink (const char *__name) attribute_hidden;
+extern int __gethostname (char *__name, size_t __len) attribute_hidden;
extern int __profil (unsigned short int *__sample_buffer, size_t __size,
- size_t __offset, unsigned int __scale);
-extern int __getdtablesize (void);
-extern int __brk (void *__addr);
+ size_t __offset, unsigned int __scale)
+ attribute_hidden;
+extern int __getdtablesize (void) attribute_hidden;
+extern int __brk (void *__addr) attribute_hidden;
extern int __close (int __fd);
libc_hidden_proto (__close)
extern int __libc_close (int __fd);
@@ -145,8 +149,8 @@ extern __pid_t __fork (void);
libc_hidden_proto (__fork)
extern int __getpagesize (void) __attribute__ ((__const__));
libc_hidden_proto (__getpagesize)
-extern int __ftruncate (int __fd, __off_t __length);
-extern int __ftruncate64 (int __fd, __off64_t __length);
+extern int __ftruncate (int __fd, __off_t __length) attribute_hidden;
+extern int __ftruncate64 (int __fd, __off64_t __length) attribute_hidden;
extern int __truncate (const char *path, __off_t __length);
extern void *__sbrk (intptr_t __delta);
libc_hidden_proto (__sbrk)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=c409cbbcfe88f14bda113c4b53eb783ec1e2d1c8
commit c409cbbcfe88f14bda113c4b53eb783ec1e2d1c8
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Aug 17 13:17:12 2017 -0700
Mark internal argp functions with attribute_hidden [BZ #18822]
Mark internal argp functions with attribute_hidden to allow direct
access to them within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* argp/argp-fmtstream.c: Include <argp-fmtstream.h>.
* argp/argp-fs-xinl.c: Likewise.
* argp/argp-help.c: Include <argp.h> and <argp-fmtstream.h>.
* argp/argp-parse.c: Include <argp.h>.
* argp/argp-xinl.c: Likewise.
* include/argp-fmtstream.h: New file.
* include/argp.h (__argp_error): Add attribute_hidden.
(__argp_failure): Likewise.
(__argp_input): Likewise.
(__argp_state_help): Likewise.
diff --git a/argp/argp-fmtstream.c b/argp/argp-fmtstream.c
index 9e41708..f12c265 100644
--- a/argp/argp-fmtstream.c
+++ b/argp/argp-fmtstream.c
@@ -30,7 +30,7 @@
#include <stdarg.h>
#include <ctype.h>
-#include "argp-fmtstream.h"
+#include <argp-fmtstream.h>
#include "argp-namefrob.h"
#ifndef ARGP_FMTSTREAM_USE_LINEWRAP
diff --git a/argp/argp-fs-xinl.c b/argp/argp-fs-xinl.c
index f0ce509..8ebbb8e 100644
--- a/argp/argp-fs-xinl.c
+++ b/argp/argp-fs-xinl.c
@@ -24,7 +24,7 @@
#define ARGP_FS_EI
#undef __OPTIMIZE__
#define __OPTIMIZE__ 1
-#include "argp-fmtstream.h"
+#include <argp-fmtstream.h>
#if 0
/* Not exported. */
diff --git a/argp/argp-help.c b/argp/argp-help.c
index e704c5a..821d98c 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -79,8 +79,8 @@ char *strerror (int errnum);
# endif
#endif
-#include "argp.h"
-#include "argp-fmtstream.h"
+#include <argp.h>
+#include <argp-fmtstream.h>
#include "argp-namefrob.h"
#ifndef SIZE_MAX
diff --git a/argp/argp-parse.c b/argp/argp-parse.c
index 662eed3..691c462 100644
--- a/argp/argp-parse.c
+++ b/argp/argp-parse.c
@@ -62,7 +62,7 @@ char *alloca ();
# define N_(msgid) (msgid)
#endif
-#include "argp.h"
+#include <argp.h>
#include "argp-namefrob.h"
/* Getopt return values. */
diff --git a/argp/argp-xinl.c b/argp/argp-xinl.c
index 0b45bdc..206d0e4 100644
--- a/argp/argp-xinl.c
+++ b/argp/argp-xinl.c
@@ -31,7 +31,7 @@
#define ARGP_EI
#undef __OPTIMIZE__
#define __OPTIMIZE__ 1
-#include "argp.h"
+#include <argp.h>
/* Add weak aliases. */
#if _LIBC - 0 && defined (weak_alias)
diff --git a/include/argp-fmtstream.h b/include/argp-fmtstream.h
new file mode 100644
index 0000000..45c65ce
--- /dev/null
+++ b/include/argp-fmtstream.h
@@ -0,0 +1,19 @@
+#ifndef _ARGP_FMTSTREAM_H
+#include <argp/argp-fmtstream.h>
+
+#ifndef _ISOMAC
+extern __typeof (__argp_fmtstream_ensure) __argp_fmtstream_ensure
+ attribute_hidden;
+extern __typeof (__argp_fmtstream_free) __argp_fmtstream_free
+ attribute_hidden;
+extern __typeof (__argp_fmtstream_printf) __argp_fmtstream_printf
+ attribute_hidden;
+extern __typeof (__argp_fmtstream_update) __argp_fmtstream_update
+ attribute_hidden;
+extern __typeof (__argp_fmtstream_write) __argp_fmtstream_write
+ attribute_hidden;
+extern __typeof (__argp_make_fmtstream) __argp_make_fmtstream
+ attribute_hidden;
+#endif
+
+#endif
diff --git a/include/argp.h b/include/argp.h
index 92be5f9..6cf8782 100644
--- a/include/argp.h
+++ b/include/argp.h
@@ -1 +1,11 @@
+#ifndef _ARGP_H
#include <argp/argp.h>
+
+#ifndef _ISOMAC
+extern __typeof (__argp_error) __argp_error attribute_hidden;
+extern __typeof (__argp_failure) __argp_failure attribute_hidden;
+extern __typeof (__argp_input) __argp_input attribute_hidden;
+extern __typeof (__argp_state_help) __argp_state_help attribute_hidden;
+#endif
+
+#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=04a9ff17d0cec055dfbc75884b7caef204694276
commit 04a9ff17d0cec055dfbc75884b7caef204694276
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Aug 17 12:48:28 2017 -0700
Mark ____wcsto*_l_internal functions with attribute_hidden [BZ #18822]
Mark ____wcsto*_l_internal functions with attribute_hidden to allow
direct access to them within libc.so and libc.a without using GOT nor
PLT.
[BZ #18822]
* include/wchar.h (____wcstof_l_internal): New prototype.
(____wcstod_l_internal): Likewise.
(____wcstold_l_internal): Likewise.
(____wcstol_l_internal): Likewise.
(____wcstoul_l_internal): Likewise.
(____wcstoll_l_internal): Likewise.
(____wcstoull_l_internal): Likewise.
(____wcstof128_l_internal): Likewise.
* sysdeps/ieee754/float128/wcstof128.c
(____wcstof128_l_internal): Removed.
* sysdeps/ieee754/float128/wcstof128_l.c
(____wcstof128_l_internal): Likewise.
* wcsmbs/wcstod.c (____wcstod_l_internal): Likewise.
* wcsmbs/wcstod_l.c (____wcstod_l_internal): Likewise.
* wcsmbs/wcstof.c (____wcstof_l_internal): Likewise.
* wcsmbs/wcstof_l.c (____wcstof_l_internal): Likewise.
* wcsmbs/wcstol_l.c (____wcstol_l_internal): Likewise.
* wcsmbs/wcstold.c (____wcstold_l_internal): Likewise.
* wcsmbs/wcstold_l.c (____wcstold_l_internal): Likewise.
* wcsmbs/wcstoll_l.c (____wcstoll_l_internal): Likewise.
* wcsmbs/wcstoul_l.c (____wcstoul_l_internal): Likewise.
* wcsmbs/wcstoull_l.c (____wcstoull_l_internal): Likewise.
diff --git a/include/wchar.h b/include/wchar.h
index 7bf042c..eb472da 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -70,6 +70,26 @@ libc_hidden_proto (wcstoll)
libc_hidden_proto (wcstoul)
libc_hidden_proto (wcstoull)
+extern float ____wcstof_l_internal (const wchar_t *, wchar_t **, int,
+ locale_t) attribute_hidden;
+extern double ____wcstod_l_internal (const wchar_t *, wchar_t **, int,
+ locale_t) attribute_hidden;
+extern long double ____wcstold_l_internal (const wchar_t *, wchar_t **,
+ int, locale_t) attribute_hidden;
+extern long int ____wcstol_l_internal (const wchar_t *, wchar_t **, int,
+ int, locale_t) attribute_hidden;
+extern unsigned long int ____wcstoul_l_internal (const wchar_t *,
+ wchar_t **,
+ int, int, locale_t)
+ attribute_hidden;
+extern long long int ____wcstoll_l_internal (const wchar_t *, wchar_t **,
+ int, int, locale_t)
+ attribute_hidden;
+extern unsigned long long int ____wcstoull_l_internal (const wchar_t *,
+ wchar_t **, int, int,
+ locale_t)
+ attribute_hidden;
+
#if __HAVE_DISTINCT_FLOAT128
extern __typeof (wcstof128_l) __wcstof128_l;
libc_hidden_proto (__wcstof128_l)
@@ -77,6 +97,9 @@ extern _Float128 __wcstof128_internal (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __group) __THROW;
+extern _Float128 ____wcstof128_l_internal (const wchar_t *, wchar_t **, int,
+ locale_t) attribute_hidden;
+
libc_hidden_proto (__wcstof128_internal)
libc_hidden_proto (wcstof128)
#endif
diff --git a/sysdeps/ieee754/float128/wcstof128.c b/sysdeps/ieee754/float128/wcstof128.c
index 49aa4d6..bab8c24 100644
--- a/sysdeps/ieee754/float128/wcstof128.c
+++ b/sysdeps/ieee754/float128/wcstof128.c
@@ -24,7 +24,4 @@
/* Bring in _Float128 typedef if needed. */
#include <bits/floatn.h>
-extern _Float128 ____wcstof128_l_internal (const wchar_t *, wchar_t **, int,
- locale_t);
-
#include "strtof128.c"
diff --git a/sysdeps/ieee754/float128/wcstof128_l.c b/sysdeps/ieee754/float128/wcstof128_l.c
index b295087..33fcccd 100644
--- a/sysdeps/ieee754/float128/wcstof128_l.c
+++ b/sysdeps/ieee754/float128/wcstof128_l.c
@@ -24,7 +24,4 @@
#include <bits/floatn.h>
-extern _Float128 ____wcstof128_l_internal (const wchar_t *, wchar_t **, int,
- locale_t);
-
#include "strtof128_l.c"
diff --git a/wcsmbs/wcstod.c b/wcsmbs/wcstod.c
index 4604f51..4c6343c 100644
--- a/wcsmbs/wcstod.c
+++ b/wcsmbs/wcstod.c
@@ -22,7 +22,4 @@
#define USE_WIDE_CHAR 1
-extern double ____wcstod_l_internal (const wchar_t *, wchar_t **, int,
- locale_t);
-
#include <stdlib/strtod.c>
diff --git a/wcsmbs/wcstod_l.c b/wcsmbs/wcstod_l.c
index 7790f5a..25effe9 100644
--- a/wcsmbs/wcstod_l.c
+++ b/wcsmbs/wcstod_l.c
@@ -21,9 +21,6 @@
#include <locale.h>
-extern double ____wcstod_l_internal (const wchar_t *, wchar_t **, int,
- locale_t);
-
#define USE_WIDE_CHAR 1
#include <stdlib/strtod_l.c>
diff --git a/wcsmbs/wcstof.c b/wcsmbs/wcstof.c
index e91c09c..1f91ab5 100644
--- a/wcsmbs/wcstof.c
+++ b/wcsmbs/wcstof.c
@@ -21,7 +21,4 @@
#define USE_WIDE_CHAR 1
-extern float ____wcstof_l_internal (const wchar_t *, wchar_t **, int,
- locale_t);
-
#include <stdlib/strtof.c>
diff --git a/wcsmbs/wcstof_l.c b/wcsmbs/wcstof_l.c
index 143b716..8b99b69 100644
--- a/wcsmbs/wcstof_l.c
+++ b/wcsmbs/wcstof_l.c
@@ -23,7 +23,4 @@
#define USE_WIDE_CHAR 1
-extern float ____wcstof_l_internal (const wchar_t *, wchar_t **, int,
- locale_t);
-
#include <stdlib/strtof_l.c>
diff --git a/wcsmbs/wcstol_l.c b/wcsmbs/wcstol_l.c
index 42bd842..36eaf56 100644
--- a/wcsmbs/wcstol_l.c
+++ b/wcsmbs/wcstol_l.c
@@ -23,7 +23,4 @@
#define USE_WIDE_CHAR 1
-extern long int ____wcstol_l_internal (const wchar_t *, wchar_t **, int, int,
- locale_t);
-
#include <stdlib/strtol_l.c>
diff --git a/wcsmbs/wcstold.c b/wcsmbs/wcstold.c
index 7a14cd2..481fcc4 100644
--- a/wcsmbs/wcstold.c
+++ b/wcsmbs/wcstold.c
@@ -21,7 +21,4 @@
#define USE_WIDE_CHAR 1
-extern long double ____wcstold_l_internal (const wchar_t *, wchar_t **, int,
- locale_t);
-
#include <stdlib/strtold.c>
diff --git a/wcsmbs/wcstold_l.c b/wcsmbs/wcstold_l.c
index a7ab025..8192620 100644
--- a/wcsmbs/wcstold_l.c
+++ b/wcsmbs/wcstold_l.c
@@ -22,7 +22,4 @@
#define USE_WIDE_CHAR 1
-extern long double ____wcstold_l_internal (const wchar_t *, wchar_t **, int,
- locale_t);
-
#include <strtold_l.c>
diff --git a/wcsmbs/wcstoll_l.c b/wcsmbs/wcstoll_l.c
index 598d3f5..4a71282 100644
--- a/wcsmbs/wcstoll_l.c
+++ b/wcsmbs/wcstoll_l.c
@@ -23,7 +23,4 @@
#define QUAD 1
-extern long long int ____wcstoll_l_internal (const wchar_t *, wchar_t **,
- int, int, locale_t);
-
#include <wcstol_l.c>
diff --git a/wcsmbs/wcstoul_l.c b/wcsmbs/wcstoul_l.c
index f9f3808..1a345d4 100644
--- a/wcsmbs/wcstoul_l.c
+++ b/wcsmbs/wcstoul_l.c
@@ -23,7 +23,4 @@
#define UNSIGNED 1
-extern unsigned long int ____wcstoul_l_internal (const wchar_t *, wchar_t **,
- int, int, locale_t);
-
#include "wcstol_l.c"
diff --git a/wcsmbs/wcstoull_l.c b/wcsmbs/wcstoull_l.c
index 412a9fc..1666d50 100644
--- a/wcsmbs/wcstoull_l.c
+++ b/wcsmbs/wcstoull_l.c
@@ -23,8 +23,4 @@
#define UNSIGNED 1
-extern unsigned long long int ____wcstoull_l_internal (const wchar_t *,
- wchar_t **, int, int,
- locale_t);
-
#include <wcstoll_l.c>
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4a9b990022506ae3ad955e0aa5fe87688c746a7c
commit 4a9b990022506ae3ad955e0aa5fe87688c746a7c
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Aug 17 12:35:02 2017 -0700
Mark __internal_statvfs[64] with attribute_hidden [BZ #18822]
Mark __internal_statvfs[64] with attribute_hidden to allow direct access
to them within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* sysdeps/unix/sysv/linux/fstatvfs.c: Include "internal_statvfs.h"
instead of <sys/statvfs.h>.
(__internal_statvfs): Removed.
* sysdeps/unix/sysv/linux/fstatvfs64.c Include "internal_statvfs.h"
instead of <sys/statvfs.h>.
(__internal_statvfs64): Removed.
* sysdeps/unix/sysv/linux/internal_statvfs.c: Include
"internal_statvfs.h" instead of <sys/statvfs.h>.
* sysdeps/unix/sysv/linux/internal_statvfs.h: New file.
* sysdeps/unix/sysv/linux/statvfs.c Include "internal_statvfs.h"
instead of <sys/statvfs.h>.
(__internal_statvfs): Removed.
* sysdeps/unix/sysv/linux/statvfs64.c Include "internal_statvfs.h"
instead of <sys/statvfs.h>.
(__internal_statvfs64): Removed.
diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c
index e07a5b9..1b2f279 100644
--- a/sysdeps/unix/sysv/linux/fstatvfs.c
+++ b/sysdeps/unix/sysv/linux/fstatvfs.c
@@ -19,11 +19,7 @@
#include <stddef.h>
#include <sys/stat.h>
#include <sys/statfs.h>
-#include <sys/statvfs.h>
-
-extern void __internal_statvfs (const char *name, struct statvfs *buf,
- struct statfs *fsbuf, int fd);
-
+#include "internal_statvfs.h"
int
__fstatvfs (int fd, struct statvfs *buf)
diff --git a/sysdeps/unix/sysv/linux/fstatvfs64.c b/sysdeps/unix/sysv/linux/fstatvfs64.c
index 02a0d7e..c923208 100644
--- a/sysdeps/unix/sysv/linux/fstatvfs64.c
+++ b/sysdeps/unix/sysv/linux/fstatvfs64.c
@@ -20,14 +20,9 @@
#include <string.h>
#include <sys/stat.h>
#include <sys/statfs.h>
-#include <sys/statvfs.h>
+#include "internal_statvfs.h"
#include <kernel-features.h>
-
-extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
- struct statfs64 *fsbuf, int fd);
-
-
/* Return information about the filesystem on which FD resides. */
int
__fstatvfs64 (int fd, struct statvfs64 *buf)
diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c
index 9a17ca5..0a8dc35 100644
--- a/sysdeps/unix/sysv/linux/internal_statvfs.c
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.c
@@ -26,7 +26,7 @@
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/statfs.h>
-#include <sys/statvfs.h>
+#include "internal_statvfs.h"
#include "linux_fsinfo.h"
#include <kernel-features.h>
diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.h
similarity index 57%
copy from sysdeps/unix/sysv/linux/fstatvfs.c
copy to sysdeps/unix/sysv/linux/internal_statvfs.h
index e07a5b9..1762bbc 100644
--- a/sysdeps/unix/sysv/linux/fstatvfs.c
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 1998-2017 Free Software Foundation, Inc.
+/* Internal statvfs/statvfs64 function prototypes.
+ Copyright (C) 2017 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -16,29 +16,11 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <stddef.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
#include <sys/statvfs.h>
extern void __internal_statvfs (const char *name, struct statvfs *buf,
- struct statfs *fsbuf, int fd);
-
-
-int
-__fstatvfs (int fd, struct statvfs *buf)
-{
- struct statfs fsbuf;
-
- /* Get as much information as possible from the system. */
- if (__fstatfs (fd, &fsbuf) < 0)
- return -1;
-
- /* Convert the result. */
- __internal_statvfs (NULL, buf, &fsbuf, fd);
-
- /* We signal success if the statfs call succeeded. */
- return 0;
-}
-weak_alias (__fstatvfs, fstatvfs)
-libc_hidden_weak (fstatvfs)
+ struct statfs *fsbuf, int fd)
+ attribute_hidden;
+extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
+ struct statfs64 *fsbuf, int fd)
+ attribute_hidden;
diff --git a/sysdeps/unix/sysv/linux/statvfs.c b/sysdeps/unix/sysv/linux/statvfs.c
index 744336e..1edf1ac 100644
--- a/sysdeps/unix/sysv/linux/statvfs.c
+++ b/sysdeps/unix/sysv/linux/statvfs.c
@@ -19,11 +19,7 @@
#include <stddef.h>
#include <sys/stat.h>
#include <sys/statfs.h>
-#include <sys/statvfs.h>
-
-extern void __internal_statvfs (const char *name, struct statvfs *buf,
- struct statfs *fsbuf, int fd);
-
+#include "internal_statvfs.h"
int
__statvfs (const char *file, struct statvfs *buf)
diff --git a/sysdeps/unix/sysv/linux/statvfs64.c b/sysdeps/unix/sysv/linux/statvfs64.c
index a89f720..005495f 100644
--- a/sysdeps/unix/sysv/linux/statvfs64.c
+++ b/sysdeps/unix/sysv/linux/statvfs64.c
@@ -21,14 +21,9 @@
#include <string.h>
#include <sys/stat.h>
#include <sys/statfs.h>
-#include <sys/statvfs.h>
+#include "internal_statvfs.h"
#include <kernel-features.h>
-
-extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
- struct statfs64 *fsbuf, int fd);
-
-
/* Return information about the filesystem on which FILE resides. */
int
__statvfs64 (const char *file, struct statvfs64 *buf)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=587e47437fa9cfb44a47e389069696ce63ac7f99
commit 587e47437fa9cfb44a47e389069696ce63ac7f99
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Aug 17 12:26:17 2017 -0700
Mark 3 *_internal functions with attribute_hidden [BZ #18822]
Mark __ptsname_internal, __mktime_internal and __fopen_internal with
attribute_hidden to allow direct access to them within libc.so and
libc.a without using GOT nor PLT.
[BZ #18822]
* include/stdlib.h (__ptsname_internal): Add attribute_hidden.
* include/time.h (__mktime_internal): Likewise.
* libio/iolibio.h (__fopen_internal): Likewise.
diff --git a/include/stdlib.h b/include/stdlib.h
index c4a6e6f..2274790 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -78,7 +78,7 @@ extern char *__realpath (const char *__name, char *__resolved);
extern int __ptsname_r (int __fd, char *__buf, size_t __buflen);
# ifndef _ISOMAC
extern int __ptsname_internal (int fd, char *buf, size_t buflen,
- struct stat64 *stp);
+ struct stat64 *stp) attribute_hidden;
# endif
extern int __getpt (void);
extern int __posix_openpt (int __oflag);
diff --git a/include/time.h b/include/time.h
index 958cb86..0fc429a 100644
--- a/include/time.h
+++ b/include/time.h
@@ -54,7 +54,7 @@ extern void __tz_compute (time_t timer, struct tm *tm, int use_localtime)
extern time_t __mktime_internal (struct tm *__tp,
struct tm *(*__func) (const time_t *,
struct tm *),
- time_t *__offset);
+ time_t *__offset) attribute_hidden;
extern struct tm *__localtime_r (const time_t *__timer,
struct tm *__tp) attribute_hidden;
diff --git a/libio/iolibio.h b/libio/iolibio.h
index f215fce..754d8b0 100644
--- a/libio/iolibio.h
+++ b/libio/iolibio.h
@@ -23,7 +23,8 @@ extern _IO_FILE *_IO_fopen (const char*, const char*);
extern _IO_FILE *_IO_old_fopen (const char*, const char*);
extern _IO_FILE *_IO_new_fopen (const char*, const char*);
extern _IO_FILE *_IO_fopen64 (const char*, const char*);
-extern _IO_FILE *__fopen_internal (const char*, const char*, int);
+extern _IO_FILE *__fopen_internal (const char*, const char*, int)
+ attribute_hidden;
extern _IO_FILE *__fopen_maybe_mmap (_IO_FILE *) __THROW;
extern int _IO_fprintf (_IO_FILE*, const char*, ...);
extern int _IO_fputs (const char*, _IO_FILE*);
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=ec7d5f8327c9bd4a0000abd6b3f77d8c834279d1
commit ec7d5f8327c9bd4a0000abd6b3f77d8c834279d1
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Aug 13 07:00:22 2017 -0700
Mark internal functions with attribute_hidden [BZ #18822]
Mark internal functions with attribute_hidden to allow direct access to
internal functions within libc.so and libc.a without using GOT nor PLT.
Size comparison of libc.so:
On x86-64:
text data bss dec hex
Before: 1728577 20584 17088 1766249 1af369
After : 1728593 20584 17088 1766265 1af379
The only change is __gconv_release_shlib in iconv/gconv_dl.c is inlined
since it is hidden, which increases the code size of gconv_dl.os by 18
bytes.
On i686:
text data bss dec hex
Before: 1869039 11444 11112 1891595 1cdd0b
After : 1868635 11444 11112 1891191 1cdb77
The code size is decreased by avoiding GOT/PLT for hidden functions.
[BZ #18822]
* iconv/gconv_int.h (__gconv_open): Add attribute_hidden.
(__gconv_close): Likewise.
(__gconv): Likewise.
(__gconv_find_transform): Likewise.
(__gconv_lookup_cache): Likewise.
(__gconv_compare_alias_cache): Likewise.
(__gconv_load_cache): Likewise.
(__gconv_get_path): Likewise.
(__gconv_close_transform): Likewise.
(__gconv_release_cache): Likewise.
(__gconv_find_shlib): Likewise.
(__gconv_release_shlib): Likewise.
(__gconv_get_builtin_trans): Likewise.
(__gconv_compare_alias): Likewise.
* include/dlfcn.h (_dlerror_run): Likewise.
* include/stdio.h (__fortify_fail_abort): Likewise.
* include/time.h (__tz_compute): Likewise.
(__strptime_internal): Likewise.
* intl/gettextP.h (_nl_find_domain): Likewise.
(_nl_load_domain): Likewise.
(_nl_find_msg): Likewise.
* intl/plural-exp.h (FREE_EXPRESSION): Likewise.
(EXTRACT_PLURAL_EXPRESSION): Likewise.
* locale/coll-lookup.h (__collidx_table_lookup): Likewise.
* resolv/gai_misc.h (__gai_enqueue_request): Likewise.
(__gai_find_request): Likewise.
(__gai_remove_request): Likewise.
(__gai_notify): Likewise.
(__gai_notify_only): Likewise.
* sysdeps/generic/aio_misc.h (__aio_sigqueue): Likewise.
* sysdeps/generic/ldsodefs.h (_dl_symbol_value): Likewise.
(_dl_fini): Likewise.
(_dl_non_dynamic_init): Likewise.
(_dl_aux_init): Likewise.
* sysdeps/i386/machine-gmon.h (mcount_internal): Likewise.
* sysdeps/unix/sysv/linux/i386/olddirent.h (__old_getdents64):
Likewise.
* wcsmbs/wcsmbsload.h (__wcsmbs_load_conv): Likewise.
(__wcsmbs_clone_conv): Likewise.
(__wcsmbs_named_conv): Likewise.
diff --git a/iconv/gconv_int.h b/iconv/gconv_int.h
index 85a67ad..52b8aad 100644
--- a/iconv/gconv_int.h
+++ b/iconv/gconv_int.h
@@ -157,11 +157,11 @@ __libc_lock_define (extern, __gconv_lock attribute_hidden)
/* Return in *HANDLE decriptor for transformation from FROMSET to TOSET. */
extern int __gconv_open (const char *toset, const char *fromset,
__gconv_t *handle, int flags)
- internal_function;
+ internal_function attribute_hidden;
/* Free resources associated with transformation descriptor CD. */
extern int __gconv_close (__gconv_t cd)
- internal_function;
+ internal_function attribute_hidden;
/* Transform at most *INBYTESLEFT bytes from buffer starting at *INBUF
according to rules described by CD and place up to *OUTBYTESLEFT
@@ -170,36 +170,37 @@ extern int __gconv_close (__gconv_t cd)
extern int __gconv (__gconv_t cd, const unsigned char **inbuf,
const unsigned char *inbufend, unsigned char **outbuf,
unsigned char *outbufend, size_t *irreversible)
- internal_function;
+ internal_function attribute_hidden;
/* Return in *HANDLE a pointer to an array with *NSTEPS elements describing
the single steps necessary for transformation from FROMSET to TOSET. */
extern int __gconv_find_transform (const char *toset, const char *fromset,
struct __gconv_step **handle,
size_t *nsteps, int flags)
- internal_function;
+ internal_function attribute_hidden;
/* Search for transformation in cache data. */
extern int __gconv_lookup_cache (const char *toset, const char *fromset,
struct __gconv_step **handle, size_t *nsteps,
int flags)
- internal_function;
+ internal_function attribute_hidden;
/* Compare the two name for whether they are after alias expansion the
same. This function uses the cache and fails if none is
loaded. */
extern int __gconv_compare_alias_cache (const char *name1, const char *name2,
- int *result) internal_function;
+ int *result)
+ internal_function attribute_hidden;
/* Free data associated with a step's structure. */
extern void __gconv_release_step (struct __gconv_step *step)
- internal_function;
+ internal_function attribute_hidden;
/* Read all the configuration data and cache it. */
extern void __gconv_read_conf (void) attribute_hidden;
/* Try to read module cache file. */
-extern int __gconv_load_cache (void) internal_function;
+extern int __gconv_load_cache (void) internal_function attribute_hidden;
/* Retrieve pointer to internal cache. */
extern void *__gconv_get_cache (void);
@@ -211,7 +212,7 @@ extern struct gconv_module *__gconv_get_modules_db (void);
extern void *__gconv_get_alias_db (void);
/* Determine the directories we are looking in. */
-extern void __gconv_get_path (void) internal_function;
+extern void __gconv_get_path (void) internal_function attribute_hidden;
/* Comparison function to search alias. */
extern int __gconv_alias_compare (const void *p1, const void *p2)
@@ -221,33 +222,33 @@ extern int __gconv_alias_compare (const void *p1, const void *p2)
cause the code to be unloaded. */
extern int __gconv_close_transform (struct __gconv_step *steps,
size_t nsteps)
- internal_function;
+ internal_function attribute_hidden;
/* Free all resources allocated for the transformation record when
using the cache. */
extern void __gconv_release_cache (struct __gconv_step *steps, size_t nsteps)
- internal_function;
+ internal_function attribute_hidden;
/* Load shared object named by NAME. If already loaded increment reference
count. */
extern struct __gconv_loaded_object *__gconv_find_shlib (const char *name)
- internal_function;
+ internal_function attribute_hidden;
/* Release shared object. If no further reference is available unload
the object. */
extern void __gconv_release_shlib (struct __gconv_loaded_object *handle)
- internal_function;
+ internal_function attribute_hidden;
/* Fill STEP with information about builtin module with NAME. */
extern void __gconv_get_builtin_trans (const char *name,
struct __gconv_step *step)
- internal_function;
+ internal_function attribute_hidden;
libc_hidden_proto (__gconv_transliterate)
/* If NAME is an codeset alias expand it. */
extern int __gconv_compare_alias (const char *name1, const char *name2)
- internal_function;
+ internal_function attribute_hidden;
/* Builtin transformations. */
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 51cc1df..6aad074 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -75,7 +75,7 @@ extern void *_dl_vsym (void *handle, const char *name, const char *version,
arranges for `dlerror' to return the error details.
ARGS is passed as argument to OPERATE. */
extern int _dlerror_run (void (*operate) (void *), void *args)
- internal_function;
+ internal_function attribute_hidden;
#ifdef SHARED
# define DL_CALLER_DECL /* Nothing */
diff --git a/include/stdio.h b/include/stdio.h
index 509447c..5c0ef8e 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -100,7 +100,7 @@ extern void __libc_message (enum __libc_message_action action,
const char *__fnt, ...);
extern void __fortify_fail (const char *msg) __attribute__ ((__noreturn__));
extern void __fortify_fail_abort (_Bool, const char *msg)
- __attribute__ ((__noreturn__));
+ __attribute__ ((__noreturn__)) attribute_hidden;
libc_hidden_proto (__fortify_fail)
libc_hidden_proto (__fortify_fail_abort)
diff --git a/include/time.h b/include/time.h
index 9956b82..958cb86 100644
--- a/include/time.h
+++ b/include/time.h
@@ -46,7 +46,7 @@ extern void __tzfile_default (const char *std, const char *dst,
long int stdoff, long int dstoff);
extern void __tzset_parse_tz (const char *tz);
extern void __tz_compute (time_t timer, struct tm *tm, int use_localtime)
- __THROW internal_function;
+ __THROW internal_function attribute_hidden;
/* Subroutine of `mktime'. Return the `time_t' representation of TP and
normalize TP, given that a `struct tm *' maps to a `time_t' as performed
@@ -93,7 +93,7 @@ extern int __getclktck (void);
extern char * __strptime_internal (const char *rp, const char *fmt,
struct tm *tm, void *statep,
locale_t locparam)
- internal_function;
+ internal_function attribute_hidden;
extern double __difftime (time_t time1, time_t time0);
diff --git a/intl/gettextP.h b/intl/gettextP.h
index eeb8970..f88cd78 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -256,22 +256,22 @@ extern const char *_nl_locale_name_default (void);
struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
const char *__domainname,
struct binding *__domainbinding)
- internal_function;
+ internal_function attribute_hidden;
void _nl_load_domain (struct loaded_l10nfile *__domain,
struct binding *__domainbinding)
- internal_function;
+ internal_function attribute_hidden;
#ifdef IN_LIBGLOCALE
char *_nl_find_msg (struct loaded_l10nfile *domain_file,
struct binding *domainbinding, const char *encoding,
const char *msgid,
size_t *lengthp)
- internal_function;
+ internal_function attribute_hidden;
#else
char *_nl_find_msg (struct loaded_l10nfile *domain_file,
struct binding *domainbinding, const char *msgid,
int convert, size_t *lengthp)
- internal_function;
+ internal_function attribute_hidden;
#endif
/* The internal variables in the standalone libintl.a must have different
diff --git a/intl/plural-exp.h b/intl/plural-exp.h
index 144aa1e..af6c9b9 100644
--- a/intl/plural-exp.h
+++ b/intl/plural-exp.h
@@ -106,13 +106,13 @@ struct parse_args
#endif
extern void FREE_EXPRESSION (struct expression *exp)
- internal_function;
+ internal_function attribute_hidden;
extern int PLURAL_PARSE (struct parse_args *arg);
extern const struct expression GERMANIC_PLURAL attribute_hidden;
extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
const struct expression **pluralp,
unsigned long int *npluralsp)
- internal_function;
+ internal_function attribute_hidden;
#if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE)
extern unsigned long int plural_eval (const struct expression *pexp,
diff --git a/locale/coll-lookup.h b/locale/coll-lookup.h
index d95408a..55a0b59 100644
--- a/locale/coll-lookup.h
+++ b/locale/coll-lookup.h
@@ -20,8 +20,8 @@
/* Lookup in a table of int32_t, with default value 0. */
extern int32_t __collidx_table_lookup (const char *table, uint32_t wc)
- internal_function;
+ internal_function attribute_hidden;
/* Lookup in a table of uint32_t, with default value 0xffffffff. */
extern uint32_t __collseq_table_lookup (const char *table, uint32_t wc)
- internal_function;
+ internal_function attribute_hidden;
diff --git a/resolv/gai_misc.h b/resolv/gai_misc.h
index 6679d2b..01b2f89 100644
--- a/resolv/gai_misc.h
+++ b/resolv/gai_misc.h
@@ -76,23 +76,23 @@ extern pthread_mutex_t __gai_requests_mutex;
/* Enqueue request. */
extern struct requestlist *__gai_enqueue_request (struct gaicb *gaicbp)
- internal_function;
+ internal_function attribute_hidden;
/* Find request on wait list. */
extern struct requestlist *__gai_find_request (const struct gaicb *gaicbp)
- internal_function;
+ internal_function attribute_hidden;
/* Remove request from waitlist. */
extern int __gai_remove_request (struct gaicb *gaicbp)
- internal_function;
+ internal_function attribute_hidden;
/* Notify initiator of request and tell this everybody listening. */
extern void __gai_notify (struct requestlist *req)
- internal_function;
+ internal_function attribute_hidden;
/* Notify initiator of request. */
extern int __gai_notify_only (struct sigevent *sigev, pid_t caller_pid)
- internal_function;
+ internal_function attribute_hidden;
/* Send the signal. */
extern int __gai_sigqueue (int sig, const union sigval val, pid_t caller_pid)
diff --git a/sysdeps/generic/aio_misc.h b/sysdeps/generic/aio_misc.h
index a941a68..e2264ba 100644
--- a/sysdeps/generic/aio_misc.h
+++ b/sysdeps/generic/aio_misc.h
@@ -41,7 +41,7 @@ typedef union
/* Send the signal. */
extern int __aio_sigqueue (int sig, const union sigval val, pid_t caller_pid)
- internal_function;
+ internal_function attribute_hidden;
#endif /* aio_misc.h */
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 49e673d..e4004ee 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -912,7 +912,7 @@ extern lookup_t _dl_lookup_symbol_x (const char *undef,
/* Look up symbol NAME in MAP's scope and return its run-time address. */
extern ElfW(Addr) _dl_symbol_value (struct link_map *map, const char *name)
- internal_function;
+ internal_function attribute_hidden;
/* Add the new link_map NEW to the end of the namespace list. */
extern void _dl_add_to_namespace_list (struct link_map *new, Lmid_t nsid)
@@ -968,7 +968,7 @@ extern void _dl_init (struct link_map *main_map, int argc, char **argv,
/* Call the finalizer functions of all shared objects whose
initializer functions have completed. */
-extern void _dl_fini (void);
+extern void _dl_fini (void) attribute_hidden;
/* Sort array MAPS according to dependencies of the contained objects. */
extern void _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used,
@@ -1147,10 +1147,12 @@ extern struct link_map *_dl_find_dso_for_object (const ElfW(Addr) addr);
rtld_hidden_proto (_dl_find_dso_for_object)
/* Initialization which is normally done by the dynamic linker. */
-extern void _dl_non_dynamic_init (void) internal_function;
+extern void _dl_non_dynamic_init (void)
+ internal_function attribute_hidden;
/* Used by static binaries to check the auxiliary vector. */
-extern void _dl_aux_init (ElfW(auxv_t) *av) internal_function;
+extern void _dl_aux_init (ElfW(auxv_t) *av)
+ internal_function attribute_hidden;
__END_DECLS
diff --git a/sysdeps/i386/machine-gmon.h b/sysdeps/i386/machine-gmon.h
index 3e90b8c..81e168e 100644
--- a/sysdeps/i386/machine-gmon.h
+++ b/sysdeps/i386/machine-gmon.h
@@ -30,7 +30,7 @@
#define mcount_internal __mcount_internal
extern void mcount_internal (u_long frompc, u_long selfpc)
- __attribute__ ((regparm (2)));
+ __attribute__ ((regparm (2))) attribute_hidden;
#define _MCOUNT_DECL(frompc, selfpc) \
__attribute__ ((regparm (2))) \
diff --git a/sysdeps/unix/sysv/linux/i386/olddirent.h b/sysdeps/unix/sysv/linux/i386/olddirent.h
index 8f2fcb7..a90883d 100644
--- a/sysdeps/unix/sysv/linux/i386/olddirent.h
+++ b/sysdeps/unix/sysv/linux/i386/olddirent.h
@@ -35,7 +35,7 @@ libc_hidden_proto (__old_readdir64);
extern int __old_readdir64_r (DIR *__dirp, struct __old_dirent64 *__entry,
struct __old_dirent64 **__result);
extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes)
- internal_function;
+ internal_function attribute_hidden;
int __old_scandir64 (const char * __dir,
struct __old_dirent64 *** __namelist,
int (*__selector) (const struct __old_dirent64 *),
diff --git a/wcsmbs/wcsmbsload.h b/wcsmbs/wcsmbsload.h
index 3e254a8..eb2a2be 100644
--- a/wcsmbs/wcsmbsload.h
+++ b/wcsmbs/wcsmbsload.h
@@ -38,15 +38,15 @@ extern const struct gconv_fcts __wcsmbs_gconv_fcts_c attribute_hidden;
/* Load conversion functions for the currently selected locale. */
extern void __wcsmbs_load_conv (struct __locale_data *new_category)
- internal_function;
+ internal_function attribute_hidden;
/* Clone the current `__wcsmbs_load_conv' value. */
extern void __wcsmbs_clone_conv (struct gconv_fcts *copy)
- internal_function;
+ internal_function attribute_hidden;
/* Find the conversion functions for converting to and from NAME. */
extern int __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)
- internal_function;
+ internal_function attribute_hidden;
/* Function used for the `private.cleanup' hook. */
extern void _nl_cleanup_ctype (struct __locale_data *)
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources
More information about the Glibc-cvs
mailing list