From de47eb59bb829423b1d0f47ba13099073999b3cb Mon Sep 17 00:00:00 2001
From: Nicolas Planel <nplanel@mandriva.com>
Date: Wed, 29 Oct 2003 16:07:11 +0000
Subject: Corporate Server 2.1.1 release

---
 mdk-stage1/dietlibc/syscalls.s/__pread.S    | 2 +-
 mdk-stage1/dietlibc/syscalls.s/_llseek.S    | 4 ++++
 mdk-stage1/dietlibc/syscalls.s/fstat64.S    | 2 ++
 mdk-stage1/dietlibc/syscalls.s/getdents64.S | 1 +
 mdk-stage1/dietlibc/syscalls.s/getresuid.S  | 4 ++--
 mdk-stage1/dietlibc/syscalls.s/ioperm.S     | 2 ++
 mdk-stage1/dietlibc/syscalls.s/ipc.S        | 2 ++
 mdk-stage1/dietlibc/syscalls.s/lstat64.S    | 2 ++
 mdk-stage1/dietlibc/syscalls.s/nice.S       | 2 ++
 mdk-stage1/dietlibc/syscalls.s/pause.S      | 2 ++
 mdk-stage1/dietlibc/syscalls.s/sendfile.S   | 2 +-
 mdk-stage1/dietlibc/syscalls.s/setresgid.S  | 4 ++--
 mdk-stage1/dietlibc/syscalls.s/setresuid.S  | 4 ++--
 mdk-stage1/dietlibc/syscalls.s/socketcall.S | 2 ++
 mdk-stage1/dietlibc/syscalls.s/stat64.S     | 2 ++
 mdk-stage1/dietlibc/syscalls.s/stime.S      | 2 ++
 mdk-stage1/dietlibc/syscalls.s/syslog.S     | 2 +-
 mdk-stage1/dietlibc/syscalls.s/time.S       | 2 ++
 mdk-stage1/dietlibc/syscalls.s/umount2.S    | 2 ++
 mdk-stage1/dietlibc/syscalls.s/waitpid.S    | 2 ++
 20 files changed, 38 insertions(+), 9 deletions(-)

(limited to 'mdk-stage1/dietlibc/syscalls.s')

diff --git a/mdk-stage1/dietlibc/syscalls.s/__pread.S b/mdk-stage1/dietlibc/syscalls.s/__pread.S
index ad47c7873..ae2068352 100644
--- a/mdk-stage1/dietlibc/syscalls.s/__pread.S
+++ b/mdk-stage1/dietlibc/syscalls.s/__pread.S
@@ -1,3 +1,3 @@
 #include "syscalls.h"
 
-syscall_weak(pread,__pread,__libc__pread)
+syscall(pread,__pread)
diff --git a/mdk-stage1/dietlibc/syscalls.s/_llseek.S b/mdk-stage1/dietlibc/syscalls.s/_llseek.S
index 3e240d822..68d021168 100644
--- a/mdk-stage1/dietlibc/syscalls.s/_llseek.S
+++ b/mdk-stage1/dietlibc/syscalls.s/_llseek.S
@@ -1,3 +1,7 @@
 #include "syscalls.h"
 
+#ifdef __NR__llseek
+.global llseek
+llseek:
 syscall(_llseek,_llseek)
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/fstat64.S b/mdk-stage1/dietlibc/syscalls.s/fstat64.S
index 0c7a41609..f034ddf5b 100644
--- a/mdk-stage1/dietlibc/syscalls.s/fstat64.S
+++ b/mdk-stage1/dietlibc/syscalls.s/fstat64.S
@@ -1,8 +1,10 @@
 #include "dietfeatures.h"
 #include "syscalls.h"
 
+#ifdef __NR_fstat64
 #ifdef WANT_LARGEFILE_BACKCOMPAT
 syscall(fstat64,__dietlibc_fstat64)
 #else
 syscall(fstat64,fstat64)
 #endif
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/getdents64.S b/mdk-stage1/dietlibc/syscalls.s/getdents64.S
index 16859addf..691d8f650 100644
--- a/mdk-stage1/dietlibc/syscalls.s/getdents64.S
+++ b/mdk-stage1/dietlibc/syscalls.s/getdents64.S
@@ -1,3 +1,4 @@
+#include "dietfeatures.h"
 #include "syscalls.h"
 
 #ifdef __NR_getdents64
