[Glibc-bsd-commits] r4045 - in trunk/glibc-ports/kfreebsd: bits sys

Robert Millan rmh at alioth.debian.org
Tue Jan 31 18:54:58 UTC 2012


Author: rmh
Date: 2012-01-31 18:54:58 +0000 (Tue, 31 Jan 2012)
New Revision: 4045

Modified:
   trunk/glibc-ports/kfreebsd/bits/errno.h
   trunk/glibc-ports/kfreebsd/sys/syscall.h
Log:
Resync with FreeBSD.

Modified: trunk/glibc-ports/kfreebsd/bits/errno.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/errno.h	2012-01-31 18:53:51 UTC (rev 4044)
+++ trunk/glibc-ports/kfreebsd/bits/errno.h	2012-01-31 18:54:58 UTC (rev 4045)
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * based on $FreeBSD: src/sys/sys/errno.h,v 1.28 2005/04/02 12:33:28 das Exp $
+ * $FreeBSD$
  */
 
 #ifdef _ERRNO_H
@@ -149,16 +149,27 @@
 #define	EILSEQ		86		/* Illegal byte sequence */
 #define	ENOATTR		87		/* Attribute not found */
 
-#define EDOOFUS		88		/* Programming error */
+#define	EDOOFUS		88		/* Programming error */
 
 #define	EBADMSG		89		/* Bad message */
 #define	EMULTIHOP	90		/* Multihop attempted */
 #define	ENOLINK		91		/* Link has been severed */
 #define	EPROTO		92		/* Protocol error */
+
 #define	ENOTCAPABLE	93		/* Capabilities insufficient */
 
 #define	ELAST		93		/* Must be equal largest errno */
 
+#ifdef _KERNEL
+/* pseudo-errors returned inside kernel to modify return to process */
+#define	ERESTART	(-1)		/* restart syscall */
+#define	EJUSTRETURN	(-2)		/* don't modify regs, just return */
+#define	ENOIOCTL	(-3)		/* ioctl not handled by this layer */
+#define	EDIRIOCTL	(-4)		/* do direct ioctl in GEOM */
+#endif
+
+#endif
+
 # ifndef __ASSEMBLER__
 /* Function to get address of global `errno' variable.  */
 extern int *__errno_location (void) __THROW __attribute__ ((__const__));

Modified: trunk/glibc-ports/kfreebsd/sys/syscall.h
===================================================================
--- trunk/glibc-ports/kfreebsd/sys/syscall.h	2012-01-31 18:53:51 UTC (rev 4044)
+++ trunk/glibc-ports/kfreebsd/sys/syscall.h	2012-01-31 18:54:58 UTC (rev 4045)
@@ -1,24 +1,14 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
 #ifndef _SYSCALL_H
 #define _SYSCALL_H	1
 
+/*
+ * System call numbers.
+ *
+ * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
+ * created from FreeBSD: head/sys/kern/syscalls.master 224987 2011-08-18 22:51:30Z jonathan 
+ */
+
 #define	SYS_syscall	0
 #define	SYS_exit	1
 #define	SYS_fork	2
@@ -36,7 +26,7 @@
 #define	SYS_mknod	14
 #define	SYS_chmod	15
 #define	SYS_chown	16
-#define	SYS_obreak	17
+#define	SYS_break	17
 #define	SYS_freebsd4_getfsstat	18
 				/* 19 is old lseek */
 #define	SYS_getpid	20
@@ -166,9 +156,8 @@
 #define	SYS_setsid	147
 #define	SYS_quotactl	148
 				/* 149 is old quota */
-
-#define SYS_nlm_syscall	154
 				/* 150 is old getsockname */
+#define	SYS_nlm_syscall	154
 #define	SYS_nfssvc	155
 				/* 156 is old getdirentries */
 #define	SYS_freebsd4_statfs	157
@@ -185,6 +174,7 @@
 #define	SYS_shmsys	171
 #define	SYS_freebsd6_pread	173
 #define	SYS_freebsd6_pwrite	174
+#define	SYS_setfib	175
 #define	SYS_ntp_adjtime	176
 #define	SYS_setgid	181
 #define	SYS_setegid	182
@@ -202,22 +192,22 @@
 #define	SYS_freebsd6_lseek	199
 #define	SYS_freebsd6_truncate	200
 #define	SYS_freebsd6_ftruncate	201
