diff options
Diffstat (limited to 'hurd')
| -rw-r--r-- | hurd/Makefile | 2 | ||||
| -rw-r--r-- | hurd/hurd.h | 20 | ||||
| -rw-r--r-- | hurd/hurd/ioctl.h | 6 |
3 files changed, 4 insertions, 24 deletions
diff --git a/hurd/Makefile b/hurd/Makefile index 0ef626f5e3..f5b36867a5 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -28,7 +28,7 @@ headers = hurd.h $(interface-headers) \ $(addprefix hurd/,fd.h id.h port.h signal.h userlink.h \ resource.h threadvar.h) -distribute := hurdfault.h intr-rpc.awk intr-rpc.defs STATUS +distribute := hurdstartup.h hurdfault.h intr-rpc.awk intr-rpc.defs STATUS # The RPC interfaces go in a separate library. interface-library := libhurduser diff --git a/hurd/hurd.h b/hurd/hurd.h index b0bbfbea3b..968910fffb 100644 --- a/hurd/hurd.h +++ b/hurd/hurd.h @@ -227,26 +227,6 @@ extern error_t _hurd_exec (task_t task, extern void _hurd_exit (int status) __attribute__ ((noreturn)); -/* Initialize Mach RPCs and essential Hurd things (_hurd_preinit_hook); do - initial handshake with the exec server (or extract the arguments from - the stack in the case of the bootstrap task); if cthreads is in use, - initialize it now and switch the calling thread to a cthread stack; - finally, call *MAIN with the information gleaned. That function is not - expected to return. ARGPTR should be the address of the first argument - of the entry point function that is called with the stack exactly as the - exec server or kernel sets it. */ - -extern void _hurd_startup (void **argptr, - void (*main) (int argc, char **argv, char **envp, - int flags, - mach_port_t *portarray, - mach_msg_type_number_t portarraysize, - int *intarray, - mach_msg_type_number_t intarraysize, - vm_address_t phdr, vm_size_t phdrsz, - vm_address_t user_entry)) - __attribute__ ((noreturn)); - /* Initialize the library data structures from the ints and ports passed to us by the exec server. Then vm_deallocate PORTARRAY and INTARRAY. */ diff --git a/hurd/hurd/ioctl.h b/hurd/hurd/ioctl.h index cc83433c17..518ef51b33 100644 --- a/hurd/hurd/ioctl.h +++ b/hurd/hurd/ioctl.h @@ -52,9 +52,9 @@ extern int hurd_register_ioctl_handler (int first_request, int last_request, avoid `defined but not used' warnings. */ #define _HURD_HANDLE_IOCTLS(handler, first, last) \ - static const struct ioctl_handler handler##_ioctl_handler = \ - { (first), (last), (int (*) (int, int, void *)) (handler), \ - (&(handler), &(handler##_ioctl_handler), NULL) }; \ + static const struct ioctl_handler handler##_ioctl_handler \ + __attribute__ ((__unused__)) = \ + { (first), (last), (int (*) (int, int, void *)) (handler), NULL }; \ text_set_element (_hurd_ioctl_handler_lists, ##handler##_ioctl_handler) /* Define a library-internal handler for a single ioctl command. */ |