diff --git a/mdk-stage1/dietlibc/syscalls.s/getresuid.S b/mdk-stage1/dietlibc/syscalls.s/getresuid.S
index 62f6d764f..95c5505a8 100644
--- a/mdk-stage1/dietlibc/syscalls.s/getresuid.S
+++ b/mdk-stage1/dietlibc/syscalls.s/getresuid.S
@@ -1,7 +1,7 @@
 #include "syscalls.h"
 
-#ifdef __getresuid
+#ifdef __NR_getresuid
 
-syscall(getresuid)
+syscall(getresuid,getresuid)
 
 #endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/ioperm.S b/mdk-stage1/dietlibc/syscalls.s/ioperm.S
index 0acfde07a..74a51fc4b 100644
--- a/mdk-stage1/dietlibc/syscalls.s/ioperm.S
+++ b/mdk-stage1/dietlibc/syscalls.s/ioperm.S
@@ -1,3 +1,5 @@
 #include "syscalls.h"
 
+#ifdef __NR_ioperm
 syscall(ioperm,ioperm)
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/ipc.S b/mdk-stage1/dietlibc/syscalls.s/ipc.S
index 40479400d..476878e52 100644
--- a/mdk-stage1/dietlibc/syscalls.s/ipc.S
+++ b/mdk-stage1/dietlibc/syscalls.s/ipc.S
@@ -1,3 +1,5 @@
 #include "syscalls.h"
 
+#ifdef __NR_ipc
 syscall(ipc,__ipc)
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/lstat64.S b/mdk-stage1/dietlibc/syscalls.s/lstat64.S
index 33fd5ab94..021cb0578 100644
--- a/mdk-stage1/dietlibc/syscalls.s/lstat64.S
+++ b/mdk-stage1/dietlibc/syscalls.s/lstat64.S
@@ -1,8 +1,10 @@
 #include "dietfeatures.h"
 #include "syscalls.h"
 
+#ifdef __NR_lstat64
 #ifdef WANT_LARGEFILE_BACKCOMPAT
 syscall(lstat64,__dietlibc_lstat64)
 #else
 syscall(lstat64,lstat64)
 #endif
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/nice.S b/mdk-stage1/dietlibc/syscalls.s/nice.S
index 7d3f740b2..4dad30edb 100644
--- a/mdk-stage1/dietlibc/syscalls.s/nice.S
+++ b/mdk-stage1/dietlibc/syscalls.s/nice.S
@@ -1,3 +1,5 @@
 #include "syscalls.h"
 
+#ifdef __NR_nice
 syscall(nice,nice)
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/pause.S b/mdk-stage1/dietlibc/syscalls.s/pause.S
index cdf42cabd..d154f1538 100644
--- a/mdk-stage1/dietlibc/syscalls.s/pause.S
+++ b/mdk-stage1/dietlibc/syscalls.s/pause.S
@@ -1,3 +1,5 @@
 #include "syscalls.h"
 
+#ifdef __NR_pause
 syscall_weak(pause,pause,__libc_pause)
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/sendfile.S b/mdk-stage1/dietlibc/syscalls.s/sendfile.S
index 12d6195dd..4dcb0ef69 100644
--- a/mdk-stage1/dietlibc/syscalls.s/sendfile.S
+++ b/mdk-stage1/dietlibc/syscalls.s/sendfile.S
@@ -3,4 +3,4 @@
 
 syscall_weak(sendfile,sendfile,__libc_sendfile)
 
-link_warning(sendfile,"sendfile is not portable and does not support large files")
+link_warning(sendfile,"sendfile is not portable")
diff --git a/mdk-stage1/dietlibc/syscalls.s/setresgid.S b/mdk-stage1/dietlibc/syscalls.s/setresgid.S
index 64cbac94e..2277cbaf4 100644
--- a/mdk-stage1/dietlibc/syscalls.s/setresgid.S
+++ b/mdk-stage1/dietlibc/syscalls.s/setresgid.S
@@ -1,7 +1,7 @@
 #include "syscalls.h"
 
