ansification: remove _EXFUN, _EXFUN_NOTHROW

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

26 files changed, 157 insertions, 157 deletions

diff --git a/newlib/libc/stdio/asnprintf.c b/newlib/libc/stdio/asnprintf.c
index 34639dc09..f657f9ec9 100644
--- a/newlib/libc/stdio/asnprintf.c
+++ b/newlib/libc/stdio/asnprintf.c
@@ -59,8 +59,8 @@ _asnprintf_r (struct _reent *__restrict ptr,
 
 #ifdef _NANO_FORMATTED_IO
 char *
-_EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_asnprintf_r"))));
+_asniprintf_r (struct _reent *, char *, size_t *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_asnprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -111,7 +111,7 @@ asnprintf (char *__restrict buf,
 
 #ifdef _NANO_FORMATTED_IO
 char *
-_EXFUN(asniprintf, (char *, size_t *, const char *, ...)
-       _ATTRIBUTE ((__alias__("asnprintf"))));
+asniprintf (char *, size_t *, const char *, ...)
+       _ATTRIBUTE ((__alias__("asnprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c
index 330491ebe..25696c575 100644
--- a/newlib/libc/stdio/asprintf.c
+++ b/newlib/libc/stdio/asprintf.c
@@ -51,8 +51,8 @@ _asprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
-       _ATTRIBUTE ((__alias__("_asprintf_r"))));
+_asiprintf_r (struct _reent *, char **, const char *, ...)
+       _ATTRIBUTE ((__alias__("_asprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -83,7 +83,7 @@ asprintf (char **__restrict strp,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(asiprintf, (char **, const char *, ...)
-       _ATTRIBUTE ((__alias__("asprintf"))));
+asiprintf (char **, const char *, ...)
+       _ATTRIBUTE ((__alias__("asprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
index 1493e1f18..ae9f86d18 100644
--- a/newlib/libc/stdio/dprintf.c
+++ b/newlib/libc/stdio/dprintf.c
@@ -68,8 +68,8 @@ _dprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
-       _ATTRIBUTE ((__alias__("_dprintf_r"))));
+_diprintf_r (struct _reent *, int, const char *, ...)
+       _ATTRIBUTE ((__alias__("_dprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -91,7 +91,7 @@ dprintf (int fd,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(diprintf, (int, const char *, ...)
-       _ATTRIBUTE ((__alias__("dprintf"))));
+diprintf (int, const char *, ...)
+       _ATTRIBUTE ((__alias__("dprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/fprintf.c b/newlib/libc/stdio/fprintf.c
index 4c03b1a02..efb97ad20 100644
--- a/newlib/libc/stdio/fprintf.c
+++ b/newlib/libc/stdio/fprintf.c
@@ -37,8 +37,8 @@ _fprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_fprintf_r"))));
+_fiprintf_r (struct _reent *, FILE *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_fprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -58,7 +58,7 @@ fprintf (FILE *__restrict fp,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(fiprintf, (FILE *, const char *, ...)
-       _ATTRIBUTE ((__alias__("fprintf"))));
+fiprintf (FILE *, const char *, ...)
+       _ATTRIBUTE ((__alias__("fprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/fscanf.c b/newlib/libc/stdio/fscanf.c
index 40705a5e7..94096a22b 100644
--- a/newlib/libc/stdio/fscanf.c
+++ b/newlib/libc/stdio/fscanf.c
@@ -52,8 +52,8 @@ fscanf(FILE *fp, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(fiscanf, (FILE *, const char *, ...)
-       _ATTRIBUTE ((__alias__("fscanf"))));
+fiscanf (FILE *, const char *, ...)
+       _ATTRIBUTE ((__alias__("fscanf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -84,6 +84,6 @@ _fscanf_r(ptr, FILE *fp, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_fiscanf_r, (struct _reent *, FILE *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_fscanf_r"))));
+_fiscanf_r (struct _reent *, FILE *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_fscanf_r")));
 #endif
diff --git a/newlib/libc/stdio/fvwrite.h b/newlib/libc/stdio/fvwrite.h
index 91cabc890..139d83737 100644
--- a/newlib/libc/stdio/fvwrite.h
+++ b/newlib/libc/stdio/fvwrite.h
@@ -32,5 +32,5 @@ struct __suio {
 };
 
 
-extern int _EXFUN(__sfvwrite_r,(struct _reent *, FILE *, struct __suio *));
-extern int _EXFUN(__swsetup_r,(struct _reent *, FILE *));
+extern int __sfvwrite_r (struct _reent *, FILE *, struct __suio *);
+extern int __swsetup_r (struct _reent *, FILE *);
diff --git a/newlib/libc/stdio/getline.c b/newlib/libc/stdio/getline.c
index 857e980ad..1c59afd2a 100644
--- a/newlib/libc/stdio/getline.c
+++ b/newlib/libc/stdio/getline.c
@@ -34,7 +34,7 @@ No supporting OS subroutines are directly required.
 #include <_ansi.h>
 #include <stdio.h>
 
-extern ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
+extern ssize_t __getdelim (char **, size_t *, int, FILE *);
 
 ssize_t
 __getline (char **lptr,
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index 68a36e054..5f56792de 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -140,59 +140,59 @@
 
 #endif /* __SINGLE_THREAD__ || __IMPL_UNLOCKED__ */
 
-extern wint_t _EXFUN(__fgetwc, (struct _reent *, FILE *));
-extern wint_t _EXFUN(__fputwc, (struct _reent *, wchar_t, FILE *));
-extern u_char *_EXFUN(__sccl, (char *, u_char *fmt));
-extern int    _EXFUN(__svfscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int    _EXFUN(__ssvfscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int    _EXFUN(__svfiscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int    _EXFUN(__ssvfiscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int    _EXFUN(__svfwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-extern int    _EXFUN(__ssvfwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-extern int    _EXFUN(__svfiwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-extern int    _EXFUN(__ssvfiwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-int	      _EXFUN(_svfprintf_r,(struct _reent *, FILE *, const char *, 
+extern wint_t __fgetwc (struct _reent *, FILE *);
+extern wint_t __fputwc (struct _reent *, wchar_t, FILE *);
+extern u_char *__sccl (char *, u_char *fmt);
+extern int    __svfscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int    __ssvfscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int    __svfiscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int    __ssvfiscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int    __svfwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+extern int    __ssvfwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+extern int    __svfiwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+extern int    __ssvfiwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+int	      _svfprintf_r (struct _reent *, FILE *, const char *, 
 				  va_list)
-               			_ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	      _EXFUN(_svfiprintf_r,(struct _reent *, FILE *, const char *, 
+               			_ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	      _svfiprintf_r (struct _reent *, FILE *, const char *, 
 				  va_list)
-               			_ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int	      _EXFUN(_svfwprintf_r,(struct _reent *, FILE *, const wchar_t *, 
-				  va_list));
-int	      _EXFUN(_svfiwprintf_r,(struct _reent *, FILE *, const wchar_t *, 
-				  va_list));
-extern FILE  *_EXFUN(__sfp,(struct _reent *));
-extern int    _EXFUN(__sflags,(struct _reent *,const char*, int*));
-extern int    _EXFUN(__sflush_r,(struct _reent *,FILE *));
+               			_ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int	      _svfwprintf_r (struct _reent *, FILE *, const wchar_t *, 
+				  va_list);
+int	      _svfiwprintf_r (struct _reent *, FILE *, const wchar_t *, 
+				  va_list);
+extern FILE  *__sfp (struct _reent *);
+extern int    __sflags (struct _reent *,const char*, int*);
+extern int    __sflush_r (struct _reent *,FILE *);
 #ifdef _STDIO_BSD_SEMANTICS
-extern int    _EXFUN(__sflushw_r,(struct _reent *,FILE *));
+extern int    __sflushw_r (struct _reent *,FILE *);
 #endif
-extern int    _EXFUN(__srefill_r,(struct _reent *,FILE *));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(struct _reent *, void *, char *,
-					       _READ_WRITE_BUFSIZE_TYPE));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__seofread,(struct _reent *, void *,
+extern int    __srefill_r (struct _reent *,FILE *);
+extern _READ_WRITE_RETURN_TYPE __sread (struct _reent *, void *, char *,
+					       _READ_WRITE_BUFSIZE_TYPE);
+extern _READ_WRITE_RETURN_TYPE __seofread (struct _reent *, void *,
 						  char *,
-						  _READ_WRITE_BUFSIZE_TYPE));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite,(struct _reent *, void *,
+						  _READ_WRITE_BUFSIZE_TYPE);
+extern _READ_WRITE_RETURN_TYPE __swrite (struct _reent *, void *,
 						const char *,
-						_READ_WRITE_BUFSIZE_TYPE));
-extern _fpos_t _EXFUN(__sseek,(struct _reent *, void *, _fpos_t, int));
-extern int    _EXFUN(__sclose,(struct _reent *, void *));
-extern int    _EXFUN(__stextmode,(int));
-extern void   _EXFUN(__sinit,(struct _reent *));
-extern void   _EXFUN(_cleanup_r,(struct _reent *));
-extern void   _EXFUN(__smakebuf_r,(struct _reent *, FILE *));
-extern int    _EXFUN(__swhatbuf_r,(struct _reent *, FILE *, size_t *, int *));
-extern int    _EXFUN(_fwalk,(struct _reent *, int (*)(FILE *)));
-extern int    _EXFUN(_fwalk_reent,(struct _reent *, int (*)(struct _reent *, FILE *)));
-struct _glue * _EXFUN(__sfmoreglue,(struct _reent *,int n));
-extern int _EXFUN(__submore, (struct _reent *, FILE *));
+						_READ_WRITE_BUFSIZE_TYPE);
+extern _fpos_t __sseek (struct _reent *, void *, _fpos_t, int);
+extern int    __sclose (struct _reent *, void *);
+extern int    __stextmode (int);
+extern void   __sinit (struct _reent *);
+extern void   _cleanup_r (struct _reent *);
+extern void   __smakebuf_r (struct _reent *, FILE *);
+extern int    __swhatbuf_r (struct _reent *, FILE *, size_t *, int *);
+extern int    _fwalk (struct _reent *, int (*)(FILE *));
+extern int    _fwalk_reent (struct _reent *, int (*)(struct _reent *, FILE *));
+struct _glue * __sfmoreglue (struct _reent *,int n);
+extern int __submore (struct _reent *, FILE *);
 
 #ifdef __LARGE64_FILES
-extern _fpos64_t _EXFUN(__sseek64,(struct _reent *, void *, _fpos64_t, int));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite64,(struct _reent *, void *,
+extern _fpos64_t __sseek64 (struct _reent *, void *, _fpos64_t, int);
+extern _READ_WRITE_RETURN_TYPE __swrite64 (struct _reent *, void *,
 						  const char *,
-						  _READ_WRITE_BUFSIZE_TYPE));
+						  _READ_WRITE_BUFSIZE_TYPE);
 #endif
 
 /* Called by the main entry point fns to ensure stdio has been initialized.  */
@@ -279,12 +279,12 @@ extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite64,(struct _reent *, void *,
 
 /* WARNING: _dcvt is defined in the stdlib directory, not here!  */
 
-char *_EXFUN(_dcvt,(struct _reent *, char *, double, int, int, char, int));
-char *_EXFUN(_sicvt,(char *, short, char));
-char *_EXFUN(_icvt,(char *, int, char));
-char *_EXFUN(_licvt,(char *, long, char));
+char *_dcvt (struct _reent *, char *, double, int, int, char, int);
+char *_sicvt (char *, short, char);
+char *_icvt (char *, int, char);
+char *_licvt (char *, long, char);
 #ifdef __GNUC__
-char *_EXFUN(_llicvt,(char *, long long, char));
+char *_llicvt (char *, long long, char);
 #endif
 
 #define CVT_BUF_SIZE 128
@@ -297,10 +297,10 @@ char *_EXFUN(_llicvt,(char *, long long, char));
 #define __sinit_lock_acquire()
 #define __sinit_lock_release()
 #else
-void _EXFUN(__sfp_lock_acquire,(void));
-void _EXFUN(__sfp_lock_release,(void));
-void _EXFUN(__sinit_lock_acquire,(void));
-void _EXFUN(__sinit_lock_release,(void));
+void __sfp_lock_acquire (void);
+void __sfp_lock_release (void);
+void __sinit_lock_acquire (void);
+void __sinit_lock_release (void);
 #endif
 
 /* Types used in positional argument support in vfprinf/vfwprintf.
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index 1c5a07516..ed7316a77 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -443,7 +443,7 @@ __sfputs_r (struct _reent *ptr,
 }
 #endif /* STRING_ONLY.  */
 
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
+int _VFPRINTF_R (struct _reent *, FILE *, const char *, va_list);
 
 #ifndef STRING_ONLY
 int
@@ -457,8 +457,8 @@ VFPRINTF (FILE * fp,
 }
 
 int
-_EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vfprintf"))));
+vfiprintf (FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vfprintf")));
 #endif
 
 #ifdef STRING_ONLY
@@ -659,10 +659,10 @@ error:
 
 #ifdef STRING_ONLY
 int
-_EXFUN(_svfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_svfprintf_r"))));
+_svfiprintf_r (struct _reent *, FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_svfprintf_r")));
 #else
 int
-_EXFUN(_vfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vfprintf_r"))));
+_vfiprintf_r (struct _reent *, FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vfprintf_r")));
 #endif
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index e8a9325ec..5579cb0f1 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -153,8 +153,8 @@ VFSCANF (register FILE *fp,
 }
 
 int
-_EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vfscanf"))));
+vfiscanf (FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vfscanf")));
 
 int
 __SVFSCANF (register FILE *fp,
@@ -177,8 +177,8 @@ _VFSCANF_R (struct _reent *data,
 }
 
 int
-_EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vfscanf_r"))));
+_vfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vfscanf_r")));
 #endif /* !STRING_ONLY.  */
 
 #if defined (STRING_ONLY)
@@ -257,9 +257,9 @@ __ssrefill_r (struct _reent * ptr,
 }
 
 #else
-int _EXFUN (_sungetc_r, (struct _reent *, int, register FILE *));
-int _EXFUN (__ssrefill_r, (struct _reent *, register FILE *));
-size_t _EXFUN (_sfread_r, (struct _reent *, void *buf, size_t, size_t, FILE *));
+int _sungetc_r (struct _reent *, int, register FILE *);
+int __ssrefill_r (struct _reent *, register FILE *);
+size_t _sfread_r (struct _reent *, void *buf, size_t, size_t, FILE *);
 #endif /* !STRING_ONLY.  */
 
 int
@@ -457,11 +457,11 @@ all_done:
 
 #ifdef STRING_ONLY
 int
-_EXFUN(__ssvfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("__ssvfscanf_r"))));
+__ssvfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("__ssvfscanf_r")));
 #else
 int
-_EXFUN(__svfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("__svfscanf_r"))));
+__svfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("__svfscanf_r")));
 #endif
 
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index a323f5ad0..a9ba6118e 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -38,8 +38,8 @@ _printf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_iprintf_r, (struct _reent *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_printf_r"))));
+_iprintf_r (struct _reent *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_printf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -60,7 +60,7 @@ printf (const char *__restrict fmt, ...)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(iprintf, (const char *, ...)
-       _ATTRIBUTE ((__alias__("printf"))));
+iprintf (const char *, ...)
+       _ATTRIBUTE ((__alias__("printf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c
index 87cbeb7b8..a5a9391c0 100644
--- a/newlib/libc/stdio/scanf.c
+++ b/newlib/libc/stdio/scanf.c
@@ -53,8 +53,8 @@ scanf(fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(iscanf, (const char *, ...)
-       _ATTRIBUTE ((__alias__("scanf"))));
+iscanf (const char *, ...)
+       _ATTRIBUTE ((__alias__("scanf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -85,6 +85,6 @@ _scanf_r(ptr, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_iscanf_r, (struct _reent *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_scanf_r"))));
+_iscanf_r (struct _reent *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_scanf_r")));
 #endif
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index d5ba7085c..d73cdbf3a 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -73,8 +73,8 @@ _snprintf_r(ptr, str, size, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...)
-       _ATTRIBUTE ((__alias__("_snprintf_r"))));
+_sniprintf_r (struct _reent *, char *, size_t, const char *, ...)
+       _ATTRIBUTE ((__alias__("_snprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -122,7 +122,7 @@ snprintf(str, size, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(sniprintf, (char *, size_t, const char *, ...)
-       _ATTRIBUTE ((__alias__("snprintf"))));
+sniprintf (char *, size_t, const char *, ...)
+       _ATTRIBUTE ((__alias__("snprintf")));
 #endif
 #endif
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index bbb9753b9..37d92f93e 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -612,8 +612,8 @@ _sprintf_r(ptr, str, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_sprintf_r"))));
+_siprintf_r (struct _reent *, char *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_sprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -650,7 +650,7 @@ sprintf(str, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(siprintf, (char *, const char *, ...)
-       _ATTRIBUTE ((__alias__("sprintf"))));
+siprintf (char *, const char *, ...)
+       _ATTRIBUTE ((__alias__("sprintf")));
 #endif
 #endif
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index a04f9b65c..971db439d 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -459,8 +459,8 @@ sscanf(str, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(siscanf, (const char *, const char *, ...)
-       _ATTRIBUTE ((__alias__("sscanf"))));
+siscanf (const char *, const char *, ...)
+       _ATTRIBUTE ((__alias__("sscanf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -502,6 +502,6 @@ _sscanf_r(ptr, str, fmt, va_alist)
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_siscanf_r, (struct _reent *, const char *, const char *, ...)
-       _ATTRIBUTE ((__alias__("_sscanf_r"))));
+_siscanf_r (struct _reent *, const char *, const char *, ...)
+       _ATTRIBUTE ((__alias__("_sscanf_r")));
 #endif
diff --git a/newlib/libc/stdio/vasnprintf.c b/newlib/libc/stdio/vasnprintf.c
index 5bc0ec634..1fbf5a171 100644
--- a/newlib/libc/stdio/vasnprintf.c
+++ b/newlib/libc/stdio/vasnprintf.c
@@ -57,9 +57,9 @@ _vasnprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 char *
-_EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *,
+_vasniprintf_r (struct _reent*, char *, size_t *,
 			const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vasnprintf_r"))));
+       _ATTRIBUTE ((__alias__("_vasnprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -75,7 +75,7 @@ vasnprintf (char *buf,
 
 #ifdef _NANO_FORMATTED_IO
 char *
-_EXFUN(vasniprintf, (char *, size_t *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vasnprintf"))));
+vasniprintf (char *, size_t *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vasnprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/vasprintf.c b/newlib/libc/stdio/vasprintf.c
index 4acbc0479..8fe635462 100644
--- a/newlib/libc/stdio/vasprintf.c
+++ b/newlib/libc/stdio/vasprintf.c
@@ -40,8 +40,8 @@ vasprintf (char **strp,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(vasiprintf, (char **, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vasprintf"))));
+vasiprintf (char **, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vasprintf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -70,6 +70,6 @@ _vasprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_vasiprintf_r, (struct _reent *, char **, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vasprintf_r"))));
+_vasiprintf_r (struct _reent *, char **, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vasprintf_r")));
 #endif
diff --git a/newlib/libc/stdio/vdprintf.c b/newlib/libc/stdio/vdprintf.c
index 6261f6217..d22463e49 100644
--- a/newlib/libc/stdio/vdprintf.c
+++ b/newlib/libc/stdio/vdprintf.c
@@ -34,8 +34,8 @@ _vdprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vdprintf_r"))));
+_vdiprintf_r (struct _reent *, int, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vdprintf_r")));
 #endif
 
 #ifndef _REENT_ONLY
@@ -50,7 +50,7 @@ vdprintf (int fd,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(vdiprintf, (int, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vdprintf"))));
+vdiprintf (int, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vdprintf")));
 #endif
 #endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index 6649e2b61..c4bf2dbe3 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -517,7 +517,7 @@ extern char *_dtoa_r (struct _reent *, double, int,
 extern char *_ldtoa_r (struct _reent *, _LONG_DOUBLE, int,
 			      int, int *, int *, char **);
 
-extern int _EXFUN(_ldcheck,(_LONG_DOUBLE *));
+extern int _ldcheck (_LONG_DOUBLE *);
 
 #  define _PRINTF_FLOAT_TYPE _LONG_DOUBLE
 #  define _DTOA_R _ldtoa_r
@@ -600,9 +600,9 @@ union arg_val
 };
 
 static union arg_val *
-_EXFUN(get_arg, (struct _reent *data, int n, char *fmt,
+get_arg (struct _reent *data, int n, char *fmt,
                  va_list *ap, int *numargs, union arg_val *args,
-                 int *arg_type, char **last_fmt));
+                 int *arg_type, char **last_fmt);
 #endif /* !_NO_POS_ARGS */
 
 /*
@@ -639,7 +639,7 @@ _EXFUN(get_arg, (struct _reent *data, int n, char *fmt,
 # define GROUPING	0x400		/* use grouping ("'" flag) */
 #endif
 
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
+int _VFPRINTF_R (struct _reent *, FILE *, const char *, va_list);
 
 #ifndef STRING_ONLY
 int
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 097fd801c..b97235559 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -378,9 +378,9 @@ _sfread_r (struct _reent * ptr,
   return count;
 }
 #else /* !STRING_ONLY || !INTEGER_ONLY */
-int _EXFUN (_sungetc_r, (struct _reent *, int, register FILE *));
-int _EXFUN (__ssrefill_r, (struct _reent *, register FILE *));
-size_t _EXFUN (_sfread_r, (struct _reent *, void *buf, size_t, size_t, FILE *));
+int _sungetc_r (struct _reent *, int, register FILE *);
+int __ssrefill_r (struct _reent *, register FILE *);
+size_t _sfread_r (struct _reent *, void *buf, size_t, size_t, FILE *);
 #endif /* !STRING_ONLY || !INTEGER_ONLY */
 
 static inline int
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index dd78eb015..980b31e3b 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -149,7 +149,7 @@ SEEALSO
 # undef _NO_LONGLONG
 #endif
 
-int _EXFUN(_VFWPRINTF_R, (struct _reent *, FILE *, const wchar_t *, va_list));
+int _VFWPRINTF_R (struct _reent *, FILE *, const wchar_t *, va_list);
 /* Defined in vfprintf.c. */
 #ifdef _FVWRITE_IN_STREAMIO
 # ifdef STRING_ONLY
@@ -157,14 +157,14 @@ int _EXFUN(_VFWPRINTF_R, (struct _reent *, FILE *, const wchar_t *, va_list));
 # else
 #  define __SPRINT __sprint_r
 # endif
-int _EXFUN(__SPRINT, (struct _reent *, FILE *, register struct __suio *));
+int __SPRINT (struct _reent *, FILE *, register struct __suio *);
 #else
 # ifdef STRING_ONLY
 #  define __SPRINT __ssputs_r
 # else
 #  define __SPRINT __sfputs_r
 # endif
-int _EXFUN(__SPRINT, (struct _reent *, FILE *, const char *, size_t));
+int __SPRINT (struct _reent *, FILE *, const char *, size_t);
 #endif
 #ifndef STRING_ONLY
 #ifdef _UNBUF_STREAM_OPT
@@ -239,7 +239,7 @@ extern char *_dtoa_r (struct _reent *, double, int,
 extern char *_ldtoa_r (struct _reent *, _LONG_DOUBLE, int,
 			      int, int *, int *, char **);
 
-extern int _EXFUN(_ldcheck,(_LONG_DOUBLE *));
+extern int _ldcheck (_LONG_DOUBLE *);
 
 #  define _PRINTF_FLOAT_TYPE _LONG_DOUBLE
 #  define _DTOA_R _ldtoa_r
@@ -324,9 +324,9 @@ union arg_val
 };
 
 static union arg_val *
-_EXFUN(get_arg, (struct _reent *data, int n, wchar_t *fmt,
+get_arg (struct _reent *data, int n, wchar_t *fmt,
                  va_list *ap, int *numargs, union arg_val *args,
-                 int *arg_type, wchar_t **last_fmt));
+                 int *arg_type, wchar_t **last_fmt);
 #endif /* !_NO_POS_ARGS */
 
 /*
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index 79c324d55..fb46c1c1a 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -40,7 +40,7 @@ vprintf (const char *fmt,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(viprintf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf"))));
+viprintf (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -56,6 +56,6 @@ _vprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_viprintf_r, (struct _reent *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vprintf_r"))));
+_viprintf_r (struct _reent *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vprintf_r")));
 #endif
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index be329ded4..bbbbd0a83 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -41,7 +41,7 @@ vscanf (const char *fmt,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(viscanf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf"))));
+viscanf (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -57,6 +57,6 @@ _vscanf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_viscanf_r, (struct _reent *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vscanf_r"))));
+_viscanf_r (struct _reent *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vscanf_r")));
 #endif
diff --git a/newlib/libc/stdio/vsnprintf.c b/newlib/libc/stdio/vsnprintf.c
index 02b5443bf..bcaffa30f 100644
--- a/newlib/libc/stdio/vsnprintf.c
+++ b/newlib/libc/stdio/vsnprintf.c
@@ -42,8 +42,8 @@ vsnprintf (char *__restrict str,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vsnprintf"))));
+vsniprintf (char *, size_t, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vsnprintf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -77,6 +77,6 @@ _vsnprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_vsniprintf_r, (struct _reent *, char *, size_t, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vsnprintf_r"))));
+_vsniprintf_r (struct _reent *, char *, size_t, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vsnprintf_r")));
 #endif
diff --git a/newlib/libc/stdio/vsprintf.c b/newlib/libc/stdio/vsprintf.c
index 7344a3854..823cacb56 100644
--- a/newlib/libc/stdio/vsprintf.c
+++ b/newlib/libc/stdio/vsprintf.c
@@ -40,8 +40,8 @@ vsprintf (char *__restrict str,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(vsiprintf, (char *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vsprintf"))));
+vsiprintf (char *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vsprintf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -66,6 +66,6 @@ _vsprintf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_vsiprintf_r, (struct _reent *, char *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vsprintf_r"))));
+_vsiprintf_r (struct _reent *, char *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vsprintf_r")));
 #endif
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 61c65cd5e..97c7bae80 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -44,8 +44,8 @@ vsscanf (const char *__restrict str,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(vsiscanf, (const char *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("vsscanf"))));
+vsiscanf (const char *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("vsscanf")));
 #endif
 
 #endif /* !_REENT_ONLY */
@@ -70,6 +70,6 @@ _vsscanf_r (struct _reent *ptr,
 
 #ifdef _NANO_FORMATTED_IO
 int
-_EXFUN(_vsiscanf_r, (struct _reent *, const char *, const char *, __VALIST)
-       _ATTRIBUTE ((__alias__("_vsscanf_r"))));
+_vsiscanf_r (struct _reent *, const char *, const char *, __VALIST)
+       _ATTRIBUTE ((__alias__("_vsscanf_r")));
 #endif