[src/trunk]: src/gnu/dist/libio Import libio changes from egcs 1.1.2.

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/caff3ddf0421
branches:  trunk
changeset: 471635:caff3ddf0421
user:      tv <tv%NetBSD.org@localhost>
date:      Tue Apr 06 16:22:32 1999 +0000

description:
Import libio changes from egcs 1.1.2.

diffstat:

 gnu/dist/libio/config/linuxlibc1.mt |  2 +-
 gnu/dist/libio/genops.c             |  2 ++
 gnu/dist/libio/iofclose.c           |  6 ++----
 gnu/dist/libio/iofeof.c             |  2 ++
 gnu/dist/libio/ioferror.c           |  2 ++
 gnu/dist/libio/iogetc.c             |  2 ++
 gnu/dist/libio/ioputc.c             |  2 ++
 gnu/dist/libio/iovsprintf.c         |  7 +++----
 gnu/dist/libio/iovsscanf.c          |  9 +++++----
 9 files changed, 21 insertions(+), 13 deletions(-)

diffs (107 lines):

diff -r 73e9e5268c32 -r caff3ddf0421 gnu/dist/libio/config/linuxlibc1.mt
--- a/gnu/dist/libio/config/linuxlibc1.mt       Tue Apr 06 16:20:26 1999 +0000
+++ b/gnu/dist/libio/config/linuxlibc1.mt       Tue Apr 06 16:22:32 1999 +0000
@@ -23,4 +23,4 @@
        streambuf.h strfile.h strstream.h libio.h
 
 # A bad kludge
-MT_CFLAGS=-D_G_HAVE_MMAP
+MT_CFLAGS=-D_G_HAVE_MMAP -D_G_STDIO_USES_LIBIO -D_G_HAVE_WEAK_SYMBOL
diff -r 73e9e5268c32 -r caff3ddf0421 gnu/dist/libio/genops.c
--- a/gnu/dist/libio/genops.c   Tue Apr 06 16:20:26 1999 +0000
+++ b/gnu/dist/libio/genops.c   Tue Apr 06 16:22:32 1999 +0000
@@ -937,6 +937,8 @@
 
 #ifdef weak_alias
 weak_alias (_IO_cleanup, _cleanup)
+#elif defined(_G_STDIO_USES_LIBIO) && defined(_G_HAVE_WEAK_SYMBOL)
+void _cleanup () __attribute__ ((weak, alias ("_IO_cleanup")));
 #endif
 
 #ifdef text_set_element
diff -r 73e9e5268c32 -r caff3ddf0421 gnu/dist/libio/iofclose.c
--- a/gnu/dist/libio/iofclose.c Tue Apr 06 16:20:26 1999 +0000
+++ b/gnu/dist/libio/iofclose.c Tue Apr 06 16:22:32 1999 +0000
@@ -55,8 +55,6 @@
 
 #ifdef weak_alias
 weak_alias (_IO_fclose, fclose)
-#else
-#ifdef __linux__
-#pragma weak fclose = _IO_fclose
+#elif defined(_G_STDIO_USES_LIBIO) && defined(_G_HAVE_WEAK_SYMBOL)
+int fclose (_IO_FILE *) __attribute__ ((weak, alias("_IO_fclose")));
 #endif
-#endif
diff -r 73e9e5268c32 -r caff3ddf0421 gnu/dist/libio/iofeof.c
--- a/gnu/dist/libio/iofeof.c   Tue Apr 06 16:20:26 1999 +0000
+++ b/gnu/dist/libio/iofeof.c   Tue Apr 06 16:22:32 1999 +0000
@@ -40,4 +40,6 @@
 
 #ifdef weak_alias
 weak_alias (_IO_feof, feof)
+#elif defined(_G_STDIO_USES_LIBIO) && defined(_G_HAVE_WEAK_SYMBOL)
+int feof (_IO_FILE *) __attribute__ ((weak, alias("_IO_feof")));
 #endif
