From 100351c3e1a858d32177f004e39a91d9d9a004ef Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 13 Mar 2002 02:17:12 +0000 Subject: Update. * stdio-common/itowa-digits.c (_itowa_lower_digits): Define as hidden. (_itowa_upper_digits): Likewise. * libio/stdio.c (_IO_stdin, _IO_stdout, _IO_stderr): Define as hidden. * libio/libio.h [_LIBC] (_IO_stdin, _IO_stdout, _IO_stderr): Declare as hidden. * libio/libioP.h: Declare _IO_file_jumps_mmap, _IO_wfile_jumps, _IO_wfile_jumps_mmap, _IO_proc_jumps, _IO_old_proc_jumps, _IO_str_jumps, _IO_wstr_jumps, _IO_file_jumps_internal, _IO_wfile_jumps_internal, and _IO_list_all_internal as hidden. * gmon/gmon.c (__bb_head): Define as hidden. * gmon/bb_exit_func.c (__bb_head): Declare as hidden. * argp/argp-parse.c (_argp_hang): Define as static. * include/libc-symbols.h (_INTVARDEF): Adjust for visibility handling in latest compilers. * inet/in6_addr.c (in6addr_any): Use INTVARDEF not INTDEF to define alias. * libio/fileops.c (_IO_file_jumps): Likewise. * libio/stdfiles.c (_IO_list_all): Likewise. * libio/wfileops.c (_IO_wfile_jumps): Likewise. * malloc/malloc.h: Move __libc_malloc_initialized declaration to include/malloc.h. * include/malloc.h: Add __libc_malloc_initialized declaration here. Mark variable hidden. * malloc/malloc.c: Include not "malloc.h". * elf/dl-open.c (__libc_argc): Declare as hidden. (__libc_argv): Likewise. * sysdeps/generic/wordexp.c (__libc_argc): Declare as hidden. (__libc_argv): Likewise. * sysdeps/mach/hurd/i386/init-first.c: Define __libc_argc and __libc_argv as hidden. * sysdeps/mach/hurd/mips/init-first.c: Likewise. * sysdeps/mach/hurd/powerpc/init-first.c: Likewise. * sysdeps/unix/sysv/aix/init-first.c: Likewise. * sysdeps/unix/sysv/linux/init-first.c: Likewise. --- libio/fileops.c | 2 +- libio/libio.h | 8 ++++---- libio/libioP.h | 22 +++++++++++----------- libio/stdfiles.c | 2 +- libio/stdio.c | 10 +++++++--- libio/wfileops.c | 2 +- 6 files changed, 25 insertions(+), 21 deletions(-) (limited to 'libio') diff --git a/libio/fileops.c b/libio/fileops.c index dd8960ef03..eaf590908a 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -1270,7 +1270,7 @@ struct _IO_jump_t _IO_file_jumps = JUMP_INIT(showmanyc, _IO_default_showmanyc), JUMP_INIT(imbue, _IO_default_imbue) }; -INTDEF(_IO_file_jumps) +INTVARDEF(_IO_file_jumps) struct _IO_jump_t _IO_file_jumps_mmap = { diff --git a/libio/libio.h b/libio/libio.h index 1bd31894e8..c8231df3ab 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1995, 1997-2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991-1995, 1997-2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner . @@ -331,9 +331,9 @@ extern struct _IO_FILE_plus _IO_2_1_stderr_; #define _IO_stdout ((_IO_FILE*)(&_IO_2_1_stdout_)) #define _IO_stderr ((_IO_FILE*)(&_IO_2_1_stderr_)) #else -extern _IO_FILE *_IO_stdin; -extern _IO_FILE *_IO_stdout; -extern _IO_FILE *_IO_stderr; +extern _IO_FILE *_IO_stdin attribute_hidden; +extern _IO_FILE *_IO_stdout attribute_hidden; +extern _IO_FILE *_IO_stderr attribute_hidden; #endif diff --git a/libio/libioP.h b/libio/libioP.h index b40e9e69eb..f3a2d97e2a 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -426,15 +426,15 @@ extern int _IO_default_showmanyc __P ((_IO_FILE *)); extern void _IO_default_imbue __P ((_IO_FILE *, void *)); extern struct _IO_jump_t _IO_file_jumps; -extern struct _IO_jump_t _IO_file_jumps_mmap; -extern struct _IO_jump_t _IO_wfile_jumps; -extern struct _IO_jump_t _IO_wfile_jumps_mmap; -extern struct _IO_jump_t _IO_old_file_jumps; +extern struct _IO_jump_t _IO_file_jumps_mmap attribute_hidden; +extern struct _IO_jump_t _IO_wfile_jumps attribute_hidden; +extern struct _IO_jump_t _IO_wfile_jumps_mmap attribute_hidden; +extern struct _IO_jump_t _IO_old_file_jumps attribute_hidden; extern struct _IO_jump_t _IO_streambuf_jumps; -extern struct _IO_jump_t _IO_proc_jumps; -extern struct _IO_jump_t _IO_old_proc_jumps; -extern struct _IO_jump_t _IO_str_jumps; -extern struct _IO_jump_t _IO_wstr_jumps; +extern struct _IO_jump_t _IO_proc_jumps attribute_hidden; +extern struct _IO_jump_t _IO_old_proc_jumps attribute_hidden; +extern struct _IO_jump_t _IO_str_jumps attribute_hidden; +extern struct _IO_jump_t _IO_wstr_jumps attribute_hidden; extern struct _IO_codecvt __libio_codecvt; extern int _IO_do_write __P ((_IO_FILE *, const char *, _IO_size_t)); extern int _IO_new_do_write __P ((_IO_FILE *, const char *, _IO_size_t)); @@ -683,10 +683,10 @@ extern _IO_off64_t _IO_str_seekoff_internal __P ((_IO_FILE *, _IO_off64_t, extern void _IO_str_init_static_internal __P ((struct _IO_strfile_ *, char *, int, char *)); -extern struct _IO_jump_t _IO_file_jumps_internal; -extern struct _IO_jump_t _IO_wfile_jumps_internal; +extern struct _IO_jump_t _IO_file_jumps_internal attribute_hidden; +extern struct _IO_jump_t _IO_wfile_jumps_internal attribute_hidden; -extern struct _IO_FILE_plus *_IO_list_all_internal; +extern struct _IO_FILE_plus *_IO_list_all_internal attribute_hidden; extern void _IO_link_in_internal __P ((struct _IO_FILE_plus *)); extern int _IO_sputbackc_internal __P ((_IO_FILE *, int)); diff --git a/libio/stdfiles.c b/libio/stdfiles.c index dd4be04207..cbc1407900 100644 --- a/libio/stdfiles.c +++ b/libio/stdfiles.c @@ -71,4 +71,4 @@ DEF_STDFILE(_IO_2_1_stdout_, 1, &_IO_2_1_stdin_, _IO_NO_READS); DEF_STDFILE(_IO_2_1_stderr_, 2, &_IO_2_1_stdout_, _IO_NO_READS+_IO_UNBUFFERED); struct _IO_FILE_plus *_IO_list_all = &_IO_2_1_stderr_; -INTDEF(_IO_list_all) +INTVARDEF(_IO_list_all) diff --git a/libio/stdio.c b/libio/stdio.c index 9a594963e5..64a8ab2d57 100644 --- a/libio/stdio.c +++ b/libio/stdio.c @@ -39,7 +39,11 @@ _IO_FILE *stderr = (FILE *) &_IO_2_1_stderr_; #undef _IO_stdout #undef _IO_stderr #ifdef _LIBC -strong_alias (stdin, _IO_stdin); -strong_alias (stdout, _IO_stdout); -strong_alias (stderr, _IO_stderr); +# define AL(name) AL2 (name, _IO_##name) +# define AL2(name, al) \ + extern __typeof (name) al __attribute__ ((alias (#name), \ + visibility ("hidden"))) +AL(stdin); +AL(stdout); +AL(stderr); #endif diff --git a/libio/wfileops.c b/libio/wfileops.c index d0259b097e..504c799010 100644 --- a/libio/wfileops.c +++ b/libio/wfileops.c @@ -862,7 +862,7 @@ struct _IO_jump_t _IO_wfile_jumps = JUMP_INIT(showmanyc, _IO_default_showmanyc), JUMP_INIT(imbue, _IO_default_imbue) }; -INTDEF(_IO_wfile_jumps) +INTVARDEF(_IO_wfile_jumps) struct _IO_jump_t _IO_wfile_jumps_mmap = -- cgit 1.4.1