From f10a4de1a566db1d66c8a2d61d1ab43003232d22 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 5 Mar 1999 00:19:16 +0000 Subject: [PATCH] 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 --- libio/ChangeLog | 15 +++++++++++++++ libio/config/linuxlibc1.mt | 2 +- libio/genops.c | 2 ++ libio/iofclose.c | 6 ++---- libio/iofeof.c | 2 ++ libio/ioferror.c | 2 ++ libio/iogetc.c | 2 ++ libio/ioputc.c | 2 ++ libio/iovsprintf.c | 7 +++---- libio/iovsscanf.c | 9 +++++---- 10 files changed, 36 insertions(+), 13 deletions(-) diff --git a/libio/ChangeLog b/libio/ChangeLog index 8f9dcd2d834..db76f163987 100644 --- 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 * gen-params (VTABLE_LABEL_PREFIX): Handle windows32. diff --git a/libio/config/linuxlibc1.mt b/libio/config/linuxlibc1.mt index 90fa427225e..742cbf18534 100644 --- 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 cbd8f0f1ea2..b899e150afa 100644 --- 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 b6f18e58c2c..7db336c5d53 100644 --- 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 d06de044fba..7bf8cba285b 100644 --- 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 855627ade66..3019e796a1f 100644 --- 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 f7465f1914b..6a11e47334d 100644 --- 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 3c35c365f07..38a3ec9a00b 100644 --- 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 7b82591974d..617a5888405 100644 --- 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 beb0bc3a6b2..6bdc3ccf018 100644 --- 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