diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/Makefile | 2 | ||||
| -rw-r--r-- | libio/freopen.c | 2 | ||||
| -rw-r--r-- | libio/genops.c | 2 | ||||
| -rw-r--r-- | libio/iofopen.c | 4 | ||||
| -rw-r--r-- | libio/oldstdfiles.c | 8 | ||||
| -rw-r--r-- | libio/stdfiles.c | 14 |
6 files changed, 20 insertions, 12 deletions
diff --git a/libio/Makefile b/libio/Makefile index 3e9f6eae39..033c959889 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -62,6 +62,8 @@ ifeq ($(versioning),yes) aux += oldfileops oldstdfiles endif +shared-only-routines = oldiofopen oldfreopen oldfileops oldstdfiles + distribute := iolibio.h libioP.h strfile.h Banner include ../Rules diff --git a/libio/freopen.c b/libio/freopen.c index c443bbc2eb..7ab3e69845 100644 --- a/libio/freopen.c +++ b/libio/freopen.c @@ -43,4 +43,4 @@ __new_freopen (filename, mode, fp) return result; } -symbol_version (__new_freopen, freopen, GLIBC_2.1); +default_symbol_version (__new_freopen, freopen, GLIBC_2.1); diff --git a/libio/genops.c b/libio/genops.c index 71275da28c..f8342776f5 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -710,6 +710,8 @@ _IO_cleanup () _IO_unbuffer_all (); } +_IO_FILE *_IO_list_all = &_IO_stderr_.plus.file; + void _IO_init_marker (marker, fp) struct _IO_marker *marker; diff --git a/libio/iofopen.c b/libio/iofopen.c index c27b69bc1b..b74b6926c0 100644 --- a/libio/iofopen.c +++ b/libio/iofopen.c @@ -61,8 +61,8 @@ _IO_new_fopen (filename, mode) #ifdef DO_VERSIONING strong_alias (_IO_new_fopen, __new_fopen) -symbol_version (_IO_new_fopen, _IO_fopen, GLIBC_2.1); -symbol_version (__new_fopen, fopen, GLIBC_2.1); +default_symbol_version (_IO_new_fopen, _IO_fopen, GLIBC_2.1); +default_symbol_version (__new_fopen, fopen, GLIBC_2.1); #else # ifdef weak_alias weak_symbol (_IO_new_fopen, _IO_fopen) diff --git a/libio/oldstdfiles.c b/libio/oldstdfiles.c index d34a8680c3..3017109581 100644 --- a/libio/oldstdfiles.c +++ b/libio/oldstdfiles.c @@ -46,10 +46,12 @@ #endif DEF_STDFILE(_IO_old_stdin_, _IO_stdin_, 0, 0, _IO_NO_WRITES); -DEF_STDFILE(_IO_old_stdout_, _IO_stdout_, 1, &_IO_old_stdin_.file, +DEF_STDFILE(_IO_old_stdout_, _IO_stdout_, 1, &_IO_stdin_.plus.file, _IO_NO_READS); -DEF_STDFILE(_IO_old_stderr_, _IO_stderr_, 2, &_IO_old_stdout_.file, +DEF_STDFILE(_IO_old_stderr_, _IO_stderr_, 2, &_IO_stdout_.plus.file, _IO_NO_READS+_IO_UNBUFFERED); -_IO_FILE *_IO_old_list_all = &_IO_old_stderr_.file; +#if 0 +_IO_FILE *_IO_old_list_all = &_IO_stderr_.plus.file; symbol_version (_IO_old_list_all, _IO_list_all,); +#endif diff --git a/libio/stdfiles.c b/libio/stdfiles.c index f5113b2973..c563f2aed0 100644 --- a/libio/stdfiles.c +++ b/libio/stdfiles.c @@ -37,19 +37,21 @@ static _IO_lock_t _IO_stdfile_##FD##_lock = _IO_lock_initializer; \ struct _IO_FILE_complete INAME \ = {{FILEBUF_LITERAL(CHAIN, FLAGS, FD), &_IO_file_jumps},}; \ - symbol_version (INAME, NAME, GLIBC_2.1) + default_symbol_version (INAME, NAME, GLIBC_2.1) #else #define DEF_STDFILE(INAME, FD, CHAIN, FLAGS) \ struct _IO_FILE_complete INAME \ = {{FILEBUF_LITERAL(CHAIN, FLAGS, FD), &_IO_file_jumps},}; \ - symbol_version (INAME, NAME, GLIBC_2.1) + default_symbol_version (INAME, NAME, GLIBC_2.1) #endif DEF_STDFILE(_IO_new_stdin_, _IO_stdin_, 0, 0, _IO_NO_WRITES); -DEF_STDFILE(_IO_new_stdout_, _IO_stdout_, 1, &_IO_new_stdin_.plus.file, +DEF_STDFILE(_IO_new_stdout_, _IO_stdout_, 1, &_IO_stdin_.plus.file, _IO_NO_READS); -DEF_STDFILE(_IO_new_stderr_, _IO_stderr_, 2, &_IO_new_stdout_.plus.file, +DEF_STDFILE(_IO_new_stderr_, _IO_stderr_, 2, &_IO_stdout_.plus.file, _IO_NO_READS+_IO_UNBUFFERED); -_IO_FILE *_IO_new_list_all = &_IO_new_stderr_.plus.file; -symbol_version (_IO_new_list_all, _IO_list_all, GLIBC_2.1); +#if 0 +_IO_FILE *_IO_new_list_all = &_IO_stderr_.plus.file; +default_symbol_version (_IO_new_list_all, _IO_list_all, GLIBC_2.1); +#endif |