From 0df5a8fa0361e06a46240689d01665c1c59ef7c4 Mon Sep 17 00:00:00 2001
From: Jakob Kaivo <jkk@ung.org>
Date: Wed, 31 Jan 2024 00:04:19 -0500
Subject: remove last vestiges of _assert.h (now _safety.h)

---
 mk/__checked_call.d | 1 +
 mk/all.mk           | 1 -
 mk/configured.mk    | 8 --------
 mk/confstr.d        | 2 +-
 mk/deps.mk          | 4 ----
 mk/getcwd.d         | 2 +-
 mk/getgroups.d      | 2 +-
 mk/pipe.d           | 2 +-
 mk/stat.d           | 2 +-
 mk/uname.d          | 2 +-
 mk/unlink.d         | 2 +-
 mk/write.d          | 2 +-
 12 files changed, 9 insertions(+), 21 deletions(-)

(limited to 'mk')

diff --git a/mk/__checked_call.d b/mk/__checked_call.d
index 5bc24230..80e0bfaf 100644
--- a/mk/__checked_call.d
+++ b/mk/__checked_call.d
@@ -4,6 +4,7 @@ libc.a(__checked_call.o): $(OBJDIR)/__checked_call.o
 
 $(OBJDIR)/__checked_call.o: src/__checked_call.c
 $(OBJDIR)/__checked_call.o: src/_safety.h
+$(OBJDIR)/__checked_call.o: src/stdlib/abort_handler_s.c
 $(OBJDIR)/__checked_call.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/__checked_call.c
diff --git a/mk/all.mk b/mk/all.mk
index d8b4f9df..b696c540 100644
--- a/mk/all.mk
+++ b/mk/all.mk
@@ -388,7 +388,6 @@ include mk/shmctl.d
 include mk/shmdt.d
 include mk/ftok.d
 include mk/times.d
-include mk/struct_tms.d
 include mk/waitpid.d
 include mk/wait.d
 include mk/waitid.d
diff --git a/mk/configured.mk b/mk/configured.mk
index 9da6c9b2..e69de29b 100644
--- a/mk/configured.mk
+++ b/mk/configured.mk
@@ -1,8 +0,0 @@
-.POSIX:
-
-CC=c89
-CFLAGS=$(BASE_CFLAGS) -O1
-all: libc_C.0
-all: libc_C.1
-all: libm_C.0
-all: libm_C.1
diff --git a/mk/confstr.d b/mk/confstr.d
index c4fcdb40..d1d72500 100644
--- a/mk/confstr.d
+++ b/mk/confstr.d
@@ -3,7 +3,7 @@ libc.a(confstr.o): $(OBJDIR)/confstr.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/confstr.o: src/unistd/confstr.c
-$(OBJDIR)/confstr.o: src/_assert.h
+$(OBJDIR)/confstr.o: src/_safety.h
 $(OBJDIR)/confstr.o: src/unistd/_confstr.h
 $(OBJDIR)/confstr.o:
 	@mkdir -p $(@D)
diff --git a/mk/deps.mk b/mk/deps.mk
index a0040674..4fa724cb 100644
--- a/mk/deps.mk
+++ b/mk/deps.mk
@@ -1562,10 +1562,6 @@ all: mk/times.d
 mk/times.d: src/sys/times/times.c
 	sh mk/deps.sh src/sys/times/times.c
 
-all: mk/struct_tms.d
-mk/struct_tms.d: src/sys/times/struct_tms.c
-	sh mk/deps.sh src/sys/times/struct_tms.c
-
 all: mk/waitpid.d
 mk/waitpid.d: src/sys/wait/waitpid.c
 	sh mk/deps.sh src/sys/wait/waitpid.c
diff --git a/mk/getcwd.d b/mk/getcwd.d
index 3fbbb73a..78023dd6 100644
--- a/mk/getcwd.d
+++ b/mk/getcwd.d
@@ -3,7 +3,7 @@ libc.a(getcwd.o): $(OBJDIR)/getcwd.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/getcwd.o: src/unistd/getcwd.c
-$(OBJDIR)/getcwd.o: src/_assert.h
+$(OBJDIR)/getcwd.o: src/_safety.h
 $(OBJDIR)/getcwd.o: src/_syscall.h
 $(OBJDIR)/getcwd.o:
 	@mkdir -p $(@D)
