18 files changed, 20 insertions, 19 deletions
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c
index ab0e5e6fa..c7a39bd51 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl.c
@@ -48,12 +48,12 @@ int __libc_fcntl(int fd, int cmd, ...)
 }
 libc_hidden_def(__libc_fcntl)
 
-strong_alias(__libc_fcntl,fcntl)
 libc_hidden_proto(fcntl)
+strong_alias(__libc_fcntl,fcntl)
 libc_hidden_def(fcntl)
 #if ! defined __NR_fcntl64 && defined __UCLIBC_HAS_LFS__
 strong_alias(__libc_fcntl,__libc_fcntl64)
-strong_alias(__libc_fcntl,fcntl64)
 libc_hidden_proto(fcntl64)
+strong_alias(__libc_fcntl,fcntl64)
 libc_hidden_def(fcntl64)
 #endif
diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c
index 06aef210d..34ad2d173 100644
--- a/libc/sysdeps/linux/common/__syscall_fcntl64.c
+++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c
@@ -30,7 +30,7 @@ int __libc_fcntl64(int fd, int cmd, ...)
 }
 libc_hidden_def(__libc_fcntl64)
 
-strong_alias(__libc_fcntl64,fcntl64)
 libc_hidden_proto(fcntl64)
+strong_alias(__libc_fcntl64,fcntl64)
 libc_hidden_def(fcntl64)
 #endif
diff --git a/libc/sysdeps/linux/common/close.c b/libc/sysdeps/linux/common/close.c
index 7e5c7e5f7..56b41ec5c 100644
--- a/libc/sysdeps/linux/common/close.c
+++ b/libc/sysdeps/linux/common/close.c
@@ -12,6 +12,6 @@
 
 #define __NR___libc_close __NR_close
 _syscall1(int, __libc_close, int, fd);
-strong_alias(__libc_close,close)
 libc_hidden_proto(close)
+strong_alias(__libc_close,close)
 libc_hidden_def(close)
diff --git a/libc/sysdeps/linux/common/fork.c b/libc/sysdeps/linux/common/fork.c
index e8d16fe17..13c57237c 100644
--- a/libc/sysdeps/linux/common/fork.c
+++ b/libc/sysdeps/linux/common/fork.c
@@ -14,8 +14,8 @@
 #ifdef __NR_fork
 #define __NR___libc_fork __NR_fork
 _syscall0(pid_t, __libc_fork);
-strong_alias(__libc_fork,fork)
 libc_hidden_proto(fork)
+strong_alias(__libc_fork,fork)
 libc_hidden_def(fork)
 #endif
 #endif
diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
index be822d1a1..a51b46c71 100644
--- a/libc/sysdeps/linux/common/fstat.c
+++ b/libc/sysdeps/linux/common/fstat.c
@@ -37,7 +37,7 @@ int fstat(int fd, struct stat *buf)
 libc_hidden_def(fstat)
 
 #if ! defined __NR_fstat64 && defined __UCLIBC_HAS_LFS__
-strong_alias(fstat,fstat64)
 libc_hidden_proto(fstat64)
+strong_alias(fstat,fstat64)
 libc_hidden_def(fstat64)
 #endif
diff --git a/libc/sysdeps/linux/common/getpagesize.c b/libc/sysdeps/linux/common/getpagesize.c
index 44456c0e7..1f2937bb6 100644
--- a/libc/sysdeps/linux/common/getpagesize.c
+++ b/libc/sysdeps/linux/common/getpagesize.c
@@ -43,6 +43,6 @@ int __getpagesize(void)
 #endif	/* NBPG.  */
 #endif	/* EXEC_PAGESIZE.  */
 }
-strong_alias(__getpagesize,getpagesize)
 libc_hidden_proto(getpagesize)
+strong_alias(__getpagesize,getpagesize)
 libc_hidden_def(getpagesize)