diff -r 73e9e5268c32 -r caff3ddf0421 gnu/dist/libio/ioferror.c
--- a/gnu/dist/libio/ioferror.c Tue Apr 06 16:20:26 1999 +0000
+++ b/gnu/dist/libio/ioferror.c Tue Apr 06 16:22:32 1999 +0000
@@ -40,4 +40,6 @@
 
 #ifdef weak_alias
 weak_alias (_IO_ferror, ferror)
+#elif defined(_G_STDIO_USES_LIBIO) && defined(_G_HAVE_WEAK_SYMBOL)
+int ferror (_IO_FILE *) __attribute__ ((weak, alias("_IO_ferror")));
 #endif
diff -r 73e9e5268c32 -r caff3ddf0421 gnu/dist/libio/iogetc.c
--- a/gnu/dist/libio/iogetc.c   Tue Apr 06 16:20:26 1999 +0000
+++ b/gnu/dist/libio/iogetc.c   Tue Apr 06 16:22:32 1999 +0000
@@ -45,4 +45,6 @@
 
 #ifdef weak_alias
 weak_alias (_IO_getc, getc)
+#elif defined(_G_STDIO_USES_LIBIO) && defined(_G_HAVE_WEAK_SYMBOL)
+int getc (_IO_FILE *) __attribute__ ((weak, alias("_IO_getc")));
 #endif
diff -r 73e9e5268c32 -r caff3ddf0421 gnu/dist/libio/ioputc.c
--- a/gnu/dist/libio/ioputc.c   Tue Apr 06 16:20:26 1999 +0000
+++ b/gnu/dist/libio/ioputc.c   Tue Apr 06 16:22:32 1999 +0000
@@ -39,4 +39,6 @@
 
 #ifdef weak_alias
 weak_alias (_IO_putc, putc)
+#elif defined(_G_STDIO_USES_LIBIO) && defined(_G_HAVE_WEAK_SYMBOL)
+int putc (int, _IO_FILE *) __attribute__ ((weak, alias("_IO_putc")));
 #endif
diff -r 73e9e5268c32 -r caff3ddf0421 gnu/dist/libio/iovsprintf.c
--- a/gnu/dist/libio/iovsprintf.c       Tue Apr 06 16:20:26 1999 +0000
+++ b/gnu/dist/libio/iovsprintf.c       Tue Apr 06 16:22:32 1999 +0000
@@ -54,8 +54,7 @@
 
 #ifdef weak_alias
 weak_alias (_IO_vsprintf, vsprintf)
-#else
-#ifdef __linux__
-#pragma weak vsprintf = _IO_vsprintf
+#elif defined(_G_STDIO_USES_LIBIO) && defined(_G_HAVE_WEAK_SYMBOL)
+int vsprintf (char *, const char *, _IO_va_list)
+             __attribute__ ((weak, alias("_IO_vsprintf")));
 #endif
-#endif
diff -r 73e9e5268c32 -r caff3ddf0421 gnu/dist/libio/iovsscanf.c
--- a/gnu/dist/libio/iovsscanf.c        Tue Apr 06 16:20:26 1999 +0000
+++ b/gnu/dist/libio/iovsscanf.c        Tue Apr 06 16:22:32 1999 +0000
@@ -51,8 +51,9 @@
 #ifdef weak_alias
 weak_alias (_IO_vsscanf, __vsscanf)
 weak_alias (_IO_vsscanf, vsscanf)
-#else
-#ifdef __linux__
-#pragma weak vsscanf = _IO_vsscanf
+#elif defined(_G_STDIO_USES_LIBIO) && defined(_G_HAVE_WEAK_SYMBOL)
+int __vsscanf (const char *, const char *, _IO_va_list)
+           __attribute__ ((weak, alias("_IO_vsscanf")));
+int vsscanf (const char *, const char *, _IO_va_list)
+           __attribute__ ((weak, alias("_IO_vsscanf")));
 #endif
-#endif