mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-13 12:40:08 +00:00
dc33bef307
This gets rid of a lot of kludge and gets closer to other ports. * hurd/Makefile (headers): Remove threadvar.h. (inline-headers): Remove threadvar.h. * hurd/Versions (GLIBC_2.0: Remove __hurd_sigthread_stack_base, __hurd_sigthread_stack_end, __hurd_sigthread_variables, __hurd_threadvar_max, __hurd_errno_location. (HURD_CTHREADS_0.3): Add pthread_getattr_np, pthread_attr_getstack. * hurd/hurd/signal.h: Do not include <hurd/threadvar.h>. (_hurd_self_sigstate): Use THREAD_SELF to get _hurd_sigstate. (_HURD_SIGNAL_H_EXTERN_INLINE): Use THREAD_SELF to get _hurd_sigstate, unless TLS is not initialized yet, in which case we do not need a critical section yet anyway. * hurd/hurd/threadvar.h: Include <tls.h>, do not include <machine-sp.h>. (__hurd_sigthread_variables, __hurd_threadvar_max): Remove variables declarations. (__hurd_threadvar_index): Remove enum. (_HURD_THREADVAR_H_EXTERN_INLINE): Remove macro. (__hurd_threadvar_location_from_sp,__hurd_threadvar_location): Remove inlines. (__hurd_reply_port0): New variable declaration. (__hurd_local_reply_port): New macro. * hurd/hurdsig.c (__hurd_sigthread_variables): Remove variable. (interrupted_reply_port_location): Add thread_t parameter. Use it with THREAD_TCB to access thread-local variables. (_hurdsig_abort_rpcs): Pass ss->thread to interrupted_reply_port_location. (_hurd_internal_post_signal): Likewise. (_hurdsig_init): Use presence of cthread_fork instead of __hurd_threadvar_stack_mask to start signal thread by hand. Remove signal thread threadvar initialization. * hurd/hurdstartup.c: Do not include <hurd/threadvar.h> * hurd/sigunwind.c: Include <hurd/threadvar.h> (_hurdsig_longjmp_from_handler): Use __hurd_local_reply_port instead of threadvar. * sysdeps/mach/hurd/Versions (libc.GLIBC_PRIVATE): Add __libc_lock_self0. (ld.GLIBC_2.0): Remove __hurd_sigthread_stack_base, __hurd_sigthread_stack_end, __hurd_sigthread_variables. (ld.GLIBC_PRIVATE): Add __libc_lock_self0. * sysdeps/mach/hurd/cthreads.c: Add __libc_lock_self0. * sysdeps/mach/hurd/dl-sysdep.c (errno, __hurd_sigthread_stack_base, __hurd_sigthread_stack_end, __hurd_sigthread_variables, threadvars, __hurd_threadvar_stack_offset, __hurd_threadvar_stack_mask): Do not define variables. * sysdeps/mach/hurd/errno-loc.c: Do not include <errno.h> and <hurd/threadvar.h>. [IS_IN(rtld)] (rtld_errno): New variable. [IS_IN(rtld)] (__errno_location): New weak function. [!IS_IN(rtld)]: Include "../../../csu/errno-loc.c". * sysdeps/mach/hurd/errno.c: Remove file. * sysdeps/mach/hurd/fork.c: Include <hurd/threadvar.h> (__fork): Remove THREADVAR_SPACE macro and its use. * sysdeps/mach/hurd/i386/init-first.c (__hurd_threadvar_max): Remove variable. (init): Do not initialize threadvar. * sysdeps/mach/hurd/i386/libc.abilist (__hurd_threadvar_max): Remove symbol. * sysdeps/mach/hurd/i386/sigreturn.c (__sigreturn): Use __hurd_local_reply_port instead of threadvar. * sysdeps/mach/hurd/i386/tls.h (tcbhead_t): Add reply_port and _hurd_sigstate fields. (HURD_DESC_TLS, __LIBC_NO_TLS, THREAD_TCB): New macro. * sysdeps/mach/hurd/i386/trampoline.c: Remove outdated comment. * sysdeps/mach/hurd/libc-lock.h: Do not include <hurd/threadvar.h>. (__libc_lock_owner_self): Use &__libc_lock_self0 and THREAD_SELF instead of threadvar. * sysdeps/mach/hurd/libc-tsd.h: Remove file. * sysdeps/mach/hurd/mig-reply.c (GETPORT, reply_port): Remove macros. (use_threadvar, global_reply_port): Remove variables. (__hurd_reply_port0): New variable. (__mig_get_reply_port): Use __hurd_local_reply_port and __hurd_reply_port0 instead of threadvar. (__mig_dealloc_reply_port): Likewise. (__mig_init): Do not initialize threadvar. * sysdeps/mach/hurd/profil.c: Fix comment.
105 lines
3.7 KiB
Makefile
105 lines
3.7 KiB
Makefile
# Copyright (C) 1991-2018 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, see
|
||
# <http://www.gnu.org/licenses/>.
|
||
|
||
subdir := hurd
|
||
|
||
include ../Makeconfig
|
||
|
||
headers = hurd.h $(interface-headers) \
|
||
$(addprefix hurd/,fd.h id.h port.h signal.h sigpreempt.h ioctl.h\
|
||
userlink.h resource.h lookup.h)
|
||
|
||
inline-headers = hurd.h $(addprefix hurd/,fd.h signal.h \
|
||
userlink.h port.h)
|
||
|
||
# The RPC interfaces go in a separate library.
|
||
interface-library := libhurduser
|
||
user-interfaces := $(addprefix hurd/,\
|
||
auth startup \
|
||
process process_request \
|
||
msg msg_reply msg_request \
|
||
exec exec_startup crash interrupt \
|
||
fs fsys io term tioctl socket ifsock \
|
||
login password pfinet \
|
||
)
|
||
server-interfaces := hurd/msg faultexc
|
||
|
||
routines = hurdstartup hurdinit \
|
||
hurdid hurdpid hurdrlimit hurdprio hurdexec hurdselect \
|
||
hurdlookup lookup-retry lookup-at \
|
||
get-host set-host \
|
||
path-lookup \
|
||
setauth \
|
||
pid2task task2pid \
|
||
geteuids seteuids getumask fchroot \
|
||
hurdsock hurdauth \
|
||
hurdchdir hurdfchdir \
|
||
privports \
|
||
msgportdemux \
|
||
fopenport \
|
||
vpprintf \
|
||
ports-get ports-set hurdports hurdmsg \
|
||
errno-loc \
|
||
$(sig) $(dtable) $(inlines) port-cleanup report-wait xattr
|
||
sig = hurdsig hurdfault siginfo hurd-raise preempt-sig \
|
||
trampoline longjmp-ts catch-exc exc2signal hurdkill sigunwind \
|
||
thread-self thread-cancel intr-msg catch-signal
|
||
dtable = dtable port2fd new-fd alloc-fd intern-fd \
|
||
getdport openport \
|
||
fd-close fd-read fd-write hurdioctl ctty-input ctty-output
|
||
inlines = $(inline-headers:%.h=%-inlines)
|
||
|
||
# XXX this is a temporary hack; see hurdmalloc.h
|
||
routines += hurdmalloc
|
||
|
||
# Binary compatibility for libc.so.0.2[GLIBC_2.0].
|
||
ifeq ($(build-shared),yes)
|
||
routines += compat-20
|
||
endif
|
||
|
||
shared-only-routines = compat-20
|
||
|
||
# For each of the $(inline-headers), generate a trivial source
|
||
# file that will #include it to define its inline functions as real functions.
|
||
$(inlines:%=$(objpfx)%.c): $(objpfx)%-inlines.c: %.h
|
||
(h="`echo $(subst /,_,$*) | tr '[a-z]' '[A-Z]'`"; \
|
||
echo "#define _$${h}_H_EXTERN_INLINE /* Define real function. */"; \
|
||
echo '#include "$<"') > $@-new
|
||
mv -f $@-new $@
|
||
generated += $(inlines:=.c)
|
||
|
||
# Avoid ssp before TLS is initialized.
|
||
CFLAGS-hurdstartup.o = $(no-stack-protector)
|
||
CFLAGS-RPC_exec_startup_get_info.o = $(no-stack-protector)
|
||
|
||
# Make generated headers compatible with all support standards
|
||
migheaderpipe := | sed -e 's/\<ino64_t\>/__ino64_t/' -e 's/\<loff_t\>/__loff_t/'
|
||
include ../mach/Machrules
|
||
include ../Rules
|
||
|
||
# intr-rpc.defs defines the INTR_INTERFACE macro to make the generated RPC
|
||
# stubs import <hurd/signal.h> and #define __mach_msg to
|
||
# _hurd_intr_rpc_mach_msg.
|
||
user-MIGFLAGS += -imacros intr-rpc.defs
|
||
|
||
# The special exc server for sigthread faults uses a special prefix.
|
||
MIGFLAGS-faultexc = -prefix _hurdsig_fault_
|
||
|
||
# We need this static dependency to get faultexc.h generated the first time.
|
||
$(objpfx)hurdfault.o $(objpfx)hurdfault.d: \
|
||
$(objpfx)faultexc_server.h $(objpfx)faultexc_server.c
|