-#define	SYS_sysctl	202
+#define	SYS___sysctl	202
 #define	SYS_mlock	203
 #define	SYS_munlock	204
 #define	SYS_undelete	205
 #define	SYS_futimes	206
 #define	SYS_getpgid	207
 #define	SYS_poll	209
-#define	SYS_semctl	220
+#define	SYS_freebsd7___semctl	220
 #define	SYS_semget	221
 #define	SYS_semop	222
-#define	SYS_msgctl	224
+#define	SYS_freebsd7_msgctl	224
 #define	SYS_msgget	225
 #define	SYS_msgsnd	226
 #define	SYS_msgrcv	227
 #define	SYS_shmat	228
-#define	SYS_shmctl	229
+#define	SYS_freebsd7_shmctl	229
 #define	SYS_shmdt	230
 #define	SYS_shmget	231
 #define	SYS_clock_gettime	232
@@ -277,7 +267,7 @@
 				/* 323 is obsolete thr_wakeup */
 #define	SYS_mlockall	324
 #define	SYS_munlockall	325
-#define	SYS_getcwd	326
+#define	SYS___getcwd	326
 #define	SYS_sched_setparam	327
 #define	SYS_sched_getparam	328
 #define	SYS_sched_setscheduler	329
@@ -290,6 +280,7 @@
 #define	SYS_freebsd4_sendfile	336
 #define	SYS_kldsym	337
 #define	SYS_jail	338
+#define	SYS_nnpfs_syscall	339
 #define	SYS_sigprocmask	340
 #define	SYS_sigsuspend	341
 #define	SYS_freebsd4_sigaction	342
@@ -297,14 +288,14 @@
 #define	SYS_freebsd4_sigreturn	344
 #define	SYS_sigtimedwait	345
 #define	SYS_sigwaitinfo	346
-#define	SYS_acl_get_file	347
-#define	SYS_acl_set_file	348
-#define	SYS_acl_get_fd	349
-#define	SYS_acl_set_fd	350
-#define	SYS_acl_delete_file	351
-#define	SYS_acl_delete_fd	352
-#define	SYS_acl_aclcheck_file	353
-#define	SYS_acl_aclcheck_fd	354
+#define	SYS___acl_get_file	347
+#define	SYS___acl_set_file	348
+#define	SYS___acl_get_fd	349
+#define	SYS___acl_set_fd	350
+#define	SYS___acl_delete_file	351
+#define	SYS___acl_delete_fd	352
+#define	SYS___acl_aclcheck_file	353
+#define	SYS___acl_aclcheck_fd	354
 #define	SYS_extattrctl	355
 #define	SYS_extattr_set_file	356
 #define	SYS_extattr_get_file	357
@@ -317,16 +308,17 @@
 #define	SYS_extattr_set_fd	371
 #define	SYS_extattr_get_fd	372
 #define	SYS_extattr_delete_fd	373
-#define	SYS_setugid	374
-#define	SYS_nfsclnt	375
+#define	SYS___setugid	374
+#define SYS_nfsclnt	375
 #define	SYS_eaccess	376
+#define	SYS_afs3_syscall	377
 #define	SYS_nmount	378
-#define	SYS_mac_get_proc	384
-#define	SYS_mac_set_proc	385
-#define	SYS_mac_get_fd	386
-#define	SYS_mac_get_file	387
-#define	SYS_mac_set_fd	388
-#define	SYS_mac_set_file	389
+#define	SYS___mac_get_proc	384
+#define	SYS___mac_set_proc	385
+#define	SYS___mac_get_fd	386
+#define	SYS___mac_get_file	387
+#define	SYS___mac_set_fd	388
+#define	SYS___mac_set_file	389
 #define	SYS_kenv	390
 #define	SYS_lchflags	391
 #define	SYS_uuidgen	392
@@ -345,23 +337,23 @@
 #define	SYS_ksem_unlink	406
 #define	SYS_ksem_getvalue	407
 #define	SYS_ksem_destroy	408
-#define	SYS_mac_get_pid	409
-#define	SYS_mac_get_link	410
-#define	SYS_mac_set_link	411
+#define	SYS___mac_get_pid	409
+#define	SYS___mac_get_link	410
+#define	SYS___mac_set_link	411
 #define	SYS_extattr_set_link	412
 #define	SYS_extattr_get_link	413
 #define	SYS_extattr_delete_link	414
