[Glibc-bsd-commits] r2036 - in trunk/glibc-ports/kfreebsd: . i386 sys
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Sat Nov 17 07:22:52 UTC 2007
Author: ps-guest
Date: 2007-11-17 07:22:52 +0000 (Sat, 17 Nov 2007)
New Revision: 2036
Modified:
trunk/glibc-ports/kfreebsd/Versions
trunk/glibc-ports/kfreebsd/ftruncate.c
trunk/glibc-ports/kfreebsd/i386/sys_lseek.S
trunk/glibc-ports/kfreebsd/lseek.c
trunk/glibc-ports/kfreebsd/mmap.c
trunk/glibc-ports/kfreebsd/pread.c
trunk/glibc-ports/kfreebsd/pwrite.c
trunk/glibc-ports/kfreebsd/sys/syscall.h
trunk/glibc-ports/kfreebsd/syscalls.list
trunk/glibc-ports/kfreebsd/truncate.c
Log:
* prepare syscalls.list for upcoming FreeBSD 7.x
Modified: trunk/glibc-ports/kfreebsd/Versions
===================================================================
--- trunk/glibc-ports/kfreebsd/Versions 2007-11-17 07:20:13 UTC (rev 2035)
+++ trunk/glibc-ports/kfreebsd/Versions 2007-11-17 07:22:52 UTC (rev 2036)
@@ -85,18 +85,16 @@
# needed by libpthread.
__clone; __libc_fork; __libc_sigaction;
# needed by libpthread as INLINE_SYSCALL:
- __syscall_fork; __syscall_execve;
+ __syscall_fork;
__syscall_open; __syscall_close;
__syscall_read; __syscall_write;
- __syscall_writev;
__syscall_wait4; __syscall_fcntl;
# needed by librt as INLINE_SYSCALL:
__syscall_clock_getres; __syscall_clock_gettime; __syscall_clock_settime;
# misc fixes for FreeBSD:
- __syscall_lseek; __syscall_pread; __syscall_pwrite;
- __syscall_sigaction; __syscall_fcntl;
- __syscall_bind; __syscall_connect; __syscall_sendto;
- __sigprocmask; __futimes; __ioctl;
+ __syscall_freebsd6_lseek; __syscall_freebsd6_pread; __syscall_freebsd6_pwrite;
+ __syscall_connect; __syscall_sendto;
+ __sigprocmask; __ioctl;
# global variable used in brk()
_end;
}
Modified: trunk/glibc-ports/kfreebsd/ftruncate.c
===================================================================
--- trunk/glibc-ports/kfreebsd/ftruncate.c 2007-11-17 07:20:13 UTC (rev 2035)
+++ trunk/glibc-ports/kfreebsd/ftruncate.c 2007-11-17 07:22:52 UTC (rev 2036)
@@ -23,15 +23,15 @@
/* The real system call has a word of padding before the 64-bit off_t
argument. */
-extern int __syscall_ftruncate (int __fd, int __unused1,
+extern int __syscall_freebsd6_ftruncate (int __fd, int __unused1,
__off_t __length) __THROW;
-libc_hidden_proto (__syscall_ftruncate)
+libc_hidden_proto (__syscall_freebsd6_ftruncate)
int
__ftruncate (int fd, __off_t length)
{
/* We pass 2 arguments in 4 words. */
- return INLINE_SYSCALL (ftruncate, 2, fd, 0, length);
+ return INLINE_SYSCALL (freebsd6_ftruncate, 2, fd, 0, length);
}
weak_alias (__ftruncate, ftruncate)
Modified: trunk/glibc-ports/kfreebsd/i386/sys_lseek.S
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sys_lseek.S 2007-11-17 07:20:13 UTC (rev 2035)
+++ trunk/glibc-ports/kfreebsd/i386/sys_lseek.S 2007-11-17 07:22:52 UTC (rev 2036)
@@ -21,12 +21,12 @@
/* lseek returns a 64-bit result in %eax, %edx. This means that in the
error case we have to set both %eax and %edx to -1. */
-PSEUDO_NOERRNO(__syscall_lseek, lseek, 4)
+PSEUDO_NOERRNO(__syscall_freebsd6_lseek, freebsd6_lseek, 4)
jnb L(no_error)
call SYSCALL_ERROR_LABEL;
orl $-1, %edx;
L(pseudo_end):
L(no_error):
ret
-PSEUDO_END(__syscall_lseek)
-libc_hidden_def (__syscall_lseek)
+PSEUDO_END(__syscall_freebsd6_lseek)
+libc_hidden_def (__syscall_freebsd6_lseek)
Modified: trunk/glibc-ports/kfreebsd/lseek.c
===================================================================
--- trunk/glibc-ports/kfreebsd/lseek.c 2007-11-17 07:20:13 UTC (rev 2035)
+++ trunk/glibc-ports/kfreebsd/lseek.c 2007-11-17 07:22:52 UTC (rev 2036)
@@ -24,16 +24,16 @@
/* The real system call has a word of padding before the 64-bit off_t
argument. */
-extern __off_t __syscall_lseek (int __fd, int __unused1, __off_t __offset,
+extern __off_t __syscall_freebsd6_lseek (int __fd, int __unused1, __off_t __offset,
int __whence) __THROW;
-libc_hidden_proto (__syscall_lseek)
+libc_hidden_proto (__syscall_freebsd6_lseek)
__off_t
__libc_lseek (int fd, __off_t offset, int whence)
{
#if 0 /* If the kernel would work right... */
/* We pass 3 arguments in 5 words. */
- return INLINE_SYSCALL (lseek, 3, fd, 0, offset, whence);
+ return INLINE_SYSCALL (freebsd6_lseek, 3, fd, 0, offset, whence);
#else
/* According to POSIX:2001, if the resulting file offset would become
negative, this function has to return an EINVAL error and leave the
@@ -41,7 +41,7 @@
so we emulate it. */
if (offset >= 0)
/* No risk that the file offset could become negative. */
- return INLINE_SYSCALL (lseek, 3, fd, 0, offset, whence);
+ return INLINE_SYSCALL (freebsd6_lseek, 3, fd, 0, offset, whence);
else
{
/* Test whether the file offset becomes negative. */
@@ -50,9 +50,9 @@
int saved_errno;
saved_errno = errno;
- old_position = INLINE_SYSCALL (lseek, 3, fd, 0, 0, SEEK_CUR);
+ old_position = INLINE_SYSCALL (freebsd6_lseek, 3, fd, 0, 0, SEEK_CUR);
errno = 0;
- new_position = INLINE_SYSCALL (lseek, 3, fd, 0, offset, whence);
+ new_position = INLINE_SYSCALL (freebsd6_lseek, 3, fd, 0, offset, whence);
if (new_position < 0)
{
if (errno == 0)
@@ -60,7 +60,7 @@
/* The file offset became negative, and the kernel didn't
notice it. */
if (old_position >= 0)
- INLINE_SYSCALL (lseek, 3, fd, 0, old_position, SEEK_SET);
+ INLINE_SYSCALL (freebsd6_lseek, 3, fd, 0, old_position, SEEK_SET);
new_position = -1;
errno = EINVAL;
}
Modified: trunk/glibc-ports/kfreebsd/mmap.c
===================================================================
--- trunk/glibc-ports/kfreebsd/mmap.c 2007-11-17 07:20:13 UTC (rev 2035)
+++ trunk/glibc-ports/kfreebsd/mmap.c 2007-11-17 07:22:52 UTC (rev 2036)
@@ -25,15 +25,15 @@
/* The real system call has a word of padding before the 64-bit off_t
argument. */
-extern void *__syscall_mmap (void *__addr, size_t __len, int __prot,
+extern void *__syscall_freebsd6_mmap (void *__addr, size_t __len, int __prot,
int __flags, int __fd, int __unused1,
__off_t __offset) __THROW;
-libc_hidden_proto (__syscall_mmap)
+libc_hidden_proto (__syscall_freebsd6_mmap)
-extern ssize_t __syscall_pread (int __fd, void *__buf, size_t __nbytes,
+extern ssize_t __syscall_freebsd6_pread (int __fd, void *__buf, size_t __nbytes,
int __unused1, __off_t __offset) __THROW;
-libc_hidden_proto (__syscall_pread)
+libc_hidden_proto (__syscall_freebsd6_pread)
void *
__mmap (void *addr, size_t len, int prot, int flags, int fd, __off_t offset)
{
@@ -60,8 +60,8 @@
/* We pass 7 arguments in 8 words. */
/* for ANON mapping we must pass -1 in place of fd */
if (flags & MAP_ANON)
- return INLINE_SYSCALL (mmap, 7, addr, len, prot, flags, -1, 0, offset);
- result = INLINE_SYSCALL (mmap, 7, addr, len, prot, flags, fd, 0, offset);
+ return INLINE_SYSCALL (freebsd6_mmap, 7, addr, len, prot, flags, -1, 0, offset);
+ result = INLINE_SYSCALL (freebsd6_mmap, 7, addr, len, prot, flags, fd, 0, offset);
if (result != (void *) (-1) && fd >= 0 && len > 0)
{
@@ -71,7 +71,7 @@
do it here. */
char dummy;
- INLINE_SYSCALL (pread, 5, fd, &dummy, 1, 0, offset);
+ INLINE_SYSCALL (freebsd6_pread, 5, fd, &dummy, 1, 0, offset);
}
return result;
Modified: trunk/glibc-ports/kfreebsd/pread.c
===================================================================
--- trunk/glibc-ports/kfreebsd/pread.c 2007-11-17 07:20:13 UTC (rev 2035)
+++ trunk/glibc-ports/kfreebsd/pread.c 2007-11-17 07:22:52 UTC (rev 2036)
@@ -24,19 +24,19 @@
/* The real system call has a word of padding before the 64-bit off_t
argument. */
-extern ssize_t __syscall_pread (int __fd, void *__buf, size_t __nbytes,
+extern ssize_t __syscall_freebsd6_pread (int __fd, void *__buf, size_t __nbytes,
int __unused1, __off_t __offset) __THROW;
-libc_hidden_proto(__syscall_pread)
+libc_hidden_proto(__syscall_freebsd6_pread)
ssize_t
__libc_pread (int fd, void *buf, size_t nbytes, __off_t offset)
{
/* We pass 5 arguments in 6 words. */
if (SINGLE_THREAD_P)
- return INLINE_SYSCALL (pread, 5, fd, buf, nbytes, 0, offset);
+ return INLINE_SYSCALL (freebsd6_pread, 5, fd, buf, nbytes, 0, offset);
int oldtype = LIBC_CANCEL_ASYNC ();
- ssize_t result = INLINE_SYSCALL (pread, 5, fd, buf, nbytes, 0, offset);
+ ssize_t result = INLINE_SYSCALL (freebsd6_pread, 5, fd, buf, nbytes, 0, offset);
LIBC_CANCEL_RESET (oldtype);
return result;
}
Modified: trunk/glibc-ports/kfreebsd/pwrite.c
===================================================================
--- trunk/glibc-ports/kfreebsd/pwrite.c 2007-11-17 07:20:13 UTC (rev 2035)
+++ trunk/glibc-ports/kfreebsd/pwrite.c 2007-11-17 07:22:52 UTC (rev 2036)
@@ -24,19 +24,19 @@
/* The real system call has a word of padding before the 64-bit off_t
argument. */
-extern ssize_t __syscall_pwrite (int __fd, const void *__buf, size_t __nbytes,
+extern ssize_t __syscall_freebsd6_pwrite (int __fd, const void *__buf, size_t __nbytes,
int __unused1, __off_t __offset) __THROW;
-libc_hidden_proto(__syscall_pwrite)
+libc_hidden_proto(__syscall_freebsd6_pwrite)
ssize_t
__libc_pwrite (int fd, const void *buf, size_t nbytes, __off_t offset)
{
/* We pass 5 arguments in 6 words. */
if (SINGLE_THREAD_P)
- return INLINE_SYSCALL (pwrite, 5, fd, buf, nbytes, 0, offset);
+ return INLINE_SYSCALL (freebsd6_pwrite, 5, fd, buf, nbytes, 0, offset);
int oldtype = LIBC_CANCEL_ASYNC ();
- ssize_t result = INLINE_SYSCALL (pwrite, 5, fd, buf, nbytes, 0, offset);
+ ssize_t result = INLINE_SYSCALL (freebsd6_pwrite, 5, fd, buf, nbytes, 0, offset);
LIBC_CANCEL_RESET (oldtype);
return result;
}
Modified: trunk/glibc-ports/kfreebsd/sys/syscall.h
===================================================================
--- trunk/glibc-ports/kfreebsd/sys/syscall.h 2007-11-17 07:20:13 UTC (rev 2035)
+++ trunk/glibc-ports/kfreebsd/sys/syscall.h 2007-11-17 07:22:52 UTC (rev 2036)
@@ -37,7 +37,7 @@
#define SYS_chmod 15
#define SYS_chown 16
#define SYS_obreak 17
- /* 18 is old getfsstat */
+#define SYS_freebsd4_getfsstat 18
/* 19 is old lseek */
#define SYS_getpid 20
#define SYS_mount 21
@@ -169,8 +169,8 @@
/* 150 is old getsockname */
#define SYS_nfssvc 155
/* 156 is old getdirentries */
- /* 157 is old statfs */
- /* 158 is old fstatfs */
+#define SYS_freebsd4_statfs 157
+#define SYS_freebsd4_fstatfs 158
#define SYS_lgetfh 160
#define SYS_getfh 161
#define SYS_getdomainname 162
@@ -181,8 +181,8 @@
#define SYS_semsys 169
#define SYS_msgsys 170
#define SYS_shmsys 171
-#define SYS_pread 173
-#define SYS_pwrite 174
+#define SYS_freebsd6_pread 173
+#define SYS_freebsd6_pwrite 174
#define SYS_ntp_adjtime 176
#define SYS_setgid 181
#define SYS_setegid 182
@@ -195,11 +195,11 @@
#define SYS_getrlimit 194
#define SYS_setrlimit 195
#define SYS_getdirentries 196
-#define SYS_mmap 197
+#define SYS_freebsd6_mmap 197
#define SYS___syscall 198
-#define SYS_lseek 199
-#define SYS_truncate 200
-#define SYS_ftruncate 201
+#define SYS_freebsd6_lseek 199
+#define SYS_freebsd6_truncate 200
+#define SYS_freebsd6_ftruncate 201
#define SYS_sysctl 202
#define SYS_mlock 203
#define SYS_munlock 204
@@ -221,12 +221,21 @@
#define SYS_clock_gettime 232
#define SYS_clock_settime 233
#define SYS_clock_getres 234
+#define SYS_ktimer_create 235
+#define SYS_ktimer_delete 236
+#define SYS_ktimer_settime 237
+#define SYS_ktimer_gettime 238
+#define SYS_ktimer_getoverrun 239
#define SYS_nanosleep 240
+#define SYS_ntp_gettime 248
#define SYS_minherit 250
#define SYS_rfork 251
#define SYS_openbsd_poll 252
#define SYS_issetugid 253
#define SYS_lchown 254
+#define SYS_aio_read 255
+#define SYS_aio_write 256
+#define SYS_lio_listio 257
#define SYS_getdents 272
#define SYS_lchmod 274
#define SYS_netbsd_lchown 275
@@ -237,7 +246,7 @@
#define SYS_nlstat 280
#define SYS_preadv 289
#define SYS_pwritev 290
- /* 297 is old fhstatfs */
+#define SYS_freebsd4_fhstatfs 297
#define SYS_fhopen 298
#define SYS_fhstat 299
#define SYS_modnext 300
@@ -258,9 +267,9 @@
#define SYS_aio_suspend 315
#define SYS_aio_cancel 316
#define SYS_aio_error 317
-#define SYS_aio_read 318
-#define SYS_aio_write 319
-#define SYS_lio_listio 320
+#define SYS_oaio_read 318
+#define SYS_oaio_write 319
+#define SYS_olio_listio 320
#define SYS_yield 321
/* 322 is obsolete thr_sleep */
/* 323 is obsolete thr_wakeup */
@@ -276,14 +285,14 @@
#define SYS_sched_get_priority_min 333
#define SYS_sched_rr_get_interval 334
#define SYS_utrace 335
- /* 336 is old sendfile */
+#define SYS_freebsd4_sendfile 336
#define SYS_kldsym 337
#define SYS_jail 338
#define SYS_sigprocmask 340
#define SYS_sigsuspend 341
- /* 342 is old sigaction */
+#define SYS_freebsd4_sigaction 342
#define SYS_sigpending 343
- /* 344 is old sigreturn */
+#define SYS_freebsd4_sigreturn 344
#define SYS_sigtimedwait 345
#define SYS_sigwaitinfo 346
#define SYS_acl_get_file 347
Modified: trunk/glibc-ports/kfreebsd/syscalls.list
===================================================================
--- trunk/glibc-ports/kfreebsd/syscalls.list 2007-11-17 07:20:13 UTC (rev 2035)
+++ trunk/glibc-ports/kfreebsd/syscalls.list 2007-11-17 07:22:52 UTC (rev 2036)
@@ -31,7 +31,7 @@
sys_fstatfs - fstatfs i:ip __syscall_fstatfs
sys_fhstatfs - fhstatfs i:pp __syscall_fhstatfs
sys_fstat - fstat i:ip __syscall_fstat
-sys_ftruncate - ftruncate i:iii __syscall_ftruncate
+sys_ftruncate - freebsd6_ftruncate i:iii __syscall_freebsd6_ftruncate
futimes - futimes i:ip __futimes futimes
sys_getcwd - getcwd i:bn __syscall_getcwd
sys_getdents - getdents i:ibn __syscall_getdents
@@ -58,7 +58,7 @@
lchmod - lchmod i:si lchmod
lchown - lchown i:sii __lchown lchown
sys_lio_listio - lio_listio i:ibnP __syscall_lio_listio
-sys_lseek - lseek i:iiii __syscall_lseek
+sys_lseek - freebsd6_lseek i:iiii __syscall_freebsd6_lseek
sys_lstat - lstat i:sp __syscall_lstat
lutimes - lutimes i:sp __lutimes lutimes
posix_madvise - madvise i:pii posix_madvise
@@ -68,7 +68,7 @@
mlockall - mlockall i:i mlockall
mkfifo - mkfifo i:si __mkfifo mkfifo
sys_mknod - mknod i:sii __syscall_mknod
-sys_mmap - mmap b:aniiiii __syscall_mmap
+sys_mmap - freebsd6_mmap b:aniiiii __syscall_freebsd6_mmap
sys_munmap munmap munmap i:pi __syscall_munmap
modfind - modfind i:s modfind
modfnext - modfnext i:i modfnext
@@ -90,9 +90,9 @@
obreak - obreak i:a __syscall_obreak
sys_open - open i:siv __syscall_open
poll - poll Ci:pii __poll poll
-sys_pread - pread i:ibnii __syscall_pread
+sys_pread - freebsd6_pread i:ibnii __syscall_freebsd6_pread
sys_ptrace - ptrace i:iipi __syscall_ptrace
-sys_pwrite - pwrite i:ibnii __syscall_pwrite
+sys_pwrite - freebsd6_pwrite i:ibnii __syscall_freebsd6_pwrite
quotactl - quotactl i:siip quotactl
sys_readv - readv i:ipi __syscall_readv
rfork - rfork i:i __rfork rfork
@@ -130,7 +130,7 @@
sys_stat - stat i:sp __syscall_stat
sysarch - sysarch i:ip __sysarch sysarch
sysctl - sysctl i:pibNbn __sysctl sysctl
-sys_truncate - truncate i:sii __syscall_truncate
+sys_truncate - freebsd6_truncate i:sii __syscall_freebsd6_truncate
undelete - undelete i:s undelete
unmount - unmount i:si unmount
utrace - utrace i:bn utrace
Modified: trunk/glibc-ports/kfreebsd/truncate.c
===================================================================
--- trunk/glibc-ports/kfreebsd/truncate.c 2007-11-17 07:20:13 UTC (rev 2035)
+++ trunk/glibc-ports/kfreebsd/truncate.c 2007-11-17 07:22:52 UTC (rev 2036)
@@ -23,15 +23,15 @@
/* The real system call has a word of padding before the 64-bit off_t
argument. */
-extern int __syscall_truncate (const char *__file, int __unused1,
+extern int __syscall_freebsd6_truncate (const char *__file, int __unused1,
__off_t __length) __THROW;
-libc_hidden_proto (__syscall_truncate)
+libc_hidden_proto (__syscall_freebsd6_truncate)
int
__truncate (const char *file, __off_t length)
{
/* We pass 2 arguments in 4 words. */
- return INLINE_SYSCALL (truncate, 2, file, 0, length);
+ return INLINE_SYSCALL (freebsd6_truncate, 2, file, 0, length);
}
weak_alias (__truncate, truncate)
More information about the Glibc-bsd-commits
mailing list