diff --git a/libc/sysdeps/linux/common/getpid.c b/libc/sysdeps/linux/common/getpid.c
index ecb29851e..be4c2ad47 100644
--- a/libc/sysdeps/linux/common/getpid.c
+++ b/libc/sysdeps/linux/common/getpid.c
@@ -15,6 +15,6 @@
 #endif
 #define __NR___libc_getpid __NR_getpid
 _syscall0(pid_t, __libc_getpid);
-strong_alias(__libc_getpid, getpid)
 libc_hidden_proto(getpid)
+strong_alias(__libc_getpid, getpid)
 libc_hidden_def(getpid)
diff --git a/libc/sysdeps/linux/common/llseek.c b/libc/sysdeps/linux/common/llseek.c
index 7cfbce8ba..4ebef54ca 100644
--- a/libc/sysdeps/linux/common/llseek.c
+++ b/libc/sysdeps/linux/common/llseek.c
@@ -17,6 +17,7 @@
 # undef __USE_FILE_OFFSET64
 #endif
 #include <errno.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/syscall.h>
 
@@ -44,7 +45,7 @@ loff_t __libc_lseek64(int fd, loff_t offset, int whence)
 	return(loff_t)(__libc_lseek(fd, (off_t) (offset), whence));
 }
 #endif
-strong_alias(__libc_lseek64,lseek64)
 libc_hidden_proto(lseek64)
+strong_alias(__libc_lseek64,lseek64)
 libc_hidden_def(lseek64)
 //strong_alias(__libc_lseek64,_llseek)
diff --git a/libc/sysdeps/linux/common/longjmp.c b/libc/sysdeps/linux/common/longjmp.c
index e4c8713fe..8dc6a6cab 100644
--- a/libc/sysdeps/linux/common/longjmp.c
+++ b/libc/sysdeps/linux/common/longjmp.c
@@ -47,4 +47,4 @@ void __libc_longjmp (sigjmp_buf env, int val)
 strong_alias(__libc_longjmp,longjmp)
 strong_alias(__libc_longjmp,siglongjmp)
 strong_alias(__libc_longjmp,__libc_siglongjmp)
-weak_alias (__libc_longjmp, _longjmp)
+strong_alias(__libc_longjmp,_longjmp)
diff --git a/libc/sysdeps/linux/common/lseek.c b/libc/sysdeps/linux/common/lseek.c
index 022d2f6a0..4e6bd9be6 100644
--- a/libc/sysdeps/linux/common/lseek.c
+++ b/libc/sysdeps/linux/common/lseek.c
@@ -17,6 +17,6 @@ libc_hidden_proto(__libc_lseek)
 _syscall3(__off_t, __libc_lseek, int, fildes, __off_t, offset, int, whence);
 libc_hidden_def(__libc_lseek)
 
-strong_alias(__libc_lseek,lseek)
 libc_hidden_proto(lseek)
+strong_alias(__libc_lseek,lseek)
 libc_hidden_def(lseek)
diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c
index 2c4a86b9d..b654a8fb1 100644
--- a/libc/sysdeps/linux/common/lstat.c
+++ b/libc/sysdeps/linux/common/lstat.c
@@ -38,7 +38,7 @@ int lstat(const char *file_name, struct stat *buf)
 libc_hidden_def(lstat)
 
 #if ! defined __NR_lstat64 && defined __UCLIBC_HAS_LFS__
-strong_alias(lstat,lstat64)
 libc_hidden_proto(lstat64)
+strong_alias(lstat,lstat64)
 libc_hidden_def(lstat64)
 #endif
diff --git a/libc/sysdeps/linux/common/nanosleep.c b/libc/sysdeps/linux/common/nanosleep.c
index c695e827d..b13aaf446 100644
--- a/libc/sysdeps/linux/common/nanosleep.c
+++ b/libc/sysdeps/linux/common/nanosleep.c
@@ -14,6 +14,6 @@
 #define __NR___libc_nanosleep __NR_nanosleep
 _syscall2(int, __libc_nanosleep, const struct timespec *, req,
 		  struct timespec *, rem);
-strong_alias(__libc_nanosleep,nanosleep)
 libc_hidden_proto(nanosleep)
