linuxlibc1.mt (MT_CFLAGS): Add -D_G_STDIO_USES_LIBIO -D_G_HAVE_WEAK_SYMBOL.

	* config/linuxlibc1.mt (MT_CFLAGS): Add -D_G_STDIO_USES_LIBIO
	-D_G_HAVE_WEAK_SYMBOL.
	* genops.c: Add the proper weak alias if _G_STDIO_USES_LIBIO
	and _G_HAVE_WEAK_SYMBOL are defined.
	* iofclose.c: Likewise.
	* iofeof.c: Likewise.
	* ioferror.c: Likewise.
	* iogetc.c: Likewise.
	* ioputc.c: Likewise.
	* iovsprintf.c: Likewise.
	* iovsscanf.c: Likewise.

From-SVN: r25590

diff --git a/libio/ChangeLog b/libio/ChangeLog
index 8f9dcd2d834d346c851b5dd386390ae17b6c9552..db76f16398797796ab68004b6627e5a725830ffe 100644 (file)
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,18 @@
+Fri Mar  5 01:15:15 1999  H.J. Lu  (hjl@gnu.org)
+
+        * config/linuxlibc1.mt (MT_CFLAGS): Add -D_G_STDIO_USES_LIBIO
+        -D_G_HAVE_WEAK_SYMBOL.
+
+        * genops.c: Add the proper weak alias if _G_STDIO_USES_LIBIO
+        and _G_HAVE_WEAK_SYMBOL are defined.
+        * iofclose.c: Likewise.
+        * iofeof.c: Likewise.
+        * ioferror.c: Likewise.
+        * iogetc.c: Likewise.
+        * ioputc.c: Likewise.
+        * iovsprintf.c: Likewise.
+        * iovsscanf.c: Likewise.
+
 Wed Feb 10 09:25:48 1999  Mumit Khan  <khan@xraylith.wisc.edu>
 
        * gen-params (VTABLE_LABEL_PREFIX): Handle windows32. 

diff --git a/libio/config/linuxlibc1.mt b/libio/config/linuxlibc1.mt
index 90fa427225e3c30dc3be1b9489a88a666257a897..742cbf18534290b751b57b37fc70d249fd220841 100644 (file)
--- a/libio/config/linuxlibc1.mt
+++ b/libio/config/linuxlibc1.mt
@@ -23,4 +23,4 @@ USER_INCLUDES=PlotFile.h SFile.h builtinbuf.h editbuf.h fstream.h \
        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 --git a/libio/genops.c b/libio/genops.c
index cbd8f0f1ea22a55b00767d1252164b5a7e888caf..b899e150afabf483e32ebd24b8dc4d033e62fcde 100644 (file)
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -937,6 +937,8 @@ __io_defs io_defs__;
 
 #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 --git a/libio/iofclose.c b/libio/iofclose.c
index b6f18e58c2cd5b645726e2946ab10cae433a4fdc..7db336c5d539a8ca071401b1502051af827bdfb2 100644 (file)
--- a/libio/iofclose.c
+++ b/libio/iofclose.c
@@ -55,8 +55,6 @@ _IO_fclose (fp)
 
 #ifdef weak_alias
 weak_alias (_IO_fclose, fclose)
-#else
-#ifdef __linux__
-#pragma weak fclose = _IO_fclose
-#endif
+#elif defined(_G_STDIO_USES_LIBIO) && defined(_G_HAVE_WEAK_SYMBOL)
+int fclose (_IO_FILE *) __attribute__ ((weak, alias("_IO_fclose")));
 #endif

diff --git a/libio/iofeof.c b/libio/iofeof.c
index d06de044fba5f8b36e5a0ab17e826dc05de336f2..7bf8cba285be5a8d6979eacbcd02feafe966d18a 100644 (file)
--- a/libio/iofeof.c
+++ b/libio/iofeof.c
@@ -40,4 +40,6 @@ _IO_feof (fp)
 
 #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 --git a/libio/ioferror.c b/libio/ioferror.c
index 855627ade66d987e08c3acf905918751bad23b8e..3019e796a1f6a31ba1d7f188bde4c1de29a2f70c 100644 (file)
--- a/libio/ioferror.c
+++ b/libio/ioferror.c
@@ -40,4 +40,6 @@ _IO_ferror (fp)
 
 #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 --git a/libio/iogetc.c b/libio/iogetc.c
index f7465f1914b1da51e49052819289426007d003c8..6a11e47334dc5ad5612e209c2f001b5a92c54ad6 100644 (file)
--- a/libio/iogetc.c
+++ b/libio/iogetc.c
@@ -45,4 +45,6 @@ _IO_getc (fp)
 
 #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 --git a/libio/ioputc.c b/libio/ioputc.c
index 3c35c365f07a53417f1473ece3f2d9ecd6d3577d..38a3ec9a00b77554443473592c3d0009108a38a2 100644 (file)
--- a/libio/ioputc.c
+++ b/libio/ioputc.c
@@ -39,4 +39,6 @@ _IO_putc (c, fp)
 
 #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 --git a/libio/iovsprintf.c b/libio/iovsprintf.c
index 7b82591974d4a6ae2f6d7b3d961701779bd28843..617a5888405dce55a0a883ec29642793c8292d89 100644 (file)
--- a/libio/iovsprintf.c
+++ b/libio/iovsprintf.c
@@ -54,8 +54,7 @@ _IO_vsprintf (string, format, args)
 
 #ifdef weak_alias
 weak_alias (_IO_vsprintf, vsprintf)
-#else
-#ifdef __linux__
-#pragma weak vsprintf = _IO_vsprintf
-#endif
+#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

diff --git a/libio/iovsscanf.c b/libio/iovsscanf.c
index beb0bc3a6b22eb4f3801bda0094fa46ac9f7a509..6bdc3ccf01828503d8c48c3cf207e28003883d16 100644 (file)
--- a/libio/iovsscanf.c
+++ b/libio/iovsscanf.c
@@ -51,8 +51,9 @@ _IO_vsscanf (string, format, args)
 #ifdef weak_alias
 weak_alias (_IO_vsscanf, __vsscanf)
 weak_alias (_IO_vsscanf, vsscanf)
-#else
-#ifdef __linux__
-#pragma weak vsscanf = _IO_vsscanf
-#endif
+#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