-#define	SYS_mac_execve	415
+#define	SYS___mac_execve	415
 #define	SYS_sigaction	416
 #define	SYS_sigreturn	417
 #define	SYS_getcontext	421
 #define	SYS_setcontext	422
 #define	SYS_swapcontext	423
 #define	SYS_swapoff	424
-#define	SYS_acl_get_link	425
-#define	SYS_acl_set_link	426
-#define	SYS_acl_delete_link	427
-#define	SYS_acl_aclcheck_link	428
+#define	SYS___acl_get_link	425
+#define	SYS___acl_set_link	426
+#define	SYS___acl_delete_link	427
+#define	SYS___acl_aclcheck_link	428
 #define	SYS_sigwait	429
 #define	SYS_thr_create	430
 #define	SYS_thr_exit	431
@@ -437,15 +429,58 @@
 #define	SYS_jail_get	506
 #define	SYS_jail_set	507
 #define	SYS_jail_remove	508
+#define	SYS_closefrom	509
+#define	SYS___semctl	510
+#define	SYS_msgctl	SYS_freebsd7_msgctl
+#define	SYS_shmctl	SYS_freebsd7_shmctl
+#define	SYS_lpathconf	513
+#define	SYS_cap_new	514
+#define	SYS_cap_getrights	515
+#define	SYS_cap_enter	516
+#define	SYS_cap_getmode	517
+#define	SYS_pdfork	518
+#define	SYS_pdkill	519
+#define	SYS_pdgetpid	520
 #define	SYS_pselect	522
-#define SYS_getloginclass	523
-#define SYS_setloginclass	524
-#define SYS_rctl_get_racct	525
-#define SYS_rctl_get_rules	526
-#define SYS_rctl_get_limits	527
-#define SYS_rctl_add_rule	528
-#define SYS_rctl_remove_rule	529
+#define	SYS_getloginclass	523
+#define	SYS_setloginclass	524
+#define	SYS_rctl_get_racct	525
+#define	SYS_rctl_get_rules	526
+#define	SYS_rctl_get_limits	527
+#define	SYS_rctl_add_rule	528
+#define	SYS_rctl_remove_rule	529
 #define SYS_posix_fallocate	530
+#define SYS_posix_fadvise	531
 #define	SYS_MAXSYSCALL	532
 
+#define SYS_obreak	SYS_break
+#define SYS_sysctl	SYS___sysctl
+#define SYS_getcwd	SYS___getcwd
+#define SYS_setugid	SYS___setugid
+#define SYS_semctl	SYS_freebsd7___semctl
+
+#define SYS_acl_get_file	SYS___acl_get_file
+#define SYS_acl_set_file	SYS___acl_set_file
+#define SYS_acl_get_fd		SYS___acl_get_fd
+#define SYS_acl_set_fd		SYS___acl_set_fd
+#define SYS_acl_delete_file	SYS___acl_delete_file
+#define SYS_acl_delete_fd	SYS___acl_delete_fd
+#define SYS_acl_aclcheck_file	SYS___acl_aclcheck_file
+#define SYS_acl_aclcheck_fd	SYS___acl_aclcheck_fd
+#define SYS_acl_get_link	SYS___acl_get_link
+#define SYS_acl_set_link	SYS___acl_set_link
+#define SYS_acl_delete_link	SYS___acl_delete_link
+#define SYS_acl_aclcheck_link	SYS___acl_aclcheck_link
+
+#define SYS_mac_get_proc	SYS___mac_get_proc
+#define SYS_mac_set_proc	SYS___mac_set_proc
+#define SYS_mac_get_fd		SYS___mac_get_fd
+#define SYS_mac_get_file	SYS___mac_get_file
+#define SYS_mac_set_fd		SYS___mac_set_fd
+#define SYS_mac_set_file	SYS___mac_set_file
+#define SYS_mac_get_pid		SYS___mac_get_pid
+#define SYS_mac_get_link	SYS___mac_get_link
+#define SYS_mac_set_link	SYS___mac_set_link
+#define SYS_mac_execve		SYS___mac_execve
+
 #endif




More information about the Glibc-bsd-commits mailing list