aboutsummaryrefslogtreecommitdiff
path: root/hurd
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-05-12 16:38:08 +0000
committerRoland McGrath <roland@gnu.org>1996-05-12 16:38:08 +0000
commitaa1075ea2f140dc7b2eec04199935b47111229db (patch)
tree30f0fe1cd77a1e4bcd999dff97eb61e4fc11166b /hurd
parentd617ac4ee5563f36c6046729b324f78562b0f1e7 (diff)
downloadglibc-aa1075ea2f140dc7b2eec04199935b47111229db.zip
glibc-aa1075ea2f140dc7b2eec04199935b47111229db.tar.gz
glibc-aa1075ea2f140dc7b2eec04199935b47111229db.tar.bz2
Sun May 12 11:16:58 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* mach/Machrules (%.udeps rule): Write deps for %_server.[ch] too. (%_server.[ch] rule): Don't depend on %.defs; use #include to get installed .defs file. * stdio-common/vfprintf.c (flockfile, funlockfile): Define to nothing for stdio. Fix fUNlockfile -> funlockfile for libio. * stdio-common/vfscanf.c: Likewise. Sat May 11 13:43:41 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * hurd/hurdfault.c: Include faultexc_server.h instead of faultexc.h. * mach/Machrules (%.ir rule): Don't produce deps for imports. * elf/dl-fini.c (_dl_fini): Clear L->l_init_called after calling fn. * Makerules (install): Depend on $(slibdir)/libc.so$(libc.so-version). [!subdir] ($(libdir)/libc.so, $(common-objpfx)/libc-syms.so): Protect these targets and install dep on $(libdir)/libc.so with this. * hurd/Makefile: Removed all rules and defns for using code from Hurd sources and installing headers from there. * sysdeps/mach/hurd/errnos.awk: Set in_mach_errors to FILENAME when we set it. In Mach error matching clause, only match if FILENAME is still the same value. * sysdeps/mach/hurd/Makefile: Don't include sysdeps/mach/Makefile; $(mach-srcdir) no longer exists. (hurd-srcdir): Variable removed. (includes): Don't append -I$(hurd-srcdir). (last-includes): Variable removed. Remove vpath specs using $(hurd-srcdir). (mach-errno-h): New canned sequence. ($(common-objpfx)errnos.d): New target, generated included makefile to determine absolute file names of Mach headers to search for error codes and set variable mach-errnos-deps. ($(common-objpfx)stamp-errnos): Depend on $(mach-errnos-deps) instead of prior explicit list. (generated): Add errnos.d, stamp-errnos. * mach/Machrules (some-if-rtn): New variable and target; compute deps of some if routine and make all if routines depend on that .d file instead of static list of .h files. * mach/Makefile (mach/mach_interface.defs, mach/memory_object_user.defs): Targets removed. ($(objpfx)mach-syscalls.mk): Tweak this kludge so it doesn't depend directly on Mach sources. * sysdeps/mach/Makefile (mach-srcdir): Variable removed. (includes): Don't append -I$(mach-srcdir). Remove vpath specs using $(mach-srcdir). * hurd/Makefile (server-interfaces): Add faultexc. (sig): Remove it from here. (fault%.[ch]): Rule removed. (MIGFLAGS-faultexc): New variable. * hurd/faultexc.defs: New file. * mach/Machrules (%.ustamp rule): Pass $(MIGFLAGS-$*) to mig. (%_server.[ch] rule): Likewise. * mach/Makefile: Removed all rules and defns for using code from Mach sources and installing headers from there. * Makeconfig [$(build-shared)=yes] (link-libc): Append $(libc.so-version) to libc.so. * mach/Machrules (%.ustamp rule): Don't depend on %.defs. (%.udeps): New rule parallel to that one, generating included makefiles with -M output from `#include <%.defs>'. * Makerules (sed-remove-objpfx): Remove space before \ at eol.
Diffstat (limited to 'hurd')
-rw-r--r--hurd/Makefile36
-rw-r--r--hurd/faultexc.defs5
-rw-r--r--hurd/hurdfault.c2
3 files changed, 11 insertions, 32 deletions
diff --git a/hurd/Makefile b/hurd/Makefile
index 3a9d08e..90d4b43 100644
--- a/hurd/Makefile
+++ b/hurd/Makefile
@@ -38,7 +38,7 @@ user-interfaces := $(addprefix hurd/,\
msg msg_reply msg_request \
exec exec_startup crash interrupt \
fs fsys io term tioctl socket ifsock)
-server-interfaces := hurd/msg
+server-interfaces := hurd/msg faultexc
routines = hurdstartup hurdinit \
hurdid hurdlookup hurdpid hurdrlimit hurdprio hurdexec \
@@ -53,7 +53,7 @@ routines = hurdstartup hurdinit \
vpprintf \
ports-get ports-set hurdports hurdmsg \
$(sig) $(dtable) hurdinline port-cleanup report-wait
-sig = hurdsig hurdfault faultexc siginfo hurd-raise preempt-sig \
+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 \
@@ -64,28 +64,6 @@ dtable = dtable port2fd new-fd alloc-fd intern-fd \
routines += hurdmalloc
distribute += hurdmalloc.h
-# Get the proper definition of `hurd-srcdir'.
-include ../sysdeps/mach/hurd/Makefile
-
-# Use and install the Hurd header files directly out of the Hurd source.
-
-# Find the MiG defs files in the Hurd source.
-vpath %.defs $(hurd-srcdir)
-
-# Install all .h and .defs files we find in the Hurd's hurd/ directory.
-hurd-headers := $(patsubst $(hurd-srcdir)/%,%,\
- $(wildcard $(addprefix $(hurd-srcdir)/hurd/,\
- *.defs *.h)))
-
-
-# Don't distribute the Hurd headers; they are in the Hurd distribution.
-dont_distribute = $(hurd-headers)
-
-# DO NOT try to remake these in any way!!!
-$(addprefix $(hurd-srcdir)/,$(hurd-headers)) : ;
-install-others += $(addprefix $(includedir)/,$(hurd-headers))
-$(includedir)/hurd/%: $(hurd-srcdir)/hurd/%; $(do-install)
-
include ../mach/Machrules
include ../Rules
@@ -94,13 +72,9 @@ include ../Rules
# _hurd_intr_rpc_mach_msg.
user-MIGFLAGS += -imacros intr-rpc.defs
-$(objpfx)fault%.c $(objpfx)fault%.h: $(mach-srcdir)/mach/%.defs
- $(MIG) $(MIGFLAGS) -prefix _hurdsig_fault_ \
- -server $(@:.h=.c) -sheader $(@:.c=.h) \
- -user /dev/null -header /dev/null \
- $<
-generated += faultexc.c faultexc.h
+# 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.h $(objpfx)faultexc.c
+ $(objpfx)faultexc_server.h $(objpfx)faultexc_server.c
diff --git a/hurd/faultexc.defs b/hurd/faultexc.defs
new file mode 100644
index 0000000..fe7f02a
--- /dev/null
+++ b/hurd/faultexc.defs
@@ -0,0 +1,5 @@
+/* This file is processed by mig with -prefix _hurdsig_fault_
+ to create the special exception server used for signal thread
+ fault recovery. */
+
+#include <mach/exc.defs>
diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c
index a8fe8fb..e1b06a3 100644
--- a/hurd/hurdfault.c
+++ b/hurd/hurdfault.c
@@ -25,7 +25,7 @@ Cambridge, MA 02139, USA. */
#include <setjmp.h>
#include <stdio.h>
#include "thread_state.h"
-#include "faultexc.h" /* mig-generated header for our exc server. */
+#include "faultexc_server.h" /* mig-generated header for our exc server. */
#include <assert.h>
jmp_buf _hurdsig_fault_env;