-#ifdef __setresgid
+#ifdef __NR_setresgid
 
-syscall(setresgid)
+syscall(setresgid,setresgid)
 
 #endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/setresuid.S b/mdk-stage1/dietlibc/syscalls.s/setresuid.S
index 20b6abee9..cd322b77e 100644
--- a/mdk-stage1/dietlibc/syscalls.s/setresuid.S
+++ b/mdk-stage1/dietlibc/syscalls.s/setresuid.S
@@ -1,7 +1,7 @@
 #include "syscalls.h"
 
-#ifdef __setresuid
+#ifdef __NR_setresuid
 
-syscall(setresuid)
+syscall(setresuid,setresuid)
 
 #endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/socketcall.S b/mdk-stage1/dietlibc/syscalls.s/socketcall.S
index 5837c049a..b97b37f0c 100644
--- a/mdk-stage1/dietlibc/syscalls.s/socketcall.S
+++ b/mdk-stage1/dietlibc/syscalls.s/socketcall.S
@@ -1,3 +1,5 @@
 #include "syscalls.h"
 
+#ifdef __NR_socketcall
 syscall(socketcall,socketcall)
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/stat64.S b/mdk-stage1/dietlibc/syscalls.s/stat64.S
index 734fcab20..7dc54d955 100644
--- a/mdk-stage1/dietlibc/syscalls.s/stat64.S
+++ b/mdk-stage1/dietlibc/syscalls.s/stat64.S
@@ -1,8 +1,10 @@
 #include "dietfeatures.h"
 #include "syscalls.h"
 
+#ifdef __NR_stat64
 #ifdef WANT_LARGEFILE_BACKCOMPAT
 syscall(stat64,__dietlibc_stat64)
 #else
 syscall(stat64,stat64)
 #endif
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/stime.S b/mdk-stage1/dietlibc/syscalls.s/stime.S
index 9d9f5bf0a..281809c27 100644
--- a/mdk-stage1/dietlibc/syscalls.s/stime.S
+++ b/mdk-stage1/dietlibc/syscalls.s/stime.S
@@ -1,3 +1,5 @@
 #include "syscalls.h"
 
+#ifdef __NR_stime
 syscall(stime,stime)
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/syslog.S b/mdk-stage1/dietlibc/syscalls.s/syslog.S
index 6af3c4eac..4ebd81a39 100644
--- a/mdk-stage1/dietlibc/syscalls.s/syslog.S
+++ b/mdk-stage1/dietlibc/syscalls.s/syslog.S
@@ -1,3 +1,3 @@
 #include "syscalls.h"
 
-syscall(syslog,__syscall_syslog)
+syscall_weak(syslog,__syscall_syslog,klogctl)
diff --git a/mdk-stage1/dietlibc/syscalls.s/time.S b/mdk-stage1/dietlibc/syscalls.s/time.S
index 26c79091c..aa646cfdf 100644
--- a/mdk-stage1/dietlibc/syscalls.s/time.S
+++ b/mdk-stage1/dietlibc/syscalls.s/time.S
@@ -1,3 +1,5 @@
 #include "syscalls.h"
 
+#ifdef __NR_time
 syscall(time,time)
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/umount2.S b/mdk-stage1/dietlibc/syscalls.s/umount2.S
index 4cdd6a200..b27b353ed 100644
--- a/mdk-stage1/dietlibc/syscalls.s/umount2.S
+++ b/mdk-stage1/dietlibc/syscalls.s/umount2.S
@@ -1,3 +1,5 @@
 #include "syscalls.h"
 
+#ifdef __NR_umount2
 syscall(umount2,umount2)
+#endif
diff --git a/mdk-stage1/dietlibc/syscalls.s/waitpid.S b/mdk-stage1/dietlibc/syscalls.s/waitpid.S
index 5cdc18afb..bedc73eb6 100644
--- a/mdk-stage1/dietlibc/syscalls.s/waitpid.S
+++ b/mdk-stage1/dietlibc/syscalls.s/waitpid.S
@@ -1,3 +1,5 @@
 #include "syscalls.h"
 
+#ifdef __NR_waitpid
 syscall_weak(waitpid,waitpid,__libc_waitpid)
+#endif
-- 
cgit v1.2.1