[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r18689 - in /fsf/trunk/libc: ./ argp/ assert/ conform/data/ debug/ include/ include/sys/ intl/ libio/ malloc/ math/ misc/ po...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r18689 - in /fsf/trunk/libc: ./ argp/ assert/ conform/data/ debug/ include/ include/sys/ intl/ libio/ malloc/ math/ misc/ po...
- From: eglibc@xxxxxxxxxx
- Date: Fri, 25 May 2012 00:01:53 -0000
Author: eglibc
Date: Fri May 25 00:01:51 2012
New Revision: 18689
Log:
Import glibc-mainline for 2012-05-25
Added:
fsf/trunk/libc/scripts/data/c++-types-x32-linux-gnu.data
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/configure
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/ld.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libBrokenLocale.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libanl.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libc.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libdl.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libm.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libnsl.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libpthread.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libresolv.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/librt.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libthread_db.abilist
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libutil.abilist
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/Makeconfig
fsf/trunk/libc/Makerules
fsf/trunk/libc/NEWS
fsf/trunk/libc/argp/argp-help.c
fsf/trunk/libc/argp/argp-parse.c
fsf/trunk/libc/assert/assert.c
fsf/trunk/libc/conform/data/stdio.h-data
fsf/trunk/libc/conform/data/stdlib.h-data
fsf/trunk/libc/debug/fgets_chk.c
fsf/trunk/libc/debug/fgets_u_chk.c
fsf/trunk/libc/debug/fread_chk.c
fsf/trunk/libc/debug/fread_u_chk.c
fsf/trunk/libc/debug/gets_chk.c
fsf/trunk/libc/debug/obprintf_chk.c
fsf/trunk/libc/debug/vasprintf_chk.c
fsf/trunk/libc/debug/vdprintf_chk.c
fsf/trunk/libc/debug/vsnprintf_chk.c
fsf/trunk/libc/debug/vsprintf_chk.c
fsf/trunk/libc/include/argz.h
fsf/trunk/libc/include/libintl.h
fsf/trunk/libc/include/libio.h
fsf/trunk/libc/include/stdio.h
fsf/trunk/libc/include/stdio_ext.h
fsf/trunk/libc/include/sys/time.h
fsf/trunk/libc/intl/dcgettext.c
fsf/trunk/libc/intl/dgettext.c
fsf/trunk/libc/intl/gettext.c
fsf/trunk/libc/intl/l10nflist.c
fsf/trunk/libc/libio/__fpurge.c
fsf/trunk/libc/libio/__fsetlocking.c
fsf/trunk/libc/libio/filedoalloc.c
fsf/trunk/libc/libio/fileops.c
fsf/trunk/libc/libio/freopen.c
fsf/trunk/libc/libio/freopen64.c
fsf/trunk/libc/libio/genops.c
fsf/trunk/libc/libio/iofclose.c
fsf/trunk/libc/libio/iofdopen.c
fsf/trunk/libc/libio/iofflush.c
fsf/trunk/libc/libio/iofflush_u.c
fsf/trunk/libc/libio/iofgets.c
fsf/trunk/libc/libio/iofgets_u.c
fsf/trunk/libc/libio/iofopen.c
fsf/trunk/libc/libio/iofopncook.c
fsf/trunk/libc/libio/iofread.c
fsf/trunk/libc/libio/iofread_u.c
fsf/trunk/libc/libio/ioftell.c
fsf/trunk/libc/libio/iofwrite.c
fsf/trunk/libc/libio/iogetline.c
fsf/trunk/libc/libio/iogets.c
fsf/trunk/libc/libio/iogetwline.c
fsf/trunk/libc/libio/iolibio.h
fsf/trunk/libc/libio/iopadn.c
fsf/trunk/libc/libio/iopopen.c
fsf/trunk/libc/libio/ioseekoff.c
fsf/trunk/libc/libio/ioseekpos.c
fsf/trunk/libc/libio/iosetbuffer.c
fsf/trunk/libc/libio/iosetvbuf.c
fsf/trunk/libc/libio/ioungetc.c
fsf/trunk/libc/libio/ioungetwc.c
fsf/trunk/libc/libio/iovdprintf.c
fsf/trunk/libc/libio/iovsprintf.c
fsf/trunk/libc/libio/iovsscanf.c
fsf/trunk/libc/libio/libioP.h
fsf/trunk/libc/libio/memstream.c
fsf/trunk/libc/libio/obprintf.c
fsf/trunk/libc/libio/oldfileops.c
fsf/trunk/libc/libio/oldiofclose.c
fsf/trunk/libc/libio/oldiofdopen.c
fsf/trunk/libc/libio/oldiofopen.c
fsf/trunk/libc/libio/oldiopopen.c
fsf/trunk/libc/libio/oldstdfiles.c
fsf/trunk/libc/libio/putc.c
fsf/trunk/libc/libio/setbuf.c
fsf/trunk/libc/libio/setlinebuf.c
fsf/trunk/libc/libio/stdfiles.c
fsf/trunk/libc/libio/strops.c
fsf/trunk/libc/libio/vasprintf.c
fsf/trunk/libc/libio/vscanf.c
fsf/trunk/libc/libio/vsnprintf.c
fsf/trunk/libc/libio/vswprintf.c
fsf/trunk/libc/libio/wfiledoalloc.c
fsf/trunk/libc/libio/wfileops.c
fsf/trunk/libc/libio/wgenops.c
fsf/trunk/libc/libio/wmemstream.c
fsf/trunk/libc/libio/wstrops.c
fsf/trunk/libc/malloc/malloc.c
fsf/trunk/libc/malloc/mtrace.c
fsf/trunk/libc/math/gen-libm-test.pl
fsf/trunk/libc/math/libm-test.inc
fsf/trunk/libc/misc/error.c
fsf/trunk/libc/misc/syslog.c
fsf/trunk/libc/posix/regex_internal.h
fsf/trunk/libc/stdio-common/asprintf.c
fsf/trunk/libc/stdio-common/fxprintf.c
fsf/trunk/libc/stdio-common/getw.c
fsf/trunk/libc/stdio-common/isoc99_fscanf.c
fsf/trunk/libc/stdio-common/isoc99_scanf.c
fsf/trunk/libc/stdio-common/isoc99_vfscanf.c
fsf/trunk/libc/stdio-common/isoc99_vscanf.c
fsf/trunk/libc/stdio-common/isoc99_vsscanf.c
fsf/trunk/libc/stdio-common/printf-prs.c
fsf/trunk/libc/stdio-common/printf_fp.c
fsf/trunk/libc/stdio-common/printf_fphex.c
fsf/trunk/libc/stdio-common/printf_size.c
fsf/trunk/libc/stdio-common/putw.c
fsf/trunk/libc/stdio-common/scanf.c
fsf/trunk/libc/stdio-common/sprintf.c
fsf/trunk/libc/stdio-common/tmpfile.c
fsf/trunk/libc/stdio-common/vfprintf.c
fsf/trunk/libc/stdio-common/vfscanf.c
fsf/trunk/libc/stdlib/strfmon_l.c
fsf/trunk/libc/string/argz-count.c
fsf/trunk/libc/string/argz-stringify.c
fsf/trunk/libc/sunrpc/openchild.c
fsf/trunk/libc/sunrpc/xdr_stdio.c
fsf/trunk/libc/sysdeps/i386/fpu/libm-test-ulps
fsf/trunk/libc/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
fsf/trunk/libc/sysdeps/mach/gettimeofday.c
fsf/trunk/libc/sysdeps/mach/hurd/tmpfile.c
fsf/trunk/libc/sysdeps/posix/gettimeofday.c
fsf/trunk/libc/sysdeps/powerpc/fpu/libm-test-ulps
fsf/trunk/libc/sysdeps/s390/fpu/libm-test-ulps
fsf/trunk/libc/sysdeps/sparc/fpu/libm-test-ulps
fsf/trunk/libc/sysdeps/unix/make-syscalls.sh
fsf/trunk/libc/sysdeps/unix/syscalls.list
fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-vdso.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/s390/gettimeofday.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list
fsf/trunk/libc/sysdeps/x86_64/fpu/libm-test-ulps
fsf/trunk/libc/sysdeps/x86_64/x32/shlib-versions
fsf/trunk/libc/time/gettimeofday.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri May 25 00:01:51 2012
@@ -1,3 +1,362 @@
+2012-05-24 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * conform/data/stdio.h-data (BUFSIZ): Use macro-int-constant.
+ Require >= 256.
+ (FILENAME_MAX): Use macro-int-constant.
+ (FOPEN_MAX): Use macro-int-constant. Require >= 8.
+ (_IOFBF): Use macro-int-constant.
+ (_IOLBF): Likewise.
+ (_IONBF): Likewise.
+ (SEEK_CUR): Likewise.
+ (SEEK_END): Likewise.
+ (SEEK_SET): Likewise.
+ (TMP_MAX): Likewise.
+ (EOF): Use macro-int-constant. Require < 0.
+ (NULL): Use macro-constant. Require == 0.
+ (stdin): Require type to be FILE *.
+ (stdout): Likewise.
+ (stderr): Likewise.
+ * conform/data/stdlib.h-data (EXIT_FAILURE): Use
+ macro-int-constant.
+ (EXIT_SUCCESS): Likewise.
+ (NULL): Use macro-constant. Require == 0.
+ (RAND_MAX): Use macro-int-constant.
+ [ISO99 || ISO11] (lldiv_t): Require also for these standards.
+ [C99-based standards] (strtof): Require function.
+ [C99-based standards] (strtold): Likewise.
+ [C99-based standards] (strtoll): Likewise.
+ [C99-based standards] (strtoull): Likewise.
+ [ISO || ISO99 || ISO11] (stddef.h): Do not allow header.
+ [ISO || ISO99 || ISO11] (limits.h): Likewise.
+ [ISO || ISO99 || ISO11] (math.h): Likewise.
+ [ISO || ISO99 || ISO11] (sys/wait.h): Likewise.
+ (str*): Change to str[abcdefghijklmnopqrstuvwxyz]*.
+ [ISO || ISO99 || ISO11] (*_t): Do not allow.
+
+2012-05-24 Andreas Schwab <schwab@xxxxxxxxxxxxxx>
+
+ [BZ #14132]
+ * argp/argp-help.c (dgettext) [_LIBC]: Remove use of INTUSE.
+ * argp/argp-parse.c (dgettext) [_LIBC]: Likewise.
+ * intl/dgettext.c (DCGETTEXT): Likewise.
+ * intl/gettext.c (DCGETTEXT): Likewise.
+ * intl/l10nflist.c (__argz_count, __argz_stringify): Likewise.
+ * posix/regex_internal.h (gettext): Likewise.
+ * include/libintl.h (__dcgettext_internal, __dcngettext_internal):
+ Remove declaration.
+ * include/argz.h (__argz_count_internal)
+ (__argz_stringify_internal): Remove declaration.
+ (__argz_count, __argz_stringify): Declare hidden proto.
+ * intl/dcgettext.c: Remove use of INTDEF.
+ * string/argz-count.c: Replace INTDEF with libc_hidden_def.
+ * string/argz-stringify.c: Likewise.
+ * include/libio.h (_IO_free_backup_area, _IO_free_wbackup_area)
+ (_IO_padn, _IO_putc, _IO_sgetn, _IO_vfprintf, _IO_vfscanf):
+ Declare hidden proto.
+ * include/libio.h (_IO_free_backup_area, _IO_free_wbackup_area)
+ (_IO_padn, _IO_putc, _IO_sgetn, _IO_vfprintf, _IO_vfscanf):
+ Declare hidden proto.
+ * include/stdio.h (__asprintf_internal): Don't declare.
+ (__asprintf): Don't define as macro. Declare hidden proto.
+ * include/stdio_ext.h (__fsetlocking_internal): Don't declare.
+ (__fsetlocking): Declare hidden proto.
+ * libio/iolibio.h (_IO_fdopen, _IO_fflush, _IO_ftell, _IO_fread)
+ (_IO_fwrite, _IO_setbuffer, _IO_setvbuf, _IO_vsprintf): Declare
+ hidden proto.
+ (_IO_vprintf, _IO_freopen, _IO_freopen64, _IO_setbuf)
+ (_IO_setlinebuf): Remove use of INTUSE.
+ (_IO_setbuffer_internal, _IO_fread_internal, _IO_fdopen_internal)
+ (_IO_vsprintf_internal, _IO_fflush_internal, _IO_fwrite_internal)
+ (_IO_ftell_internal, _IO_fputs_internal, _IO_setvbuf_internal):
+ Remove declaration.
+ * libio/libioP.h (INTUSE, INTDEF, INTDEF2): Don't define.
+ (_IO_do_flush): Remove use of INTUSE.
+ (_IO_switch_to_get_mode, _IO_init, _IO_sputbackc, _IO_un_link)
+ (_IO_link_in, _IO_doallocbuf, _IO_unsave_markers, _IO_setb)
+ (_IO_adjust_column, _IO_least_wmarker)
+ (_IO_switch_to_main_wget_area, _IO_switch_to_wbackup_area)
+ (_IO_switch_to_wget_mode, _IO_wsetb, _IO_sputbackwc)
+ (_IO_wdoallocbuf, _IO_default_uflow, _IO_wdefault_uflow)
+ (_IO_default_doallocate, _IO_wdefault_doallocate)
+ (_IO_default_finish, _IO_wdefault_finish, _IO_default_pbackfail)
+ (_IO_wdefault_pbackfail, _IO_default_xsputn, _IO_wdefault_xsputn)
+ (_IO_default_xsgetn, _IO_wdefault_xsgetn, _IO_do_write)
+ (_IO_wdo_write, _IO_flush_all, _IO_flush_all_linebuffered)
+ (_IO_file_doallocate, _IO_file_setbuf, _IO_file_seekoff)
+ (_IO_file_xsputn, _IO_file_xsgetn, _IO_file_stat, _IO_file_close)
+ (_IO_file_underflow, _IO_file_overflow, _IO_file_init)
+ (_IO_file_attach, _IO_file_fopen, _IO_file_read, _IO_file_sync)
+ (_IO_file_close_it, _IO_file_seek, _IO_file_finish)
+ (_IO_wfile_xsputn, _IO_wfile_sync, _IO_wfile_underflow)
+ (_IO_wfile_overflow, _IO_wfile_seekoff, _IO_str_underflow)
+ (_IO_str_overflow, _IO_str_pbackfail, _IO_str_seekoff)
+ (_IO_getline, _IO_getline_info, _IO_list_all): Declare hidden
+ proto.
+ (_IO_flush_all_internal, _IO_adjust_column_internal)
+ (_IO_default_uflow_internal, _IO_default_finish_internal)
+ (_IO_default_pbackfail_internal, _IO_default_xsputn_internal)
+ (_IO_default_xsgetn_internal, _IO_default_doallocate_internal)
+ (_IO_wdefault_finish_internal, _IO_wdefault_pbackfail_internal)
+ (_IO_wdefault_xsputn_internal, _IO_wdefault_xsgetn_internal)
+ (_IO_wdefault_doallocate_internal, _IO_wdefault_uflow_internal)
+ (_IO_file_doallocate_internal, _IO_file_setbuf_internal)
+ (_IO_file_seekoff_internal, _IO_file_xsputn_internal)
+ (_IO_file_xsgetn_internal, _IO_file_stat_internal)
+ (_IO_file_close_internal, _IO_file_close_it_internal)
+ (_IO_file_underflow_internal, _IO_file_overflow_internal)
+ (_IO_file_init_internal, _IO_file_attach_internal)
+ (_IO_file_fopen_internal, _IO_file_read_internal)
+ (_IO_file_sync_internal, _IO_file_seek_internal)
+ (_IO_file_finish_internal, _IO_wfile_xsputn_internal)
+ (_IO_wfile_seekoff_internal, _IO_wfile_sync_internal)
+ (_IO_str_underflow_internal, _IO_str_overflow_internal)
+ (_IO_str_pbackfail_internal, _IO_str_seekoff_internal)
+ (_IO_file_jumps_internal, _IO_wfile_jumps_internal)
+ (_IO_list_all_internal, _IO_link_in_internal)
+ (_IO_sputbackc_internal, _IO_wdoallocbuf_internal)
+ (_IO_sgetn_internal, _IO_flush_all_linebuffered_internal)
+ (_IO_switch_to_wget_mode_internal, _IO_unsave_markers_internal)
+ (_IO_switch_to_main_wget_area_internal, _IO_wdo_write_internal)
+ (_IO_do_write_internal, _IO_padn_internal)
+ (_IO_getline_info_internal, _IO_getline_internal)
+ (_IO_free_wbackup_area_internal, _IO_free_backup_area_internal)
+ (_IO_switch_to_wbackup_area_internal, _IO_setb_internal)
+ (_IO_sputbackwc_internal, _IO_switch_to_get_mode_internal)
+ (_IO_vfscanf_internal, _IO_vfprintf_internal)
+ (_IO_doallocbuf_internal, _IO_wsetb_internal, _IO_putc_internal)
+ (_IO_init_internal, _IO_un_link_internal): Don't declare.
+ * libio/fileops.c: Replace INTDEF with libc_hidden_def and INTDEF2
+ with libc_hidden_ver, remove use of INTUSE.
+ * libio/genops.c: Likewise.
+ * libio/freopen.c: Likewise.
+ * libio/freopen64.c: Likewise.
+ * libio/iofclose.c: Likewise.
+ * libio/iofdopen.c: Likewise.
+ * libio/iofflush.c: Likewise.
+ * libio/iofflush_u.c: Likewise.
+ * libio/iofgets.c: Likewise.
+ * libio/iofgets_u.c: Likewise.
+ * libio/iofopen.c: Likewise.
+ * libio/iofopncook.c: Likewise.
+ * libio/iofread.c: Likewise.
+ * libio/iofread_u.c: Likewise.
+ * libio/ioftell.c: Likewise.
+ * libio/iofwrite.c: Likewise.
+ * libio/iogetline.c: Likewise.
+ * libio/iogets.c: Likewise.
+ * libio/iogetwline.c: Likewise.
+ * libio/iopadn.c: Likewise.
+ * libio/iopopen.c: Likewise.
+ * libio/ioseekoff.c: Likewise.
+ * libio/ioseekpos.c: Likewise.
+ * libio/iosetbuffer.c: Likewise.
+ * libio/iosetvbuf.c: Likewise.
+ * libio/ioungetc.c: Likewise.
+ * libio/ioungetwc.c: Likewise.
+ * libio/iovdprintf.c: Likewise.
+ * libio/iovsprintf.c: Likewise.
+ * libio/iovsscanf.c: Likewise.
+ * libio/memstream.c: Likewise.
+ * libio/obprintf.c: Likewise.
+ * libio/oldfileops.c: Likewise.
+ * libio/oldiofclose.c: Likewise.
+ * libio/oldiofdopen.c: Likewise.
+ * libio/oldiofopen.c: Likewise.
+ * libio/oldiopopen.c: Likewise.
+ * libio/oldstdfiles.c: Likewise.
+ * libio/putc.c: Likewise.
+ * libio/setbuf.c: Likewise.
+ * libio/setlinebuf.c: Likewise.
+ * libio/stdfiles.c: Likewise.
+ * libio/strops.c: Likewise.
+ * libio/vasprintf.c: Likewise.
+ * libio/vscanf.c: Likewise.
+ * libio/vsnprintf.c: Likewise.
+ * libio/vswprintf.c: Likewise.
+ * libio/wfiledoalloc.c: Likewise.
+ * libio/wfileops.c: Likewise.
+ * libio/wgenops.c: Likewise.
+ * libio/wmemstream.c: Likewise.
+ * libio/wstrops.c: Likewise.
+ * libio/__fpurge.c: Likewise.
+ * libio/__fsetlocking.c: Likewise.
+ * assert/assert.c: Likewise.
+ * debug/fgets_chk.c: Likewise.
+ * debug/fgets_u_chk.c: Likewise.
+ * debug/fread_chk.c: Likewise.
+ * debug/fread_u_chk.c: Likewise.
+ * debug/gets_chk.c: Likewise.
+ * debug/obprintf_chk.c: Likewise.
+ * debug/vasprintf_chk.c: Likewise.
+ * debug/vdprintf_chk.c: Likewise.
+ * debug/vsnprintf_chk.c: Likewise.
+ * debug/vsprintf_chk.c: Likewise.
+ * malloc/mtrace.c: Likewise.
+ * misc/error.c: Likewise.
+ * misc/syslog.c: Likewise.
+ * stdio-common/asprintf.c: Likewise.
+ * stdio-common/fxprintf.c: Likewise.
+ * stdio-common/getw.c: Likewise.
+ * stdio-common/isoc99_fscanf.c: Likewise.
+ * stdio-common/isoc99_scanf.c: Likewise.
+ * stdio-common/isoc99_vfscanf.c: Likewise.
+ * stdio-common/isoc99_vscanf.c: Likewise.
+ * stdio-common/isoc99_vsscanf.c: Likewise.
+ * stdio-common/printf-prs.c: Likewise.
+ * stdio-common/printf_fp.c: Likewise.
+ * stdio-common/printf_fphex.c: Likewise.
+ * stdio-common/printf_size.c: Likewise.
+ * stdio-common/putw.c: Likewise.
+ * stdio-common/scanf.c: Likewise.
+ * stdio-common/sprintf.c: Likewise.
+ * stdio-common/tmpfile.c: Likewise.
+ * stdio-common/vfprintf.c: Likewise.
+ * stdio-common/vfscanf.c: Likewise.
+ * stdlib/strfmon_l.c: Likewise.
+ * sunrpc/openchild.c: Likewise.
+ * sunrpc/xdr_stdio.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise.
+ * sysdeps/mach/hurd/tmpfile.c: Likewise.
+
+2012-05-24 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list: New file.
+
+ * sysdeps/unix/make-syscalls.sh: Support "syscall:vdso_name@VDSOVER"
+ in the third column, to generate for the shared library an IFUNC
+ that uses _dl_vdso_vsym.
+ * Makerules (COMPILE.c, compile-stdin.c): New variables.
+ * Makeconfig (object-suffixes-noshared): New variable.
+
+ * sysdeps/unix/sysv/linux/dl-vdso.h (PREPARE_VERSION_KNOWN): New macro.
+ (VDSO_NAME_LINUX_2_6, VDSO_HASH_LINUX_2_6): New macros.
+ (VDSO_NAME_LINUX_2_6_15, VDSO_HASH_LINUX_2_6_15): New macros.
+ (VDSO_NAME_LINUX_2_6_29, VDSO_HASH_LINUX_2_6_29): New macros.
+
+ [BZ #14132]
+ * include/sys/time.h (__gettimeofday): Remove macro.
+ (__gettimeofday, gettimeofday): Add libc_hidden_proto.
+ * time/gettimeofday.c (__gettimeofday): Remove #undef.
+ Remove INTDEF.
+ (__gettimeofday): Add libc_hidden_def.
+ (gettimeofday): Add libc_hidden_weak.
+ * sysdeps/mach/gettimeofday.c: Likewise.
+ * sysdeps/posix/gettimeofday.c: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/gettimeofday.c: Likewise.
+ * sysdeps/unix/sysv/linux/s390/gettimeofday.c: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
+ (__gettimeofday_internal): Remove strong_alias.
+ (__gettimeofday): Add libc_hidden_def.
+ (gettimeofday): Add libc_hidden_weak.
+ * sysdeps/unix/syscalls.list (gettimeofday):
+ Remove __gettimeofday_internal alias.
+
+2012-05-24 Daniel Jacobowitz <drow@xxxxxxxxx>
+ H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ [BZ #12495]
+ * malloc/malloc.c (SMALLBIN_CORRECTION): New.
+ (MIN_LARGE_SIZE, smallbin_index): Use it to handle 16-byte alignment.
+ (largebin_index_32_big): New.
+ (largebin_index): Use it for 16-byte alignment.
+ (sYSMALLOc): Handle MALLOC_ALIGNMENT > 2 * SIZE_SZ. Don't update
+ correction with front_misalign.
+
+2012-05-24 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/ld.abilist: New file.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libBrokenLocale.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libanl.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libc.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libdl.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libm.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libnsl.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libpthread.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libresolv.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/librt.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libthread_db.abilist:
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/x32/nptl/libutil.abilist:
+ Likewise.
+
+ * scripts/data/c++-types-x32-linux-gnu.data: New file.
+ * sysdeps/x86_64/x32/shlib-versions: Add x32 ABI entry.
+
+2012-05-24 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ [BZ #10846]
+ [BZ #14036]
+ * math/libm-test.inc (exp_test): Add test from bug 14036.
+ (pow_test): Add test from bug 10846.
+
+ * math/gen-libm-test.pl (%beautify): Remove entries for exceptions
+ and other flags.
+ (special_function): Do not include flags in test name.
+ (parse_args): Likewise.
+ * sysdeps/i386/fpu/libm-test-ulps: Update.
+ * sysdeps/powerpc/fpu/libm-test-ulps: Likewise.
+ * sysdeps/s390/fpu/libm-test-ulps: Likewise.
+ * sysdeps/sparc/fpu/libm-test-ulps: Likewise.
+ * sysdeps/x86_64/fpu/libm-test-ulps: Likewise.
+
+ * math/gen-libm-test.pl (%beautify): Add entries for underflow
+ exceptions.
+ * math/libm-test.inc ("Philosophy"): Update comment about
+ exception testing.
+ (UNDERFLOW_EXCEPTION): New macro.
+ (UNDERFLOW_EXCEPTION_OK): Likewise.
+ (UNDERFLOW_EXCEPTION_FLOAT): Likewise.
+ (UNDERFLOW_EXCEPTION_OK_FLOAT): Likewise.
+ (UNDERFLOW_EXCEPTION_DOUBLE): Likewise.
+ (UNDERFLOW_EXCEPTION_LDOUBLE_IBM): Likewise.
+ (INVALID_EXCEPTION_OK): Update value.
+ (DIVIDE_BY_ZERO_EXCEPTION_OK): Likewise.
+ (OVERFLOW_EXCEPTION_OK): Likewise.
+ (IGNORE_ZERO_INF_SIGN): Likewise.
+ (test_exceptions): Handle underflow exceptions.
+ (acos_test): Update for underflow exception expectations.
+ (cexp_test): Likewise.
+ (clog_test): Likewise.
+ (clog10_test): Likewise.
+ (csqrt_test): Likewise.
+ (ctan_test): Likewise.
+ (ctanh_test): Likewise.
+ (exp_test): Likewise.
+ (exp10_test): Likewise.
+ (exp2_test): Likewise.
+ (expm1_test): Likewise.
+ (fma_test): Likewise.
+ (j0_test): Likewise.
+ (jn_test): Likewise.
+ (nexttoward_test): Likewise.
+ (pow_test): Likewise.
+ (scalbn_test): Likewise.
+ (scalbln_test): Likewise.
+ (tan_test): Likewise.
+ (y1_test): Likewise.
+ * sysdeps/i386/fpu/libm-test-ulps: Update.
+ * sysdeps/x86_64/fpu/libm-test-ulps: Likewise.
+
+2012-05-23 David S. Miller <davem@xxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c
+ (__libc_sigaction): Remove unused local variables.
+
+2012-05-23 H.J. Lu <hongjiu.lu@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/x86_64/x32/configure: New file.
+
2012-05-23 Paul Eggert <eggert@xxxxxxxxxxx>
mktime: avoid signed integer overflow
@@ -429,7 +788,7 @@
* manual/install.texi (Configuring and compiling): Update
description about files modified in the source directory.
- * INSTALL: Regenerated.
+ * INSTALL: Regenerated.
2012-05-18 H.J. Lu <hongjiu.lu@xxxxxxxxx>
Modified: fsf/trunk/libc/Makeconfig
==============================================================================
--- fsf/trunk/libc/Makeconfig (original)
+++ fsf/trunk/libc/Makeconfig Fri May 25 00:01:51 2012
@@ -719,6 +719,10 @@
CFLAGS-.op = -pg
libtype.op = lib%_p.a
endif
+
+# Convenience variable for when we want to treat shared-library cases
+# differently from the rest.
+object-suffixes-noshared := $(filter-out .os,$(object-suffixes))
bppfx = BP-
ifeq (yes,$(build-bounded))
Modified: fsf/trunk/libc/Makerules
==============================================================================
--- fsf/trunk/libc/Makerules (original)
+++ fsf/trunk/libc/Makerules Fri May 25 00:01:51 2012
@@ -366,6 +366,7 @@
compile.cc = $(CXX) $< -c $(CXXFLAGS) $(CPPFLAGS)
compile.S = $(CC) $< -c $(CPPFLAGS) $(S-CPPFLAGS) \
$(ASFLAGS) $(ASFLAGS-$(suffix $@))
+COMPILE.c = $(CC) -c $(CFLAGS) $(CPPFLAGS)
COMPILE.S = $(CC) -c $(CPPFLAGS) $(S-CPPFLAGS) \
$(ASFLAGS) $(ASFLAGS-$(suffix $@))
@@ -373,6 +374,9 @@
# empty if make was configured to work with a cc that can't grok -c and -o
# together. You can't compile the C library with such a compiler.
OUTPUT_OPTION = -o $@
+
+# This is the end of the pipeline for compiling generated C code.
+compile-stdin.c = $(COMPILE.c) -o $@ -x c - $(compile-mkdep-flags)
# We need the $(CFLAGS) to be in there to have the right predefines during
# the dependency run for C sources. But having it for assembly sources can
Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Fri May 25 00:01:51 2012
@@ -13,8 +13,8 @@
2551, 2552, 2553, 2554, 2562, 2563, 2565, 2566, 2570, 2576, 2636, 2678,
3335, 3440, 3748, 3768, 3866, 3868, 3906, 3976, 3992, 4026, 4108, 4596,
4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578, 6649, 6730, 6770, 6794,
- 6884, 6890, 6894, 6895, 6907, 6911, 6959, 7064, 9739, 9902, 10110,
- 10135, 10140, 10153, 10210, 10254, 10346, 10375 10545, 10716, 11174,
+ 6884, 6890, 6894, 6895, 6907, 6911, 6959, 7064, 9739, 9902, 10110, 10135,
+ 10140, 10153, 10210, 10254, 10346, 10375 10545, 10716, 10846, 11174,
11322, 11365, 11451, 11494, 11521, 11677, 11837, 11959, 12047, 12097,
12193, 12297, 12298, 12301, 12340, 12354, 13058, 13361, 13525, 13526,
13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551, 13552,
@@ -26,9 +26,9 @@
13908, 13910, 13911, 13912, 13913, 13914, 13915, 13916, 13917, 13918,
13919, 13920, 13921, 13922, 13923, 13924, 13926, 13927, 13928, 13938,
13941, 13942, 13954, 13955, 13956, 13963, 13967, 13968, 13970, 13973,
- 13979, 13983, 13986, 14012, 14027, 14033, 14034, 14040, 14043, 14044,
- 14049, 14053, 14055, 14059, 14064, 14080, 14083, 14103, 14104, 14109,
- 14122, 14123
+ 13979, 13983, 13986, 14012, 14027, 14033, 14034, 14036, 14040, 14043,
+ 14044, 14049, 14053, 14055, 14059, 14064, 14080, 14083, 14103, 14104,
+ 14109, 14122, 14123
* ISO C11 support:
@@ -70,6 +70,10 @@
* Compatibility code for Linux kernel versions before 2.2 has been removed.
Note that glibc is not expected to work with any Linux kernel version
before 2.6.
+
+* New header <sys/auxv.h> and function getauxval allowing easy access to
+ the AT_* key-value pairs passed from the Linux kernel. The header also
+ defines the HWCAP_* bits associated with the AT_HWCAP key.
* New locales: mag_IN
Modified: fsf/trunk/libc/argp/argp-help.c
==============================================================================
--- fsf/trunk/libc/argp/argp-help.c (original)
+++ fsf/trunk/libc/argp/argp-help.c Fri May 25 00:01:51 2012
@@ -1,5 +1,5 @@
/* Hierarchial argument parsing help output
- Copyright (C) 1995-2007, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@xxxxxxxxxxxxxx>.
@@ -59,7 +59,7 @@
# ifdef _LIBC
# undef dgettext
# define dgettext(domain, msgid) \
- INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES)
+ __dcgettext (domain, msgid, LC_MESSAGES)
# endif
# else
# define dgettext(domain, msgid) (msgid)
Modified: fsf/trunk/libc/argp/argp-parse.c
==============================================================================
--- fsf/trunk/libc/argp/argp-parse.c (original)
+++ fsf/trunk/libc/argp/argp-parse.c Fri May 25 00:01:51 2012
@@ -1,5 +1,5 @@
/* Hierarchial argument parsing, layered over getopt
- Copyright (C) 1995-2000, 2002, 2003, 2004, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@xxxxxxxxxxxxxx>.
@@ -51,7 +51,7 @@
# ifdef _LIBC
# undef dgettext
# define dgettext(domain, msgid) \
- INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES)
+ __dcgettext (domain, msgid, LC_MESSAGES)
# endif
# else
# define dgettext(domain, msgid) (msgid)
Modified: fsf/trunk/libc/assert/assert.c
==============================================================================
--- fsf/trunk/libc/assert/assert.c (original)
+++ fsf/trunk/libc/assert/assert.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991,1994-1996,1998,2001,2002,2005,2009,2011
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -31,7 +30,7 @@
#include <wchar.h>
#include <libio/iolibio.h>
-#define fflush(s) INTUSE(_IO_fflush) (s)
+#define fflush(s) _IO_fflush (s)
/* This function, when passed a string containing an asserted
expression, a filename, and a line number, prints a message
Modified: fsf/trunk/libc/conform/data/stdio.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/stdio.h-data (original)
+++ fsf/trunk/libc/conform/data/stdio.h-data Fri May 25 00:01:51 2012
@@ -1,10 +1,10 @@
-constant BUFSIZ
-constant FILENAME_MAX
-constant FOPEN_MAX >= 8
+macro-int-constant BUFSIZ >= 256
+macro-int-constant FILENAME_MAX
+macro-int-constant FOPEN_MAX >= 8
-constant _IOFBF
-constant _IOLBF
-constant _IONBF
+macro-int-constant _IOFBF
+macro-int-constant _IOLBF
+macro-int-constant _IONBF
#if !defined ISO && !defined ISO99 && !defined ISO11
constant L_ctermid
@@ -12,25 +12,25 @@
constant L_cuserid
# endif
#endif
-constant L_tmpnam
+macro-int-constant L_tmpnam
-constant SEEK_CUR
-constant SEEK_END
-constant SEEK_SET
+macro-int-constant SEEK_CUR
+macro-int-constant SEEK_END
+macro-int-constant SEEK_SET
-constant TMP_MAX >= 10000
+macro-int-constant TMP_MAX >= 10000
-constant EOF
+macro-int-constant EOF < 0
-constant NULL
+macro-constant NULL == 0
#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined POSIX2008
constant P_tmpdir
#endif
-macro stdin
-macro stdout
-macro stderr
+macro stdin {FILE *}
+macro stdout {FILE *}
+macro stderr {FILE *}
type FILE
type fpos_t
Modified: fsf/trunk/libc/conform/data/stdlib.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/stdlib.h-data (original)
+++ fsf/trunk/libc/conform/data/stdlib.h-data Fri May 25 00:01:51 2012
@@ -5,14 +5,14 @@
element ldiv_t long quot
element ldiv_t long rem
-macro EXIT_FAILURE
-macro EXIT_SUCCESS == 0
+macro-int-constant EXIT_FAILURE
+macro-int-constant EXIT_SUCCESS == 0
-macro NULL
-constant RAND_MAX >= 32767
+macro-constant NULL == 0
+macro-int-constant RAND_MAX >= 32767
macro MB_CUR_MAX
-#if defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
+#if defined ISO99 || defined ISO11 || defined XOPEN2K || defined XOPEN2K8 || defined POSIX2008
type lldiv_t
element lldiv_t {long long} quot
element lldiv_t {long long} rem
@@ -151,8 +151,16 @@
function void srandom (unsigned)
#endif
function double strtod (const char*, char**)
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
+function float strtof (const char*, char**)
+function {long double} strtold (const char*, char**)
+#endif
function {long int} strtol (const char*, char**, int)
function {unsigned long int} strtoul (const char*, char**, int)
+#if !defined ISO && !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
+function {long long int} strtoll (const char*, char**, int)
+function {unsigned long long int} strtoull (const char*, char**, int)
+#endif
function int system (const char*)
#if defined XPG3 || defined XPG4 || defined UNIX98
function int ttyslot (void)
@@ -169,10 +177,14 @@
function size_t wcstombs (char*, const wchar_t*, size_t)
function int wctomb (char*, wchar_t)
+#if !defined ISO && !defined ISO99 && !defined ISO11
allow-header stddef.h
allow-header limits.h
allow-header math.h
allow-header sys/wait.h
+#endif
-allow str*
+allow str[abcdefghijklmnopqrstuvwxyz]*
+#if !defined ISO && !defined ISO99 && !defined ISO11
allow *_t
+#endif
Modified: fsf/trunk/libc/debug/fgets_chk.c
==============================================================================
--- fsf/trunk/libc/debug/fgets_chk.c (original)
+++ fsf/trunk/libc/debug/fgets_chk.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2005
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -47,7 +46,7 @@
case. We return an error only when there is a new error. */
int old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
fp->_IO_file_flags &= ~_IO_ERR_SEEN;
- count = INTUSE(_IO_getline) (fp, buf, MIN ((size_t) n - 1, size), '\n', 1);
+ count = _IO_getline (fp, buf, MIN ((size_t) n - 1, size), '\n', 1);
/* If we read in some bytes and errno is EAGAIN, that error will
be reported for next read. */
if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
Modified: fsf/trunk/libc/debug/fgets_u_chk.c
==============================================================================
--- fsf/trunk/libc/debug/fgets_u_chk.c (original)
+++ fsf/trunk/libc/debug/fgets_u_chk.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2005
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -46,7 +45,7 @@
case. We return an error only when there is a new error. */
int old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
fp->_IO_file_flags &= ~_IO_ERR_SEEN;
- count = INTUSE(_IO_getline) (fp, buf, MIN ((size_t) n - 1, size), '\n', 1);
+ count = _IO_getline (fp, buf, MIN ((size_t) n - 1, size), '\n', 1);
/* If we read in some bytes and errno is EAGAIN, that error will
be reported for next read. */
if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
Modified: fsf/trunk/libc/debug/fread_chk.c
==============================================================================
--- fsf/trunk/libc/debug/fread_chk.c (original)
+++ fsf/trunk/libc/debug/fread_chk.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2002, 2003, 2007
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -49,7 +48,7 @@
size_t bytes_read;
_IO_acquire_lock (stream);
- bytes_read = INTUSE(_IO_sgetn) (stream, (char *) ptr, bytes_requested);
+ bytes_read = _IO_sgetn (stream, (char *) ptr, bytes_requested);
_IO_release_lock (stream);
return bytes_requested == bytes_read ? n : bytes_read / size;
}
Modified: fsf/trunk/libc/debug/fread_u_chk.c
==============================================================================
--- fsf/trunk/libc/debug/fread_u_chk.c (original)
+++ fsf/trunk/libc/debug/fread_u_chk.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2002, 2003, 2007
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -47,7 +46,6 @@
if (bytes_requested == 0)
return 0;
- size_t bytes_read
- = INTUSE(_IO_sgetn) (stream, (char *) ptr, bytes_requested);
+ size_t bytes_read = _IO_sgetn (stream, (char *) ptr, bytes_requested);
return bytes_requested == bytes_read ? n : bytes_read / size;
}
Modified: fsf/trunk/libc/debug/gets_chk.c
==============================================================================
--- fsf/trunk/libc/debug/gets_chk.c (original)
+++ fsf/trunk/libc/debug/gets_chk.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 2002, 2003, 2004
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -55,7 +54,7 @@
int old_error = _IO_stdin->_IO_file_flags & _IO_ERR_SEEN;
_IO_stdin->_IO_file_flags &= ~_IO_ERR_SEEN;
buf[0] = (char) ch;
- count = INTUSE(_IO_getline) (_IO_stdin, buf + 1, size - 1, '\n', 0) + 1;
+ count = _IO_getline (_IO_stdin, buf + 1, size - 1, '\n', 0) + 1;
if (_IO_stdin->_IO_file_flags & _IO_ERR_SEEN)
{
retval = NULL;
Modified: fsf/trunk/libc/debug/obprintf_chk.c
==============================================================================
--- fsf/trunk/libc/debug/obprintf_chk.c (original)
+++ fsf/trunk/libc/debug/obprintf_chk.c Fri May 25 00:01:51 2012
@@ -1,6 +1,5 @@
/* Print output of stream to given obstack.
- Copyright (C) 1996,1997,1999,2000,2001,2002,2003,2004,2005,2006,2008
- Free Software Foundation, Inc.
+ Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1996.
@@ -92,7 +91,7 @@
if (flags > 0)
new_f.ofile.file.file._flags2 |= _IO_FLAGS2_FORTIFY;
- result = INTUSE(_IO_vfprintf) (&new_f.ofile.file.file, format, args);
+ result = _IO_vfprintf (&new_f.ofile.file.file, format, args);
/* Shrink the buffer to the space we really currently need. */
obstack_blank_fast (obstack, (new_f.ofile.file.file._IO_write_ptr
Modified: fsf/trunk/libc/debug/vasprintf_chk.c
==============================================================================
--- fsf/trunk/libc/debug/vasprintf_chk.c (original)
+++ fsf/trunk/libc/debug/vasprintf_chk.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1995,1997,1999-2002,2004,2006,2008,2009
- Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -64,7 +63,7 @@
if (flags > 0)
sf._sbf._f._flags2 |= _IO_FLAGS2_FORTIFY;
- ret = INTUSE(_IO_vfprintf) (&sf._sbf._f, format, args);
+ ret = _IO_vfprintf (&sf._sbf._f, format, args);
if (ret < 0)
{
free (sf._sbf._f._IO_buf_base);
Modified: fsf/trunk/libc/debug/vdprintf_chk.c
==============================================================================
--- fsf/trunk/libc/debug/vdprintf_chk.c (original)
+++ fsf/trunk/libc/debug/vdprintf_chk.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1995, 1997-2000, 2001, 2002, 2003, 2006, 2008, 2010
- Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -40,13 +39,13 @@
#endif
_IO_no_init (&tmpfil.file, _IO_USER_LOCK, 0, &wd, &_IO_wfile_jumps);
_IO_JUMPS (&tmpfil) = &_IO_file_jumps;
- INTUSE(_IO_file_init) (&tmpfil);
+ _IO_file_init (&tmpfil);
#if !_IO_UNIFIED_JUMPTABLES
tmpfil.vtable = NULL;
#endif
- if (INTUSE(_IO_file_attach) (&tmpfil.file, d) == NULL)
+ if (_IO_file_attach (&tmpfil.file, d) == NULL)
{
- INTUSE(_IO_un_link) (&tmpfil);
+ _IO_un_link (&tmpfil);
return EOF;
}
tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE;
@@ -59,7 +58,7 @@
if (flags > 0)
tmpfil.file._flags2 |= _IO_FLAGS2_FORTIFY;
- done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg);
+ done = _IO_vfprintf (&tmpfil.file, format, arg);
_IO_FINISH (&tmpfil.file);
Modified: fsf/trunk/libc/debug/vsnprintf_chk.c
==============================================================================
--- fsf/trunk/libc/debug/vsnprintf_chk.c (original)
+++ fsf/trunk/libc/debug/vsnprintf_chk.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997, 1998, 2004, 2006, 2009
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -61,7 +60,7 @@
sf.f._sbf._f._flags2 |= _IO_FLAGS2_FORTIFY;
_IO_str_init_static_internal (&sf.f, s, maxlen - 1, s);
- ret = INTUSE(_IO_vfprintf) (&sf.f._sbf._f, format, args);
+ ret = _IO_vfprintf (&sf.f._sbf._f, format, args);
if (sf.f._sbf._f._IO_buf_base != sf.overflow_buf)
*sf.f._sbf._f._IO_write_ptr = '\0';
Modified: fsf/trunk/libc/debug/vsprintf_chk.c
==============================================================================
--- fsf/trunk/libc/debug/vsprintf_chk.c (original)
+++ fsf/trunk/libc/debug/vsprintf_chk.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1994, 1997, 1999-2003, 2004, 2006, 2009
- Free Software Foundation, Inc.
+/* Copyright (C) 1994-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -40,16 +39,16 @@
JUMP_INIT_DUMMY,
JUMP_INIT(finish, _IO_str_finish),
JUMP_INIT(overflow, _IO_str_chk_overflow),
- JUMP_INIT(underflow, INTUSE(_IO_str_underflow)),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_str_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_default_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
- JUMP_INIT(seekoff, INTUSE(_IO_str_seekoff)),
+ JUMP_INIT(underflow, _IO_str_underflow),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_str_pbackfail),
+ JUMP_INIT(xsputn, _IO_default_xsputn),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
+ JUMP_INIT(seekoff, _IO_str_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_default_setbuf),
JUMP_INIT(sync, _IO_default_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_default_doallocate)),
+ JUMP_INIT(doallocate, _IO_default_doallocate),
JUMP_INIT(read, _IO_default_read),
JUMP_INIT(write, _IO_default_write),
JUMP_INIT(seek, _IO_default_seek),
@@ -83,7 +82,7 @@
if (flags > 0)
f._sbf._f._flags2 |= _IO_FLAGS2_FORTIFY;
- ret = INTUSE(_IO_vfprintf) (&f._sbf._f, format, args);
+ ret = _IO_vfprintf (&f._sbf._f, format, args);
*f._sbf._f._IO_write_ptr = '\0';
return ret;
Modified: fsf/trunk/libc/include/argz.h
==============================================================================
--- fsf/trunk/libc/include/argz.h (original)
+++ fsf/trunk/libc/include/argz.h Fri May 25 00:01:51 2012
@@ -3,10 +3,7 @@
#include <string/argz.h>
libc_hidden_proto (argz_delete)
-
-extern size_t __argz_count_internal (const char *__argz, size_t __len)
- __attribute_pure__ attribute_hidden;
-extern void __argz_stringify_internal (char *__argz, size_t __len, int __sep)
- attribute_hidden;
+libc_hidden_proto (__argz_count)
+libc_hidden_proto (__argz_stringify)
#endif
Modified: fsf/trunk/libc/include/libintl.h
==============================================================================
--- fsf/trunk/libc/include/libintl.h (original)
+++ fsf/trunk/libc/include/libintl.h Fri May 25 00:01:51 2012
@@ -12,10 +12,6 @@
const char *__msgid, int __category)
__attribute_format_arg__ (2);
libc_hidden_proto (__dcgettext)
-extern char *__dcgettext_internal (const char *__domainname,
- const char *__msgid, int __category)
- __attribute_format_arg__ (2)
- attribute_hidden;
extern char *__ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
@@ -28,12 +24,6 @@
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
__attribute_format_arg__ (2) __attribute_format_arg__ (3);
-extern char *__dcngettext_internal (const char *__domainname,
- const char *__msgid1,
- const char *__msgid2,
- unsigned long int __n, int __category)
- __attribute_format_arg__ (2) __attribute_format_arg__ (3)
- attribute_hidden;
extern char *__textdomain (const char *__domainname);
extern char *__bindtextdomain (const char *__domainname,
Modified: fsf/trunk/libc/include/libio.h
==============================================================================
--- fsf/trunk/libc/include/libio.h (original)
+++ fsf/trunk/libc/include/libio.h Fri May 25 00:01:51 2012
@@ -10,6 +10,13 @@
libc_hidden_proto (__woverflow)
libc_hidden_proto (__wunderflow)
libc_hidden_proto (__wuflow)
+libc_hidden_proto (_IO_free_backup_area)
+libc_hidden_proto (_IO_free_wbackup_area)
+libc_hidden_proto (_IO_padn)
+libc_hidden_proto (_IO_putc)
+libc_hidden_proto (_IO_sgetn)
+libc_hidden_proto (_IO_vfprintf)
+libc_hidden_proto (_IO_vfscanf)
#if defined _IO_MTSAFE_IO && _IO_lock_inexpensive
# undef _IO_flockfile
Modified: fsf/trunk/libc/include/stdio.h
==============================================================================
--- fsf/trunk/libc/include/stdio.h (original)
+++ fsf/trunk/libc/include/stdio.h Fri May 25 00:01:51 2012
@@ -116,13 +116,8 @@
extern const char *const _sys_errlist_internal[] attribute_hidden;
extern int _sys_nerr_internal attribute_hidden;
-extern int __asprintf_internal (char **__restrict __ptr,
- const char *__restrict __fmt, ...)
- attribute_hidden __attribute__ ((__format__ (__printf__, 2, 3)));
+libc_hidden_proto (__asprintf)
# if !defined NOT_IN_libc
-# define __asprintf(ptr, fmt, args...) \
- INTUSE(__asprintf) (ptr, fmt, ##args)
-
extern _IO_FILE *_IO_new_fopen (const char*, const char*);
# define fopen(fname, mode) _IO_new_fopen (fname, mode)
extern _IO_FILE *_IO_new_fdopen (int, const char*);
Modified: fsf/trunk/libc/include/stdio_ext.h
==============================================================================
--- fsf/trunk/libc/include/stdio_ext.h (original)
+++ fsf/trunk/libc/include/stdio_ext.h Fri May 25 00:01:51 2012
@@ -2,7 +2,7 @@
# include <stdio-common/stdio_ext.h>
-extern int __fsetlocking_internal (FILE *__fp, int __type) attribute_hidden;
+libc_hidden_proto (__fsetlocking)
#define __fsetlocking(fp, type) \
({ int __result = ((fp->_flags & _IO_USER_LOCK) \
Modified: fsf/trunk/libc/include/sys/time.h
==============================================================================
--- fsf/trunk/libc/include/sys/time.h (original)
+++ fsf/trunk/libc/include/sys/time.h Fri May 25 00:01:51 2012
@@ -5,9 +5,8 @@
/* Now document the internal interfaces. */
extern int __gettimeofday (struct timeval *__tv,
struct timezone *__tz);
-extern int __gettimeofday_internal (struct timeval *__tv,
- struct timezone *__tz)
- attribute_hidden;
+libc_hidden_proto (__gettimeofday)
+libc_hidden_proto (gettimeofday)
extern int __settimeofday (const struct timeval *__tv,
const struct timezone *__tz)
attribute_hidden;
@@ -23,9 +22,5 @@
attribute_hidden;
extern int __futimes (int fd, const struct timeval tvp[2]) attribute_hidden;
-#ifndef NOT_IN_libc
-# define __gettimeofday(tv, tz) INTUSE(__gettimeofday) (tv, tz)
-#endif
-
#endif
#endif
Modified: fsf/trunk/libc/intl/dcgettext.c
==============================================================================
--- fsf/trunk/libc/intl/dcgettext.c (original)
+++ fsf/trunk/libc/intl/dcgettext.c Fri May 25 00:01:51 2012
@@ -1,5 +1,5 @@
/* Implementation of the dcgettext(3) function.
- Copyright (C) 1995-2002, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -54,7 +54,6 @@
#ifdef _LIBC
/* Alias for function name in GNU C Library. */
-INTDEF(__dcgettext)
weak_alias (__dcgettext, dcgettext);
libc_hidden_def (__dcgettext)
#endif
Modified: fsf/trunk/libc/intl/dgettext.c
==============================================================================
--- fsf/trunk/libc/intl/dgettext.c (original)
+++ fsf/trunk/libc/intl/dgettext.c Fri May 25 00:01:51 2012
@@ -1,5 +1,5 @@
/* Implementation of the dgettext(3) function.
- Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define DGETTEXT __dgettext
-# define DCGETTEXT INTUSE(__dcgettext)
+# define DCGETTEXT __dcgettext
#else
# define DGETTEXT libintl_dgettext
# define DCGETTEXT libintl_dcgettext
Modified: fsf/trunk/libc/intl/gettext.c
==============================================================================
--- fsf/trunk/libc/intl/gettext.c (original)
+++ fsf/trunk/libc/intl/gettext.c Fri May 25 00:01:51 2012
@@ -1,5 +1,5 @@
/* Implementation of gettext(3) function.
- Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -42,7 +42,7 @@
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define GETTEXT __gettext
-# define DCGETTEXT INTUSE(__dcgettext)
+# define DCGETTEXT __dcgettext
#else
# define GETTEXT libintl_gettext
# define DCGETTEXT libintl_dcgettext
Modified: fsf/trunk/libc/intl/l10nflist.c
==============================================================================
--- fsf/trunk/libc/intl/l10nflist.c (original)
+++ fsf/trunk/libc/intl/l10nflist.c Fri May 25 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2002, 2004, 2005, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxxxxxx>, 1995.
@@ -85,10 +85,6 @@
}
# undef __argz_count
# define __argz_count(argz, len) argz_count__ (argz, len)
-#else
-# ifdef _LIBC
-# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
-# endif
#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
@@ -113,11 +109,6 @@
}
# undef __argz_stringify
# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#else
-# ifdef _LIBC
-# define __argz_stringify(argz, len, sep) \
- INTUSE(__argz_stringify) (argz, len, sep)
-# endif
#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
Modified: fsf/trunk/libc/libio/__fpurge.c
==============================================================================
--- fsf/trunk/libc/libio/__fpurge.c (original)
+++ fsf/trunk/libc/libio/__fpurge.c Fri May 25 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@
{
/* Wide-char stream. */
if (_IO_in_backup (fp))
- INTUSE(_IO_free_wbackup_area) (fp);
+ _IO_free_wbackup_area (fp);
fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_read_ptr;
fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_write_base;
@@ -34,7 +34,7 @@
{
/* Byte stream. */
if (_IO_in_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
fp->_IO_read_end = fp->_IO_read_ptr;
fp->_IO_write_ptr = fp->_IO_write_base;
Modified: fsf/trunk/libc/libio/__fsetlocking.c
==============================================================================
--- fsf/trunk/libc/libio/__fsetlocking.c (original)
+++ fsf/trunk/libc/libio/__fsetlocking.c Fri May 25 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -34,4 +34,4 @@
return result;
}
-INTDEF(__fsetlocking)
+libc_hidden_def (__fsetlocking)
Modified: fsf/trunk/libc/libio/filedoalloc.c
==============================================================================
--- fsf/trunk/libc/libio/filedoalloc.c (original)
+++ fsf/trunk/libc/libio/filedoalloc.c Fri May 25 00:01:51 2012
@@ -126,7 +126,7 @@
#endif
}
ALLOC_BUF (p, size, EOF);
- INTUSE(_IO_setb) (fp, p, p + size, 1);
+ _IO_setb (fp, p, p + size, 1);
return 1;
}
-INTDEF(_IO_file_doallocate)
+libc_hidden_def (_IO_file_doallocate)
Modified: fsf/trunk/libc/libio/fileops.c
==============================================================================
--- fsf/trunk/libc/libio/fileops.c (original)
+++ fsf/trunk/libc/libio/fileops.c Fri May 25 00:01:51 2012
@@ -60,8 +60,6 @@
# define lseek(FD, Offset, Whence) __lseek (FD, Offset, Whence)
# define read(FD, Buf, NBytes) __read (FD, Buf, NBytes)
# define write(FD, Buf, NBytes) __write (FD, Buf, NBytes)
-# define _IO_do_write _IO_new_do_write /* For macro uses. */
-# define _IO_file_close_it _IO_new_file_close_it
#else
# define _IO_new_do_write _IO_do_write
# define _IO_new_file_attach _IO_file_attach
@@ -148,10 +146,10 @@
fp->file._offset = _IO_pos_BAD;
fp->file._IO_file_flags |= CLOSED_FILEBUF_FLAGS;
- INTUSE(_IO_link_in) (fp);
+ _IO_link_in (fp);
fp->file._fileno = -1;
}
-INTDEF2(_IO_new_file_init, _IO_file_init)
+libc_hidden_ver (_IO_new_file_init, _IO_file_init)
int
_IO_new_file_close_it (fp)
@@ -175,7 +173,7 @@
else
write_status = 0;
- INTUSE(_IO_unsave_markers) (fp);
+ _IO_unsave_markers (fp);
int close_status = ((fp->_flags2 & _IO_FLAGS2_NOCLOSE) == 0
? _IO_SYSCLOSE (fp) : 0);
@@ -185,24 +183,24 @@
if (fp->_mode > 0)
{
if (_IO_have_wbackup (fp))
- INTUSE(_IO_free_wbackup_area) (fp);
- INTUSE(_IO_wsetb) (fp, NULL, NULL, 0);
+ _IO_free_wbackup_area (fp);
+ _IO_wsetb (fp, NULL, NULL, 0);
_IO_wsetg (fp, NULL, NULL, NULL);
_IO_wsetp (fp, NULL, NULL);
}
#endif
- INTUSE(_IO_setb) (fp, NULL, NULL, 0);
+ _IO_setb (fp, NULL, NULL, 0);
_IO_setg (fp, NULL, NULL, NULL);
_IO_setp (fp, NULL, NULL);
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
fp->_flags = _IO_MAGIC|CLOSED_FILEBUF_FLAGS;
fp->_fileno = -1;
fp->_offset = _IO_pos_BAD;
return close_status ? close_status : write_status;
}
-INTDEF2(_IO_new_file_close_it, _IO_file_close_it)
+libc_hidden_ver (_IO_new_file_close_it, _IO_file_close_it)
void
_IO_new_file_finish (fp, dummy)
@@ -215,9 +213,9 @@
if (!(fp->_flags & _IO_DELETE_DONT_CLOSE))
_IO_SYSCLOSE (fp);
}
- INTUSE(_IO_default_finish) (fp, 0);
-}
-INTDEF2(_IO_new_file_finish, _IO_file_finish)
+ _IO_default_finish (fp, 0);
+}
+libc_hidden_ver (_IO_new_file_finish, _IO_file_finish)
_IO_FILE *
_IO_file_open (fp, filename, posix_mode, prot, read_write, is32not64)
@@ -249,7 +247,7 @@
close_not_cancel (fdesc);
return NULL;
}
- INTUSE(_IO_link_in) ((struct _IO_FILE_plus *) fp);
+ _IO_link_in ((struct _IO_FILE_plus *) fp);
return fp;
}
libc_hidden_def (_IO_file_open)
@@ -378,7 +376,7 @@
/* Something went wrong, we cannot load the conversion modules.
This means we cannot proceed since the user explicitly asked
for these. */
- (void) INTUSE(_IO_file_close_it) (fp);
+ (void) _IO_file_close_it (fp);
__set_errno (EINVAL);
return NULL;
}
@@ -431,7 +429,7 @@
return result;
}
-INTDEF2(_IO_new_file_fopen, _IO_file_fopen)
+libc_hidden_ver (_IO_new_file_fopen, _IO_file_fopen)
_IO_FILE *
_IO_new_file_attach (fp, fd)
@@ -453,7 +451,7 @@
__set_errno (save_errno);
return fp;
}
-INTDEF2(_IO_new_file_attach, _IO_file_attach)
+libc_hidden_ver (_IO_new_file_attach, _IO_file_attach)
_IO_FILE *
_IO_new_file_setbuf (fp, p, len)
@@ -470,7 +468,7 @@
return fp;
}
-INTDEF2(_IO_new_file_setbuf, _IO_file_setbuf)
+libc_hidden_ver (_IO_new_file_setbuf, _IO_file_setbuf)
_IO_FILE *
@@ -512,7 +510,7 @@
return (to_do == 0
|| (_IO_size_t) new_do_write (fp, data, to_do) == to_do) ? 0 : EOF;
}
-INTDEF2(_IO_new_do_write, _IO_do_write)
+libc_hidden_ver (_IO_new_do_write, _IO_do_write)
static
_IO_size_t
@@ -539,8 +537,7 @@
}
count = _IO_SYSWRITE (fp, data, to_do);
if (fp->_cur_column && count)
- fp->_cur_column = INTUSE(_IO_adjust_column) (fp->_cur_column - 1, data,
- count) + 1;
+ fp->_cur_column = _IO_adjust_column (fp->_cur_column - 1, data, count) + 1;
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_buf_base;
fp->_IO_write_end = (fp->_mode <= 0
@@ -577,7 +574,7 @@
free (fp->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _IO_doallocbuf (fp);
}
/* Flush all line buffered files before reading. */
@@ -585,7 +582,7 @@
if (fp->_flags & (_IO_LINE_BUF|_IO_UNBUFFERED))
{
#if 0
- INTUSE(_IO_flush_all_linebuffered) ();
+ _IO_flush_all_linebuffered ();
#else
/* We used to flush all line-buffered stream. This really isn't
required by any standard. My recollection is that
@@ -602,7 +599,7 @@
#endif
}
- INTUSE(_IO_switch_to_get_mode) (fp);
+ _IO_switch_to_get_mode (fp);
/* This is very tricky. We have to adjust those
pointers before we call _IO_SYSREAD () since
@@ -629,7 +626,7 @@
_IO_pos_adjust (fp->_offset, count);
return *(unsigned char *) fp->_IO_read_ptr;
}
-INTDEF2(_IO_new_file_underflow, _IO_file_underflow)
+libc_hidden_ver (_IO_new_file_underflow, _IO_file_underflow)
/* Guts of underflow callback if we mmap the file. This stats the file and
updates the stream state to match. In the normal case we return zero.
@@ -802,7 +799,7 @@
}
else
{
- INTUSE(_IO_setb) (fp, p, (char *) p + st.st_size, 0);
+ _IO_setb (fp, p, (char *) p + st.st_size, 0);
if (fp->_offset == _IO_pos_BAD)
fp->_offset = 0;
@@ -857,7 +854,7 @@
/* Allocate a buffer if needed. */
if (f->_IO_write_base == NULL)
{
- INTUSE(_IO_doallocbuf) (f);
+ _IO_doallocbuf (f);
_IO_setg (f, f->_IO_buf_base, f->_IO_buf_base, f->_IO_buf_base);
}
/* Otherwise must be currently reading.
@@ -870,7 +867,7 @@
if (__builtin_expect (_IO_in_backup (f), 0))
{
size_t nbackup = f->_IO_read_end - f->_IO_read_ptr;
- INTUSE(_IO_free_backup_area) (f);
+ _IO_free_backup_area (f);
f->_IO_read_base -= MIN (nbackup,
f->_IO_read_base - f->_IO_buf_base);
f->_IO_read_ptr = f->_IO_read_base;
@@ -888,20 +885,20 @@
f->_IO_write_end = f->_IO_write_ptr;
}
if (ch == EOF)
- return INTUSE(_IO_do_write) (f, f->_IO_write_base,
- f->_IO_write_ptr - f->_IO_write_base);
+ return _IO_do_write (f, f->_IO_write_base,
+ f->_IO_write_ptr - f->_IO_write_base);
if (f->_IO_write_ptr == f->_IO_buf_end ) /* Buffer is really full */
if (_IO_do_flush (f) == EOF)
return EOF;
*f->_IO_write_ptr++ = ch;
if ((f->_flags & _IO_UNBUFFERED)
|| ((f->_flags & _IO_LINE_BUF) && ch == '\n'))
- if (INTUSE(_IO_do_write) (f, f->_IO_write_base,
- f->_IO_write_ptr - f->_IO_write_base) == EOF)
+ if (_IO_do_write (f, f->_IO_write_base,
+ f->_IO_write_ptr - f->_IO_write_base) == EOF)
return EOF;
return (unsigned char) ch;
}
-INTDEF2(_IO_new_file_overflow, _IO_file_overflow)
+libc_hidden_ver (_IO_new_file_overflow, _IO_file_overflow)
int
_IO_new_file_sync (fp)
@@ -936,7 +933,7 @@
/* setg(base(), ptr, ptr); */
return retval;
}
-INTDEF2(_IO_new_file_sync, _IO_file_sync)
+libc_hidden_ver (_IO_new_file_sync, _IO_file_sync)
static int
_IO_file_sync_mmap (_IO_FILE *fp)
@@ -993,7 +990,7 @@
FIXME: simulate mem-papped files. */
if (fp->_IO_write_ptr > fp->_IO_write_base || _IO_in_put_mode (fp))
- if (INTUSE(_IO_switch_to_get_mode) (fp))
+ if (_IO_switch_to_get_mode (fp))
return EOF;
if (fp->_IO_buf_base == NULL)
@@ -1004,7 +1001,7 @@
free (fp->_IO_read_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _IO_doallocbuf (fp);
_IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
}
@@ -1112,7 +1109,7 @@
return offset;
dumb:
- INTUSE(_IO_unsave_markers) (fp);
+ _IO_unsave_markers (fp);
result = _IO_SYSSEEK (fp, offset, dir);
if (result != EOF)
{
@@ -1133,7 +1130,7 @@
return offset;
}
-INTDEF2(_IO_new_file_seekoff, _IO_file_seekoff)
+libc_hidden_ver (_IO_new_file_seekoff, _IO_file_seekoff)
_IO_off64_t
_IO_file_seekoff_mmap (fp, offset, dir, mode)
@@ -1220,7 +1217,7 @@
? read_not_cancel (fp->_fileno, buf, size)
: read (fp->_fileno, buf, size));
}
-INTDEF(_IO_file_read)
+libc_hidden_def (_IO_file_read)
_IO_off64_t
_IO_file_seek (fp, offset, dir)
@@ -1234,7 +1231,7 @@
return lseek (fp->_fileno, offset, dir);
#endif
}
-INTDEF(_IO_file_seek)
+libc_hidden_def (_IO_file_seek)
int
_IO_file_stat (fp, st)
@@ -1247,7 +1244,7 @@
return fstat (fp->_fileno, (struct stat *) st);
#endif
}
-INTDEF(_IO_file_stat)
+libc_hidden_def (_IO_file_stat)
int
_IO_file_close_mmap (fp)
@@ -1269,7 +1266,7 @@
unrecoverable state behind. */
return close_not_cancel (fp->_fileno);
}
-INTDEF(_IO_file_close)
+libc_hidden_def (_IO_file_close)
_IO_ssize_t
_IO_new_file_write (f, data, n)
@@ -1376,11 +1373,11 @@
buffer, but it's somewhat messier for line-buffered files,
so we let _IO_default_xsputn handle the general case. */
if (to_do)
- to_do -= INTUSE(_IO_default_xsputn) (f, s+do_write, to_do);
+ to_do -= _IO_default_xsputn (f, s+do_write, to_do);
}
return n - to_do;
}
-INTDEF2(_IO_new_file_xsputn, _IO_file_xsputn)
+libc_hidden_ver (_IO_new_file_xsputn, _IO_file_xsputn)
_IO_size_t
_IO_file_xsgetn (fp, data, n)
@@ -1402,7 +1399,7 @@
free (fp->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _IO_doallocbuf (fp);
}
while (want > 0)
@@ -1481,7 +1478,7 @@
return n - want;
}
-INTDEF(_IO_file_xsgetn)
+libc_hidden_def (_IO_file_xsgetn)
static _IO_size_t _IO_file_xsgetn_mmap (_IO_FILE *, void *, _IO_size_t);
static _IO_size_t
@@ -1557,8 +1554,6 @@
}
#ifdef _LIBC
-# undef _IO_do_write
-# undef _IO_file_close_it
versioned_symbol (libc, _IO_new_do_write, _IO_do_write, GLIBC_2_1);
versioned_symbol (libc, _IO_new_file_attach, _IO_file_attach, GLIBC_2_1);
versioned_symbol (libc, _IO_new_file_close_it, _IO_file_close_it, GLIBC_2_1);
@@ -1577,23 +1572,23 @@
const struct _IO_jump_t _IO_file_jumps =
{
JUMP_INIT_DUMMY,
- JUMP_INIT(finish, INTUSE(_IO_file_finish)),
- JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
- JUMP_INIT(underflow, INTUSE(_IO_file_underflow)),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_file_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_file_xsgetn)),
+ JUMP_INIT(finish, _IO_file_finish),
+ JUMP_INIT(overflow, _IO_file_overflow),
+ JUMP_INIT(underflow, _IO_file_underflow),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
+ JUMP_INIT(xsputn, _IO_file_xsputn),
+ JUMP_INIT(xsgetn, _IO_file_xsgetn),
JUMP_INIT(seekoff, _IO_new_file_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_new_file_setbuf),
JUMP_INIT(sync, _IO_new_file_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
- JUMP_INIT(close, INTUSE(_IO_file_close)),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(seek, _IO_file_seek),
+ JUMP_INIT(close, _IO_file_close),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
@@ -1602,23 +1597,23 @@
const struct _IO_jump_t _IO_file_jumps_mmap =
{
JUMP_INIT_DUMMY,
- JUMP_INIT(finish, INTUSE(_IO_file_finish)),
- JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
+ JUMP_INIT(finish, _IO_file_finish),
+ JUMP_INIT(overflow, _IO_file_overflow),
JUMP_INIT(underflow, _IO_file_underflow_mmap),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
JUMP_INIT(xsputn, _IO_new_file_xsputn),
JUMP_INIT(xsgetn, _IO_file_xsgetn_mmap),
JUMP_INIT(seekoff, _IO_file_seekoff_mmap),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, (_IO_setbuf_t) _IO_file_setbuf_mmap),
JUMP_INIT(sync, _IO_file_sync_mmap),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
+ JUMP_INIT(seek, _IO_file_seek),
JUMP_INIT(close, _IO_file_close_mmap),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
@@ -1626,23 +1621,23 @@
const struct _IO_jump_t _IO_file_jumps_maybe_mmap =
{
JUMP_INIT_DUMMY,
- JUMP_INIT(finish, INTUSE(_IO_file_finish)),
- JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
+ JUMP_INIT(finish, _IO_file_finish),
+ JUMP_INIT(overflow, _IO_file_overflow),
JUMP_INIT(underflow, _IO_file_underflow_maybe_mmap),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
JUMP_INIT(xsputn, _IO_new_file_xsputn),
JUMP_INIT(xsgetn, _IO_file_xsgetn_maybe_mmap),
JUMP_INIT(seekoff, _IO_file_seekoff_maybe_mmap),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, (_IO_setbuf_t) _IO_file_setbuf_mmap),
JUMP_INIT(sync, _IO_new_file_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
+ JUMP_INIT(seek, _IO_file_seek),
JUMP_INIT(close, _IO_file_close),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
Modified: fsf/trunk/libc/libio/freopen.c
==============================================================================
--- fsf/trunk/libc/libio/freopen.c (original)
+++ fsf/trunk/libc/libio/freopen.c Fri May 25 00:01:51 2012
@@ -65,11 +65,11 @@
else
#endif
{
- INTUSE(_IO_file_close_it) (fp);
+ _IO_file_close_it (fp);
_IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps;
if (_IO_vtable_offset (fp) == 0 && fp->_wide_data != NULL)
fp->_wide_data->_wide_vtable = &_IO_wfile_jumps;
- result = INTUSE(_IO_file_fopen) (fp, gfilename, mode, 1);
+ result = _IO_file_fopen (fp, gfilename, mode, 1);
if (result != NULL)
result = __fopen_maybe_mmap (result);
}
Modified: fsf/trunk/libc/libio/freopen64.c
==============================================================================
--- fsf/trunk/libc/libio/freopen64.c (original)
+++ fsf/trunk/libc/libio/freopen64.c Fri May 25 00:01:51 2012
@@ -50,11 +50,11 @@
const char *gfilename = (filename == NULL && fd >= 0
? fd_to_filename (fd) : filename);
fp->_flags2 |= _IO_FLAGS2_NOCLOSE;
- INTUSE(_IO_file_close_it) (fp);
+ _IO_file_close_it (fp);
_IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps;
if (_IO_vtable_offset (fp) == 0 && fp->_wide_data != NULL)
fp->_wide_data->_wide_vtable = &_IO_wfile_jumps;
- result = INTUSE(_IO_file_fopen) (fp, gfilename, mode, 0);
+ result = _IO_file_fopen (fp, gfilename, mode, 0);
fp->_flags2 &= ~_IO_FLAGS2_NOCLOSE;
if (result != NULL)
result = __fopen_maybe_mmap (result);
Modified: fsf/trunk/libc/libio/genops.c
==============================================================================
--- fsf/trunk/libc/libio/genops.c (original)
+++ fsf/trunk/libc/libio/genops.c Fri May 25 00:01:51 2012
@@ -68,16 +68,15 @@
run_fp = (_IO_FILE *) fp;
_IO_flockfile ((_IO_FILE *) fp);
#endif
- if (INTUSE(_IO_list_all) == NULL)
+ if (_IO_list_all == NULL)
;
- else if (fp == INTUSE(_IO_list_all))
+ else if (fp == _IO_list_all)
{
- INTUSE(_IO_list_all)
- = (struct _IO_FILE_plus *) INTUSE(_IO_list_all)->file._chain;
+ _IO_list_all = (struct _IO_FILE_plus *) _IO_list_all->file._chain;
++_IO_list_all_stamp;
}
else
- for (f = &INTUSE(_IO_list_all)->file._chain; *f; f = &(*f)->_chain)
+ for (f = &_IO_list_all->file._chain; *f; f = &(*f)->_chain)
if (*f == (_IO_FILE *) fp)
{
*f = fp->file._chain;
@@ -93,7 +92,7 @@
#endif
}
}
-INTDEF(_IO_un_link)
+libc_hidden_def (_IO_un_link)
void
_IO_link_in (fp)
@@ -108,8 +107,8 @@
run_fp = (_IO_FILE *) fp;
_IO_flockfile ((_IO_FILE *) fp);
#endif
- fp->file._chain = (_IO_FILE *) INTUSE(_IO_list_all);
- INTUSE(_IO_list_all) = fp;
+ fp->file._chain = (_IO_FILE *) _IO_list_all;
+ _IO_list_all = fp;
++_IO_list_all_stamp;
#ifdef _IO_MTSAFE_IO
_IO_funlockfile ((_IO_FILE *) fp);
@@ -119,7 +118,7 @@
#endif
}
}
-INTDEF(_IO_link_in)
+libc_hidden_def (_IO_link_in)
/* Return minimum _pos markers
Assumes the current get area is the main get area. */
@@ -200,7 +199,7 @@
fp->_flags &= ~_IO_CURRENTLY_PUTTING;
return 0;
}
-INTDEF(_IO_switch_to_get_mode)
+libc_hidden_def (_IO_switch_to_get_mode)
void
_IO_free_backup_area (fp)
@@ -213,7 +212,7 @@
fp->_IO_save_end = NULL;
fp->_IO_backup_base = NULL;
}
-INTDEF(_IO_free_backup_area)
+libc_hidden_def (_IO_free_backup_area)
#if 0
int
@@ -338,7 +337,7 @@
if (fp->_mode == 0)
_IO_fwide (fp, -1);
if (_IO_in_put_mode (fp))
- if (INTUSE(_IO_switch_to_get_mode) (fp) == EOF)
+ if (_IO_switch_to_get_mode (fp) == EOF)
return EOF;
if (fp->_IO_read_ptr < fp->_IO_read_end)
return *(unsigned char *) fp->_IO_read_ptr;
@@ -354,7 +353,7 @@
return EOF;
}
else if (_IO_have_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
return _IO_UNDERFLOW (fp);
}
libc_hidden_def (__underflow)
@@ -371,7 +370,7 @@
if (fp->_mode == 0)
_IO_fwide (fp, -1);
if (_IO_in_put_mode (fp))
- if (INTUSE(_IO_switch_to_get_mode) (fp) == EOF)
+ if (_IO_switch_to_get_mode (fp) == EOF)
return EOF;
if (fp->_IO_read_ptr < fp->_IO_read_end)
return *(unsigned char *) fp->_IO_read_ptr++;
@@ -387,7 +386,7 @@
return EOF;
}
else if (_IO_have_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
return _IO_UFLOW (fp);
}
libc_hidden_def (__uflow)
@@ -408,7 +407,7 @@
else
f->_flags |= _IO_USER_BUF;
}
-INTDEF(_IO_setb)
+libc_hidden_def (_IO_setb)
void
_IO_doallocbuf (fp)
@@ -419,9 +418,9 @@
if (!(fp->_flags & _IO_UNBUFFERED) || fp->_mode > 0)
if (_IO_DOALLOCATE (fp) != EOF)
return;
- INTUSE(_IO_setb) (fp, fp->_shortbuf, fp->_shortbuf+1, 0);
-}
-INTDEF(_IO_doallocbuf)
+ _IO_setb (fp, fp->_shortbuf, fp->_shortbuf+1, 0);
+}
+libc_hidden_def (_IO_doallocbuf)
int
_IO_default_underflow (fp)
@@ -439,7 +438,7 @@
return EOF;
return *(unsigned char *) fp->_IO_read_ptr++;
}
-INTDEF(_IO_default_uflow)
+libc_hidden_def (_IO_default_uflow)
_IO_size_t
_IO_default_xsputn (f, data, n)
@@ -485,7 +484,7 @@
}
return n - more;
}
-INTDEF(_IO_default_xsputn)
+libc_hidden_def (_IO_default_xsputn)
_IO_size_t
_IO_sgetn (fp, data, n)
@@ -496,7 +495,7 @@
/* FIXME handle putback buffer here! */
return _IO_XSGETN (fp, data, n);
}
-INTDEF(_IO_sgetn)
+libc_hidden_def (_IO_sgetn)
_IO_size_t
_IO_default_xsgetn (fp, data, n)
@@ -539,7 +538,7 @@
}
return n - more;
}
-INTDEF(_IO_default_xsgetn)
+libc_hidden_def (_IO_default_xsgetn)
#if 0
/* Seems not to be needed. --drepper */
@@ -562,12 +561,12 @@
if (p == NULL || len == 0)
{
fp->_flags |= _IO_UNBUFFERED;
- INTUSE(_IO_setb) (fp, fp->_shortbuf, fp->_shortbuf+1, 0);
+ _IO_setb (fp, fp->_shortbuf, fp->_shortbuf+1, 0);
}
else
{
fp->_flags &= ~_IO_UNBUFFERED;
- INTUSE(_IO_setb) (fp, p, p+len, 0);
+ _IO_setb (fp, p, p+len, 0);
}
fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_write_end = 0;
fp->_IO_read_base = fp->_IO_read_ptr = fp->_IO_read_end = 0;
@@ -590,10 +589,10 @@
char *buf;
ALLOC_BUF (buf, _IO_BUFSIZ, EOF);
- INTUSE(_IO_setb) (fp, buf, buf+_IO_BUFSIZ, 1);
+ _IO_setb (fp, buf, buf+_IO_BUFSIZ, 1);
return 1;
}
-INTDEF(_IO_default_doallocate)
+libc_hidden_def (_IO_default_doallocate)
void
_IO_init (fp, flags)
@@ -602,7 +601,7 @@
{
_IO_no_init (fp, flags, -1, NULL, NULL);
}
-INTDEF(_IO_init)
+libc_hidden_def (_IO_init)
void
_IO_old_init (fp, flags)
@@ -698,14 +697,14 @@
fp->_IO_save_base = NULL;
}
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
#ifdef _IO_MTSAFE_IO
if (fp->_lock != NULL)
_IO_lock_fini (*fp->_lock);
#endif
}
-INTDEF(_IO_default_finish)
+libc_hidden_def (_IO_default_finish)
_IO_off64_t
_IO_default_seekoff (fp, offset, dir, mode)
@@ -738,7 +737,7 @@
return result;
}
-INTDEF(_IO_sputbackc)
+libc_hidden_def (_IO_sputbackc)
int
_IO_sungetc (fp)
@@ -798,7 +797,7 @@
return line + count - ptr - 1;
return start + count;
}
-INTDEF(_IO_adjust_column)
+libc_hidden_def (_IO_adjust_column)
#if 0
/* Seems not to be needed. --drepper */
@@ -829,7 +828,7 @@
#endif
last_stamp = _IO_list_all_stamp;
- fp = (_IO_FILE *) INTUSE(_IO_list_all);
+ fp = (_IO_FILE *) _IO_list_all;
while (fp != NULL)
{
run_fp = fp;
@@ -853,7 +852,7 @@
if (last_stamp != _IO_list_all_stamp)
{
/* Something was added to the list. Start all over again. */
- fp = (_IO_FILE *) INTUSE(_IO_list_all);
+ fp = (_IO_FILE *) _IO_list_all;
last_stamp = _IO_list_all_stamp;
}
else
@@ -876,7 +875,7 @@
/* We want locking. */
return _IO_flush_all_lockp (1);
}
-INTDEF(_IO_flush_all)
+libc_hidden_def (_IO_flush_all)
void
_IO_flush_all_linebuffered ()
@@ -890,7 +889,7 @@
#endif
last_stamp = _IO_list_all_stamp;
- fp = (_IO_FILE *) INTUSE(_IO_list_all);
+ fp = (_IO_FILE *) _IO_list_all;
while (fp != NULL)
{
run_fp = fp;
@@ -905,7 +904,7 @@
if (last_stamp != _IO_list_all_stamp)
{
/* Something was added to the list. Start all over again. */
- fp = (_IO_FILE *) INTUSE(_IO_list_all);
+ fp = (_IO_FILE *) _IO_list_all;
last_stamp = _IO_list_all_stamp;
}
else
@@ -917,7 +916,7 @@
_IO_cleanup_region_end (0);
#endif
}
-INTDEF(_IO_flush_all_linebuffered)
+libc_hidden_def (_IO_flush_all_linebuffered)
#ifdef _LIBC
weak_alias (_IO_flush_all_linebuffered, _flushlbf)
#endif
@@ -945,7 +944,7 @@
_IO_unbuffer_write (void)
{
struct _IO_FILE *fp;
- for (fp = (_IO_FILE *) INTUSE(_IO_list_all); fp; fp = fp->_chain)
+ for (fp = (_IO_FILE *) _IO_list_all; fp; fp = fp->_chain)
{
if (! (fp->_flags & _IO_UNBUFFERED)
&& (! (fp->_flags & _IO_NO_WRITES)
@@ -1026,7 +1025,7 @@
{
marker->_sbuf = fp;
if (_IO_in_put_mode (fp))
- INTUSE(_IO_switch_to_get_mode) (fp);
+ _IO_switch_to_get_mode (fp);
if (_IO_in_backup (fp))
marker->_pos = fp->_IO_read_ptr - fp->_IO_read_end;
else
@@ -1132,9 +1131,9 @@
}
if (_IO_have_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
-}
-INTDEF(_IO_unsave_markers)
+ _IO_free_backup_area (fp);
+}
+libc_hidden_def (_IO_unsave_markers)
#if 0
/* Seems not to be needed. --drepper */
@@ -1208,7 +1207,7 @@
}
return (unsigned char) c;
}
-INTDEF(_IO_default_pbackfail)
+libc_hidden_def (_IO_default_pbackfail)
_IO_off64_t
_IO_default_seek (fp, offset, dir)
@@ -1262,7 +1261,7 @@
_IO_ITER
_IO_iter_begin()
{
- return (_IO_ITER) INTUSE(_IO_list_all);
+ return (_IO_ITER) _IO_list_all;
}
libc_hidden_def (_IO_iter_begin)
Modified: fsf/trunk/libc/libio/iofclose.c
==============================================================================
--- fsf/trunk/libc/libio/iofclose.c (original)
+++ fsf/trunk/libc/libio/iofclose.c Fri May 25 00:01:51 2012
@@ -52,11 +52,11 @@
/* First unlink the stream. */
if (fp->_IO_file_flags & _IO_IS_FILEBUF)
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
_IO_acquire_lock (fp);
if (fp->_IO_file_flags & _IO_IS_FILEBUF)
- status = INTUSE(_IO_file_close_it) (fp);
+ status = _IO_file_close_it (fp);
else
status = fp->_flags & _IO_ERR_SEEN ? -1 : 0;
_IO_release_lock (fp);
@@ -77,7 +77,7 @@
else
{
if (_IO_have_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
}
if (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr)
{
Modified: fsf/trunk/libc/libio/iofdopen.c
==============================================================================
--- fsf/trunk/libc/libio/iofdopen.c (original)
+++ fsf/trunk/libc/libio/iofdopen.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,1994,1997,1998,1999,2000,2002,2003,2010,2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -156,14 +155,14 @@
(use_mmap && (read_write & _IO_NO_WRITES)) ? &_IO_file_jumps_maybe_mmap :
#endif
&_IO_file_jumps;
- INTUSE(_IO_file_init) (&new_f->fp);
+ _IO_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
- if (INTUSE(_IO_file_attach) ((_IO_FILE *) &new_f->fp, fd) == NULL)
+ if (_IO_file_attach ((_IO_FILE *) &new_f->fp, fd) == NULL)
{
- INTUSE(_IO_setb) (&new_f->fp.file, NULL, NULL, 0);
- INTUSE(_IO_un_link) (&new_f->fp);
+ _IO_setb (&new_f->fp.file, NULL, NULL, 0);
+ _IO_un_link (&new_f->fp);
free (new_f);
return NULL;
}
@@ -174,7 +173,7 @@
return &new_f->fp.file;
}
-INTDEF2(_IO_new_fdopen, _IO_fdopen)
+libc_hidden_ver (_IO_new_fdopen, _IO_fdopen)
strong_alias (_IO_new_fdopen, __new_fdopen)
versioned_symbol (libc, _IO_new_fdopen, _IO_fdopen, GLIBC_2_1);
Modified: fsf/trunk/libc/libio/iofflush.c
==============================================================================
--- fsf/trunk/libc/libio/iofflush.c (original)
+++ fsf/trunk/libc/libio/iofflush.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -33,7 +32,7 @@
_IO_FILE *fp;
{
if (fp == NULL)
- return INTUSE(_IO_flush_all) ();
+ return _IO_flush_all ();
else
{
int result;
@@ -44,7 +43,7 @@
return result;
}
}
-INTDEF(_IO_fflush)
+libc_hidden_def (_IO_fflush)
#ifdef weak_alias
weak_alias (_IO_fflush, fflush)
Modified: fsf/trunk/libc/libio/iofflush_u.c
==============================================================================
--- fsf/trunk/libc/libio/iofflush_u.c (original)
+++ fsf/trunk/libc/libio/iofflush_u.c Fri May 25 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -32,7 +32,7 @@
_IO_FILE *fp;
{
if (fp == NULL)
- return INTUSE(_IO_flush_all) ();
+ return _IO_flush_all ();
else
{
CHECK_FILE (fp, EOF);
Modified: fsf/trunk/libc/libio/iofgets.c
==============================================================================
--- fsf/trunk/libc/libio/iofgets.c (original)
+++ fsf/trunk/libc/libio/iofgets.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2005
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -54,7 +53,7 @@
case. We return an error only when there is a new error. */
old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
fp->_IO_file_flags &= ~_IO_ERR_SEEN;
- count = INTUSE(_IO_getline) (fp, buf, n - 1, '\n', 1);
+ count = _IO_getline (fp, buf, n - 1, '\n', 1);
/* If we read in some bytes and errno is EAGAIN, that error will
be reported for next read. */
if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
Modified: fsf/trunk/libc/libio/iofgets_u.c
==============================================================================
--- fsf/trunk/libc/libio/iofgets_u.c (original)
+++ fsf/trunk/libc/libio/iofgets_u.c Fri May 25 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1995-1998,2002,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -52,7 +52,7 @@
case. We return an error only when there is a new error. */
old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
fp->_IO_file_flags &= ~_IO_ERR_SEEN;
- count = INTUSE(_IO_getline) (fp, buf, n - 1, '\n', 1);
+ count = _IO_getline (fp, buf, n - 1, '\n', 1);
/* If we read in some bytes and errno is EAGAIN, that error will
be reported for next read. */
if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
Modified: fsf/trunk/libc/libio/iofopen.c
==============================================================================
--- fsf/trunk/libc/libio/iofopen.c (original)
+++ fsf/trunk/libc/libio/iofopen.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,1997,1998,1999,2000,2002,2003,2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -83,15 +82,14 @@
_IO_no_init (&new_f->fp.file, 1, 0, NULL, NULL);
#endif
_IO_JUMPS (&new_f->fp) = &_IO_file_jumps;
- INTUSE(_IO_file_init) (&new_f->fp);
+ _IO_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
- if (INTUSE(_IO_file_fopen) ((_IO_FILE *) new_f, filename, mode, is32)
- != NULL)
+ if (_IO_file_fopen ((_IO_FILE *) new_f, filename, mode, is32) != NULL)
return __fopen_maybe_mmap (&new_f->fp.file);
- INTUSE(_IO_un_link) (&new_f->fp);
+ _IO_un_link (&new_f->fp);
free (new_f);
return NULL;
}
Modified: fsf/trunk/libc/libio/iofopncook.c
==============================================================================
--- fsf/trunk/libc/libio/iofopncook.c (original)
+++ fsf/trunk/libc/libio/iofopncook.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,95,97,99,2000,2002,2004, 2005, 2010
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -113,24 +112,24 @@
/* We must force the fileops code to always use seek to determine
the position. */
fp->_offset = _IO_pos_BAD;
- return INTUSE(_IO_file_seekoff) (fp, offset, dir, mode);
+ return _IO_file_seekoff (fp, offset, dir, mode);
}
static const struct _IO_jump_t _IO_cookie_jumps = {
JUMP_INIT_DUMMY,
- JUMP_INIT(finish, INTUSE(_IO_file_finish)),
- JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
- JUMP_INIT(underflow, INTUSE(_IO_file_underflow)),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_file_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
+ JUMP_INIT(finish, _IO_file_finish),
+ JUMP_INIT(overflow, _IO_file_overflow),
+ JUMP_INIT(underflow, _IO_file_underflow),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
+ JUMP_INIT(xsputn, _IO_file_xsputn),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
JUMP_INIT(seekoff, _IO_cookie_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
- JUMP_INIT(setbuf, INTUSE(_IO_file_setbuf)),
- JUMP_INIT(sync, INTUSE(_IO_file_sync)),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
+ JUMP_INIT(setbuf, _IO_file_setbuf),
+ JUMP_INIT(sync, _IO_file_sync),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
JUMP_INIT(read, _IO_cookie_read),
JUMP_INIT(write, _IO_cookie_write),
JUMP_INIT(seek, _IO_cookie_seek),
@@ -145,13 +144,13 @@
_IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,
void *cookie, _IO_cookie_io_functions_t io_functions)
{
- INTUSE(_IO_init) (&cfile->__fp.file, 0);
+ _IO_init (&cfile->__fp.file, 0);
_IO_JUMPS (&cfile->__fp) = &_IO_cookie_jumps;
cfile->__cookie = cookie;
cfile->__io_functions = io_functions;
- INTUSE(_IO_file_init) (&cfile->__fp);
+ _IO_file_init (&cfile->__fp);
_IO_mask_flags (&cfile->__fp.file, read_write,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
@@ -238,18 +237,18 @@
static const struct _IO_jump_t _IO_old_cookie_jumps = {
JUMP_INIT_DUMMY,
- JUMP_INIT(finish, INTUSE(_IO_file_finish)),
- JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
- JUMP_INIT(underflow, INTUSE(_IO_file_underflow)),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_file_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
+ JUMP_INIT(finish, _IO_file_finish),
+ JUMP_INIT(overflow, _IO_file_overflow),
+ JUMP_INIT(underflow, _IO_file_underflow),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
+ JUMP_INIT(xsputn, _IO_file_xsputn),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
JUMP_INIT(seekoff, _IO_cookie_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
- JUMP_INIT(setbuf, INTUSE(_IO_file_setbuf)),
- JUMP_INIT(sync, INTUSE(_IO_file_sync)),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
+ JUMP_INIT(setbuf, _IO_file_setbuf),
+ JUMP_INIT(sync, _IO_file_sync),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
JUMP_INIT(read, _IO_cookie_read),
JUMP_INIT(write, _IO_cookie_write),
JUMP_INIT(seek, _IO_old_cookie_seek),
Modified: fsf/trunk/libc/libio/iofread.c
==============================================================================
--- fsf/trunk/libc/libio/iofread.c (original)
+++ fsf/trunk/libc/libio/iofread.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -40,11 +39,11 @@
if (bytes_requested == 0)
return 0;
_IO_acquire_lock (fp);
- bytes_read = INTUSE(_IO_sgetn) (fp, (char *) buf, bytes_requested);
+ bytes_read = _IO_sgetn (fp, (char *) buf, bytes_requested);
_IO_release_lock (fp);
return bytes_requested == bytes_read ? count : bytes_read / size;
}
-INTDEF(_IO_fread)
+libc_hidden_def (_IO_fread)
#ifdef weak_alias
weak_alias (_IO_fread, fread)
Modified: fsf/trunk/libc/libio/iofread_u.c
==============================================================================
--- fsf/trunk/libc/libio/iofread_u.c (original)
+++ fsf/trunk/libc/libio/iofread_u.c Fri May 25 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -41,7 +41,7 @@
CHECK_FILE (fp, 0);
if (bytes_requested == 0)
return 0;
- bytes_read = INTUSE(_IO_sgetn) (fp, (char *) buf, bytes_requested);
+ bytes_read = _IO_sgetn (fp, (char *) buf, bytes_requested);
return bytes_requested == bytes_read ? count : bytes_read / size;
}
libc_hidden_def (fread_unlocked)
Modified: fsf/trunk/libc/libio/ioftell.c
==============================================================================
--- fsf/trunk/libc/libio/ioftell.c (original)
+++ fsf/trunk/libc/libio/ioftell.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995-2000, 2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -61,7 +60,7 @@
}
return pos;
}
-INTDEF(_IO_ftell)
+libc_hidden_def (_IO_ftell)
#ifdef weak_alias
weak_alias (_IO_ftell, ftell)
Modified: fsf/trunk/libc/libio/iofwrite.c
==============================================================================
--- fsf/trunk/libc/libio/iofwrite.c (original)
+++ fsf/trunk/libc/libio/iofwrite.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2008
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -52,7 +51,7 @@
else
return written / size;
}
-INTDEF(_IO_fwrite)
+libc_hidden_def (_IO_fwrite)
#ifdef weak_alias
# include <stdio.h>
Modified: fsf/trunk/libc/libio/iogetline.c
==============================================================================
--- fsf/trunk/libc/libio/iogetline.c (original)
+++ fsf/trunk/libc/libio/iogetline.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,1997,1998,2000,2001,2002,2005
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -38,10 +37,9 @@
int delim;
int extract_delim;
{
- return INTUSE(_IO_getline_info) (fp, buf, n, delim, extract_delim,
- (int *) 0);
+ return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0);
}
-INTDEF(_IO_getline)
+libc_hidden_def (_IO_getline)
/* Algorithm based on that used by Berkeley pre-4.4 fgets implementation.
@@ -82,7 +80,7 @@
if (extract_delim > 0)
*ptr++ = c;
else if (extract_delim < 0)
- INTUSE(_IO_sputbackc) (fp, c);
+ _IO_sputbackc (fp, c);
if (extract_delim > 0)
++len;
return ptr - buf;
@@ -118,6 +116,6 @@
}
return ptr - buf;
}
-INTDEF(_IO_getline_info)
+libc_hidden_def (_IO_getline_info)
#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */
Modified: fsf/trunk/libc/libio/iogets.c
==============================================================================
--- fsf/trunk/libc/libio/iogets.c (original)
+++ fsf/trunk/libc/libio/iogets.c Fri May 25 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1996,1997,1998,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -52,7 +52,7 @@
int old_error = _IO_stdin->_IO_file_flags & _IO_ERR_SEEN;
_IO_stdin->_IO_file_flags &= ~_IO_ERR_SEEN;
buf[0] = (char) ch;
- count = INTUSE(_IO_getline) (_IO_stdin, buf + 1, INT_MAX, '\n', 0) + 1;
+ count = _IO_getline (_IO_stdin, buf + 1, INT_MAX, '\n', 0) + 1;
if (_IO_stdin->_IO_file_flags & _IO_ERR_SEEN)
{
retval = NULL;
Modified: fsf/trunk/libc/libio/iogetwline.c
==============================================================================
--- fsf/trunk/libc/libio/iogetwline.c (original)
+++ fsf/trunk/libc/libio/iogetwline.c Fri May 25 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1997-2000,2002,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -85,7 +85,7 @@
if (extract_delim > 0)
*ptr++ = wc;
else if (extract_delim < 0)
- INTUSE(_IO_sputbackc) (fp, wc);
+ _IO_sputbackc (fp, wc);
if (extract_delim > 0)
++len;
return ptr - buf;
Modified: fsf/trunk/libc/libio/iolibio.h
==============================================================================
--- fsf/trunk/libc/libio/iolibio.h (original)
+++ fsf/trunk/libc/libio/iolibio.h Fri May 25 00:01:51 2012
@@ -11,9 +11,11 @@
extern int _IO_new_fclose (_IO_FILE*);
extern int _IO_old_fclose (_IO_FILE*);
extern _IO_FILE *_IO_fdopen (int, const char*) __THROW;
+libc_hidden_proto (_IO_fdopen)
extern _IO_FILE *_IO_old_fdopen (int, const char*) __THROW;
extern _IO_FILE *_IO_new_fdopen (int, const char*) __THROW;
extern int _IO_fflush (_IO_FILE*);
+libc_hidden_proto (_IO_fflush)
extern int _IO_fgetpos (_IO_FILE*, _IO_fpos_t*);
extern int _IO_fgetpos64 (_IO_FILE*, _IO_fpos64_t*);
extern char* _IO_fgets (char*, int, _IO_FILE*);
@@ -29,20 +31,26 @@
extern int _IO_fsetpos (_IO_FILE*, const _IO_fpos_t *);
extern int _IO_fsetpos64 (_IO_FILE*, const _IO_fpos64_t *);
extern long int _IO_ftell (_IO_FILE*);
+libc_hidden_proto (_IO_ftell)
extern _IO_size_t _IO_fread (void*, _IO_size_t, _IO_size_t, _IO_FILE*);
+libc_hidden_proto (_IO_fread)
extern _IO_size_t _IO_fwrite (const void*, _IO_size_t, _IO_size_t, _IO_FILE*);
+libc_hidden_proto (_IO_fwrite)
extern char* _IO_gets (char*);
extern void _IO_perror (const char*) __THROW;
extern int _IO_printf (const char*, ...);
extern int _IO_puts (const char*);
extern int _IO_scanf (const char*, ...);
extern void _IO_setbuffer (_IO_FILE *, char*, _IO_size_t) __THROW;
+libc_hidden_proto (_IO_setbuffer)
extern int _IO_setvbuf (_IO_FILE*, char*, int, _IO_size_t) __THROW;
+libc_hidden_proto (_IO_setvbuf)
extern int _IO_sscanf (const char*, const char*, ...) __THROW;
extern int _IO_sprintf (char *, const char*, ...) __THROW;
extern int _IO_ungetc (int, _IO_FILE*) __THROW;
extern int _IO_vsscanf (const char *, const char *, _IO_va_list) __THROW;
extern int _IO_vsprintf (char*, const char*, _IO_va_list) __THROW;
+libc_hidden_proto (_IO_vsprintf)
extern int _IO_vswprintf (wchar_t*, _IO_size_t, const wchar_t*, _IO_va_list)
__THROW;
@@ -60,15 +68,15 @@
#define _IO_rewind(FILE) \
(void) _IO_seekoff_unlocked (FILE, 0, 0, _IOS_INPUT|_IOS_OUTPUT)
#define _IO_vprintf(FORMAT, ARGS) \
- INTUSE(_IO_vfprintf) (_IO_stdout, FORMAT, ARGS)
+ _IO_vfprintf (_IO_stdout, FORMAT, ARGS)
#define _IO_freopen(FILENAME, MODE, FP) \
- (INTUSE(_IO_file_close_it)(FP), \
- INTUSE(_IO_file_fopen)(FP, FILENAME, MODE, 1))
+ (_IO_file_close_it (FP), \
+ _IO_file_fopen (FP, FILENAME, MODE, 1))
#define _IO_old_freopen(FILENAME, MODE, FP) \
(_IO_old_file_close_it (FP), _IO_old_file_fopen(FP, FILENAME, MODE))
#define _IO_freopen64(FILENAME, MODE, FP) \
- (INTUSE(_IO_file_close_it)(FP), \
- INTUSE(_IO_file_fopen)(FP, FILENAME, MODE, 0))
+ (_IO_file_close_it (FP), \
+ _IO_file_fopen (FP, FILENAME, MODE, 0))
#define _IO_fileno(FP) ((FP)->_fileno)
extern _IO_FILE* _IO_popen (const char*, const char*) __THROW;
extern _IO_FILE* _IO_new_popen (const char*, const char*) __THROW;
@@ -76,25 +84,12 @@
extern int __new_pclose (_IO_FILE *) __THROW;
extern int __old_pclose (_IO_FILE *) __THROW;
#define _IO_pclose _IO_fclose
-#define _IO_setbuf(_FP, _BUF) INTUSE(_IO_setbuffer)(_FP, _BUF, _IO_BUFSIZ)
-#define _IO_setlinebuf(_FP) INTUSE(_IO_setvbuf)(_FP, NULL, 1, 0)
+#define _IO_setbuf(_FP, _BUF) _IO_setbuffer (_FP, _BUF, _IO_BUFSIZ)
+#define _IO_setlinebuf(_FP) _IO_setvbuf (_FP, NULL, 1, 0)
_IO_FILE *__new_freopen (const char *, const char *, _IO_FILE *) __THROW;
_IO_FILE *__old_freopen (const char *, const char *, _IO_FILE *) __THROW;
-/* Prototype for functions with alternative entry point. */
-extern void _IO_setbuffer_internal (_IO_FILE *, char*, _IO_size_t) __THROW;
-extern _IO_size_t _IO_fread_internal (void*, _IO_size_t, _IO_size_t, _IO_FILE*)
- __THROW;
-extern _IO_FILE *_IO_fdopen_internal (int, const char*) __THROW;
-extern int _IO_vsprintf_internal (char*, const char*, _IO_va_list) __THROW;
-extern int _IO_fflush_internal (_IO_FILE*);
-extern _IO_size_t _IO_fwrite_internal (const void*, _IO_size_t,
- _IO_size_t, _IO_FILE*);
-extern long int _IO_ftell_internal (_IO_FILE*);
-extern int _IO_fputs_internal (const char*, _IO_FILE*);
-extern int _IO_setvbuf_internal (_IO_FILE*, char*, int, _IO_size_t) __THROW;
-
#ifdef __cplusplus
}
#endif
Modified: fsf/trunk/libc/libio/iopadn.c
==============================================================================
--- fsf/trunk/libc/libio/iopadn.c (original)
+++ fsf/trunk/libc/libio/iopadn.c Fri May 25 00:01:51 2012
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -69,4 +69,4 @@
}
return written;
}
-INTDEF(_IO_padn)
+libc_hidden_def (_IO_padn)
Modified: fsf/trunk/libc/libio/iopopen.c
==============================================================================
--- fsf/trunk/libc/libio/iopopen.c (original)
+++ fsf/trunk/libc/libio/iopopen.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1997-2002, 2003, 2004, 2007, 2008, 2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Per Bothner <bothner@xxxxxxxxxx>.
@@ -300,7 +299,7 @@
new_f->fpx.file.file._lock = &new_f->lock;
#endif
fp = &new_f->fpx.file.file;
- INTUSE(_IO_init) (fp, 0);
+ _IO_init (fp, 0);
_IO_JUMPS (&new_f->fpx.file) = &_IO_proc_jumps;
_IO_new_file_init (&new_f->fpx.file);
#if !_IO_UNIFIED_JUMPTABLES
@@ -308,7 +307,7 @@
#endif
if (_IO_new_proc_open (fp, command, mode) != NULL)
return (_IO_FILE *) &new_f->fpx.file;
- INTUSE(_IO_un_link) (&new_f->fpx.file);
+ _IO_un_link (&new_f->fpx.file);
free (new_f);
return NULL;
}
@@ -367,20 +366,20 @@
JUMP_INIT(finish, _IO_new_file_finish),
JUMP_INIT(overflow, _IO_new_file_overflow),
JUMP_INIT(underflow, _IO_new_file_underflow),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
JUMP_INIT(xsputn, _IO_new_file_xsputn),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
JUMP_INIT(seekoff, _IO_new_file_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_new_file_setbuf),
JUMP_INIT(sync, _IO_new_file_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
+ JUMP_INIT(seek, _IO_file_seek),
JUMP_INIT(close, _IO_new_proc_close),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
Modified: fsf/trunk/libc/libio/ioseekoff.c
==============================================================================
--- fsf/trunk/libc/libio/ioseekoff.c (original)
+++ fsf/trunk/libc/libio/ioseekoff.c Fri May 25 00:01:51 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -62,9 +61,9 @@
abort ();
}
if (_IO_fwide (fp, 0) < 0)
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
else
- INTUSE(_IO_free_wbackup_area) (fp);
+ _IO_free_wbackup_area (fp);
}
return _IO_SEEKOFF (fp, offset, dir, mode);
Modified: fsf/trunk/libc/libio/ioseekpos.c
[... 7522 lines stripped ...]
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits