8 files changed, 14 insertions, 18 deletions
diff --git a/sysdeps/posix/ttyname.c b/sysdeps/posix/ttyname.c
index 288e22b307..b7497f3976 100644
--- a/sysdeps/posix/ttyname.c
+++ b/sysdeps/posix/ttyname.c
@@ -28,13 +28,12 @@
 char *__ttyname;
 
 static char *getttyname (int fd, dev_t mydev, ino_t myino,
-			 int save, int *dostat) internal_function;
+			 int save, int *dostat);
 
 
 libc_freeres_ptr (static char *getttyname_name);
 
 static char *
-internal_function
 getttyname (int fd, dev_t mydev, ino_t myino, int save, int *dostat)
 {
   static const char dev[] = "/dev";
diff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c
index 56bf18e4bc..2d10bf65d6 100644
--- a/sysdeps/posix/ttyname_r.c
+++ b/sysdeps/posix/ttyname_r.c
@@ -33,10 +33,9 @@ static const char dev[] = "/dev";
 
 static int getttyname_r (int fd, char *buf, size_t buflen,
 			 dev_t mydev, ino_t myino, int save,
-			 int *dostat) __THROW internal_function;
+			 int *dostat) __THROW;
 
 static int
-internal_function
 getttyname_r (int fd, char *buf, size_t buflen, dev_t mydev, ino_t myino,
 	      int save, int *dostat)
 {
diff --git a/sysdeps/unix/sysv/linux/preadv.c b/sysdeps/unix/sysv/linux/preadv.c
index ecabc8c9c6..d03ce8dc5c 100644
--- a/sysdeps/unix/sysv/linux/preadv.c
+++ b/sysdeps/unix/sysv/linux/preadv.c
@@ -33,7 +33,7 @@ preadv (int fd, const struct iovec *vector, int count, off_t offset)
 }
 # else
 static ssize_t __atomic_preadv_replacement (int, const struct iovec *,
-					    int, off_t) internal_function;
+					    int, off_t);
 ssize_t
 preadv (int fd, const struct iovec *vector, int count, off_t offset)
 {
@@ -45,7 +45,7 @@ preadv (int fd, const struct iovec *vector, int count, off_t offset)
 #  endif
   return __atomic_preadv_replacement (fd, vector, count, offset);
 }
-#  define PREADV static internal_function __atomic_preadv_replacement
+#  define PREADV static __atomic_preadv_replacement
 #  define PREAD __pread
 #  define OFF_T off_t
 #  include <sysdeps/posix/preadv_common.c>
diff --git a/sysdeps/unix/sysv/linux/preadv64.c b/sysdeps/unix/sysv/linux/preadv64.c
index c96b2142e3..00997da99c 100644
--- a/sysdeps/unix/sysv/linux/preadv64.c
+++ b/sysdeps/unix/sysv/linux/preadv64.c
@@ -31,7 +31,7 @@ preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
 }
 #else
 static ssize_t __atomic_preadv64_replacement (int, const struct iovec *,
-					      int, off64_t) internal_function;
+					      int, off64_t);
 ssize_t
 preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
 {
@@ -43,7 +43,7 @@ preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
 #endif
   return __atomic_preadv64_replacement (fd, vector, count, offset);
 }
-# define PREADV static internal_function __atomic_preadv64_replacement
+# define PREADV static __atomic_preadv64_replacement
 # define PREAD __pread64
 # define OFF_T off64_t
 # include <sysdeps/posix/preadv_common.c>
diff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c
index 7545cb3e1e..cfe65068ae 100644
--- a/sysdeps/unix/sysv/linux/pwritev.c
+++ b/sysdeps/unix/sysv/linux/pwritev.c
@@ -33,7 +33,7 @@ pwritev (int fd, const struct iovec *vector, int count, off_t offset)
 }
 # else
 static ssize_t __atomic_pwritev_replacement (int, const struct iovec *,
-					     int, off_t) internal_function;
+					     int, off_t);
 ssize_t
 pwritev (int fd, const struct iovec *vector, int count, off_t offset)
 {
@@ -45,7 +45,7 @@ pwritev (int fd, const struct iovec *vector, int count, off_t offset)
 #  endif
   return __atomic_pwritev_replacement (fd, vector, count, offset);
 }
-#  define PWRITEV static internal_function __atomic_pwritev_replacement
+#  define PWRITEV static __atomic_pwritev_replacement
 #  define PWRITE __pwrite
 #  define OFF_T off_t
 #  include <sysdeps/posix/pwritev_common.c>
diff --git a/sysdeps/unix/sysv/linux/pwritev64.c b/sysdeps/unix/sysv/linux/pwritev64.c
index 9dc4e55f96..a7cec4e144 100644
--- a/sysdeps/unix/sysv/linux/pwritev64.c
+++ b/sysdeps/unix/sysv/linux/pwritev64.c
@@ -31,7 +31,7 @@ pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset)
 }
 #else
 static ssize_t __atomic_pwritev64_replacement (int, const struct iovec *,
-					       int, off64_t) internal_function;
+					       int, off64_t);
 ssize_t
 pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset)
 {
@@ -43,7 +43,7 @@ pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset)
 #endif
   return __atomic_pwritev64_replacement (fd, vector, count, offset);
 }
-# define PWRITEV static internal_function __atomic_pwritev64_replacement
+# define PWRITEV static __atomic_pwritev64_replacement
 # define PWRITE __pwrite64
 # define OFF_T off64_t
 # include <sysdeps/posix/pwritev_common.c>
diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c
index 5909cb765f..116cf350e5 100644
--- a/sysdeps/unix/sysv/linux/ttyname.c
+++ b/sysdeps/unix/sysv/linux/ttyname.c
@@ -36,14 +36,12 @@ char *__ttyname;
 #endif
 
 static char *getttyname (const char *dev, dev_t mydev,
-			 ino64_t myino, int save, int *dostat)
-     internal_function;
-
+			 ino64_t myino, int save, int *dostat);
 
 libc_freeres_ptr (static char *getttyname_name);
 
 static char *
-internal_function attribute_compat_text_section
+attribute_compat_text_section
 getttyname (const char *dev, dev_t mydev, ino64_t myino, int save, int *dostat)
 {
   static size_t namelen;
diff --git a/sysdeps/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c
index dc863526ba..18f35ef2b7 100644
--- a/sysdeps/unix/sysv/linux/ttyname_r.c
+++ b/sysdeps/unix/sysv/linux/ttyname_r.c
@@ -32,10 +32,10 @@
 
 static int getttyname_r (char *buf, size_t buflen,
 			 dev_t mydev, ino64_t myino, int save,
-			 int *dostat) internal_function;
+			 int *dostat);
 
 static int
-internal_function attribute_compat_text_section
+attribute_compat_text_section
 getttyname_r (char *buf, size_t buflen, dev_t mydev, ino64_t myino,
 	      int save, int *dostat)
 {