+strong_alias(__libc_nanosleep,nanosleep)
 libc_hidden_def(nanosleep)
diff --git a/libc/sysdeps/linux/common/open.c b/libc/sysdeps/linux/common/open.c
index 1be1f2567..d755f36fa 100644
--- a/libc/sysdeps/linux/common/open.c
+++ b/libc/sysdeps/linux/common/open.c
@@ -38,8 +38,8 @@ int __libc_open(const char *file, int flags, ...)
 }
 libc_hidden_def(__libc_open)
 
-strong_alias(__libc_open,open)
 libc_hidden_proto(open)
+strong_alias(__libc_open,open)
 libc_hidden_def(open)
 
 int creat(const char *file, mode_t mode)
diff --git a/libc/sysdeps/linux/common/open64.c b/libc/sysdeps/linux/common/open64.c
index 97c3d2df9..90837cfe7 100644
--- a/libc/sysdeps/linux/common/open64.c
+++ b/libc/sysdeps/linux/common/open64.c
@@ -33,7 +33,7 @@ int __libc_open64 (const char *file, int oflag, ...)
 
   return __libc_open(file, oflag | O_LARGEFILE, mode);
 }
-strong_alias(__libc_open64,open64)
 libc_hidden_proto(open64)
+strong_alias(__libc_open64,open64)
 libc_hidden_def(open64)
 #endif /* __UCLIBC_HAS_LFS__ */
diff --git a/libc/sysdeps/linux/common/read.c b/libc/sysdeps/linux/common/read.c
index 079bd0eb5..785ea5ffb 100644
--- a/libc/sysdeps/linux/common/read.c
+++ b/libc/sysdeps/linux/common/read.c
@@ -12,6 +12,6 @@
 
 #define __NR___libc_read __NR_read
 _syscall3(ssize_t, __libc_read, int, fd, __ptr_t, buf, size_t, count);
-strong_alias(__libc_read,read)
 libc_hidden_proto(read)
+strong_alias(__libc_read,read)
 libc_hidden_def(read)
diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c
index f0fbccbf0..aeb9f16db 100644
--- a/libc/sysdeps/linux/common/stat.c
+++ b/libc/sysdeps/linux/common/stat.c
@@ -39,7 +39,7 @@ int stat(const char *file_name, struct stat *buf)
 libc_hidden_def(stat)
 
 #if ! defined __NR_stat64 && defined __UCLIBC_HAS_LFS__
-strong_alias(stat,stat64)
 libc_hidden_proto(stat64)
+strong_alias(stat,stat64)
 libc_hidden_def(stat64)
 #endif
diff --git a/libc/sysdeps/linux/common/waitpid.c b/libc/sysdeps/linux/common/waitpid.c
index aeeafc7c5..064b0110c 100644
--- a/libc/sysdeps/linux/common/waitpid.c
+++ b/libc/sysdeps/linux/common/waitpid.c
@@ -16,6 +16,6 @@ __pid_t __libc_waitpid(__pid_t pid, int *wait_stat, int options)
 {
     return wait4(pid, wait_stat, options, NULL);
 }
-strong_alias(__libc_waitpid,waitpid)
 libc_hidden_proto(waitpid)
+strong_alias(__libc_waitpid,waitpid)
 libc_hidden_def(waitpid)
diff --git a/libc/sysdeps/linux/common/write.c b/libc/sysdeps/linux/common/write.c
index e27bfe06f..8a17ae9b9 100644
--- a/libc/sysdeps/linux/common/write.c
+++ b/libc/sysdeps/linux/common/write.c
@@ -12,8 +12,8 @@
 
 #define __NR___libc_write __NR_write
 _syscall3(ssize_t, __libc_write, int, fd, const __ptr_t, buf, size_t, count);
-strong_alias(__libc_write,write)
 libc_hidden_proto(write)
+strong_alias(__libc_write,write)
 libc_hidden_def(write)
 #if 0
 /* Stupid libgcc.a from gcc 2.95.x uses __write in pure.o