diff --git a/mk/getgroups.d b/mk/getgroups.d
index 15e64b53..6e775037 100644
--- a/mk/getgroups.d
+++ b/mk/getgroups.d
@@ -4,7 +4,7 @@ libc.a(getgroups.o): $(OBJDIR)/getgroups.o
 
 $(OBJDIR)/getgroups.o: src/unistd/getgroups.c
 $(OBJDIR)/getgroups.o: src/_syscall.h
-$(OBJDIR)/getgroups.o: src/_assert.h
+$(OBJDIR)/getgroups.o: src/_safety.h
 $(OBJDIR)/getgroups.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/unistd/getgroups.c
diff --git a/mk/pipe.d b/mk/pipe.d
index d998ec67..90d75ace 100644
--- a/mk/pipe.d
+++ b/mk/pipe.d
@@ -3,7 +3,7 @@ libc.a(pipe.o): $(OBJDIR)/pipe.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/pipe.o: src/unistd/pipe.c
-$(OBJDIR)/pipe.o: src/_assert.h
+$(OBJDIR)/pipe.o: src/_safety.h
 $(OBJDIR)/pipe.o: src/_syscall.h
 $(OBJDIR)/pipe.o:
 	@mkdir -p $(@D)
diff --git a/mk/stat.d b/mk/stat.d
index 2bb8dfd8..828b7fd1 100644
--- a/mk/stat.d
+++ b/mk/stat.d
@@ -3,7 +3,7 @@ libc.a(stat.o): $(OBJDIR)/stat.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/stat.o: src/sys/stat/stat.c
-$(OBJDIR)/stat.o: src/_assert.h
+$(OBJDIR)/stat.o: src/_safety.h
 $(OBJDIR)/stat.o: src/_syscall.h
 $(OBJDIR)/stat.o:
 	@mkdir -p $(@D)
diff --git a/mk/uname.d b/mk/uname.d
index 51adcc62..dc9fc7dd 100644
--- a/mk/uname.d
+++ b/mk/uname.d
@@ -3,7 +3,7 @@ libc.a(uname.o): $(OBJDIR)/uname.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/uname.o: src/sys/utsname/uname.c
-$(OBJDIR)/uname.o: src/_assert.h
+$(OBJDIR)/uname.o: src/_safety.h
 $(OBJDIR)/uname.o:
 	@mkdir -p $(@D)
 	$(CC) -c -o $@ $(CFLAGS) src/sys/utsname/uname.c
diff --git a/mk/unlink.d b/mk/unlink.d
index 55b82ae8..0086f4a2 100644
--- a/mk/unlink.d
+++ b/mk/unlink.d
@@ -3,7 +3,7 @@ libc.a(unlink.o): $(OBJDIR)/unlink.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/unlink.o: src/unistd/unlink.c
-$(OBJDIR)/unlink.o: src/_assert.h
+$(OBJDIR)/unlink.o: src/_safety.h
 $(OBJDIR)/unlink.o: src/_syscall.h
 $(OBJDIR)/unlink.o:
 	@mkdir -p $(@D)
diff --git a/mk/write.d b/mk/write.d
index 593f1320..6f75d6b8 100644
--- a/mk/write.d
+++ b/mk/write.d
@@ -3,7 +3,7 @@ libc.a(write.o): $(OBJDIR)/write.o
 	@$(AR) $(ARFLAGS) $@ $(OBJDIR)/$%
 
 $(OBJDIR)/write.o: src/unistd/write.c
-$(OBJDIR)/write.o: src/_assert.h
+$(OBJDIR)/write.o: src/_safety.h
 $(OBJDIR)/write.o: src/_syscall.h
 $(OBJDIR)/write.o:
 	@mkdir -p $(@D)
-- 
cgit v1.2.1