diff options
| -rw-r--r-- | mk/__signal.d | 9 | ||||
| -rw-r--r-- | mk/__signal_h.d | 9 | ||||
| -rw-r--r-- | mk/all.mk | 2 | ||||
| -rw-r--r-- | mk/deps.mk | 6 | ||||
| -rw-r--r-- | src/__undefined.c | 2 | ||||
| -rw-r--r-- | src/_safety.h | 4 | ||||
| -rw-r--r-- | src/signal/__signal_h.c (renamed from src/signal/__signal.c) | 2 | ||||
| -rw-r--r-- | src/signal/__signal_handler.c | 10 | ||||
| -rw-r--r-- | src/signal/_signal.h | 2 | ||||
| -rw-r--r-- | src/signal/signal.c | 6 | ||||
| -rw-r--r-- | src/stdlib/__jkmalloc.c | 2 |
11 files changed, 27 insertions, 27 deletions
diff --git a/mk/__signal.d b/mk/__signal.d deleted file mode 100644 index ca88db29..00000000 --- a/mk/__signal.d +++ /dev/null @@ -1,9 +0,0 @@ -libc_C.0: libc.a(__signal.o) -libc.a(__signal.o): $(OBJDIR)/__signal.o - @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% - -$(OBJDIR)/__signal.o: src/signal/__signal.c -$(OBJDIR)/__signal.o: src/signal/_signal.h -$(OBJDIR)/__signal.o: - @mkdir -p $(@D) - $(CC) -c -o $@ $(CFLAGS) src/signal/__signal.c diff --git a/mk/__signal_h.d b/mk/__signal_h.d new file mode 100644 index 00000000..44825a6c --- /dev/null +++ b/mk/__signal_h.d @@ -0,0 +1,9 @@ +libc_C.0: libc.a(__signal_h.o) +libc.a(__signal_h.o): $(OBJDIR)/__signal_h.o + @$(AR) $(ARFLAGS) $@ $(OBJDIR)/$% + +$(OBJDIR)/__signal_h.o: src/signal/__signal_h.c +$(OBJDIR)/__signal_h.o: src/signal/_signal.h +$(OBJDIR)/__signal_h.o: + @mkdir -p $(@D) + $(CC) -c -o $@ $(CFLAGS) src/signal/__signal_h.c @@ -370,7 +370,7 @@ include mk/signal.d include mk/raise.d include mk/__signal_handler.d include mk/__sigsegv.d -include mk/__signal.d +include mk/__signal_h.d include mk/frexp.d include mk/erfc.d include mk/rint.d @@ -1490,9 +1490,9 @@ all: mk/__sigsegv.d mk/__sigsegv.d: src/signal/__sigsegv.c sh mk/deps.sh src/signal/__sigsegv.c -all: mk/__signal.d -mk/__signal.d: src/signal/__signal.c - sh mk/deps.sh src/signal/__signal.c +all: mk/__signal_h.d +mk/__signal_h.d: src/signal/__signal_h.c + sh mk/deps.sh src/signal/__signal_h.c all: mk/frexp.d mk/frexp.d: src/math/frexp.c diff --git a/src/__undefined.c b/src/__undefined.c index 6f619393..da9d0d90 100644 --- a/src/__undefined.c +++ b/src/__undefined.c @@ -7,7 +7,7 @@ _Noreturn void __undefined(const char *fmt, ...) { - ___signal.current = 0; + __signal_h.current = 0; va_list ap; va_start(ap, fmt); diff --git a/src/_safety.h b/src/_safety.h index 5f8dadc4..5024e52f 100644 --- a/src/_safety.h +++ b/src/_safety.h @@ -107,8 +107,8 @@ extern struct __dangerous { } while (0) #define SIGNAL_SAFE(__n) do { \ - if (__n == 0 && ___signal.current != 0) { \ - int _sig = ___signal.current; \ + if (__n == 0 && __signal_h.current != 0) { \ + int _sig = __signal_h.current; \ UNDEFINED("Function %s() is not safe to call from a signal handler (signal %d)", __func__, _sig); \ } \ } while (0) diff --git a/src/signal/__signal.c b/src/signal/__signal_h.c index d4a819c6..fde51b63 100644 --- a/src/signal/__signal.c +++ b/src/signal/__signal_h.c @@ -1,6 +1,6 @@ #include "_signal.h" -struct __signal ___signal = {0}; +struct __signal __signal_h = { 0 }; /* STDC(0) diff --git a/src/signal/__signal_handler.c b/src/signal/__signal_handler.c index c7a4675c..2e8afd1e 100644 --- a/src/signal/__signal_handler.c +++ b/src/signal/__signal_handler.c @@ -9,18 +9,18 @@ void __signal_handler(int sig) UNDEFINED("signal %d occured during quick_exit", sig); } - ___signal.current = sig; - if (___signal.handlers[sig] != NULL) { - ___signal.handlers[sig](sig); + __signal_h.current = sig; + if (__signal_h.handlers[sig] != NULL) { + __signal_h.handlers[sig](sig); } /* TODO: signal number to name */ if (sig == SIGFPE || sig == SIGILL || sig == SIGSEGV) { - ___signal.current = 0; + __signal_h.current = 0; UNDEFINED("Signal handler for signal %d returned", sig); } - ___signal.current = 0; + __signal_h.current = 0; } /* diff --git a/src/signal/_signal.h b/src/signal/_signal.h index 40a01fa0..f450c053 100644 --- a/src/signal/_signal.h +++ b/src/signal/_signal.h @@ -10,7 +10,7 @@ typedef void (*handler)(int); extern struct __signal { int current; handler handlers[NSIGNALS]; -} ___signal; +} __signal_h; void __signal_handler(int); diff --git a/src/signal/signal.c b/src/signal/signal.c index 6a48b49a..85a82172 100644 --- a/src/signal/signal.c +++ b/src/signal/signal.c @@ -27,7 +27,7 @@ GCC_SSE_HACK void (*signal(int sig, void (*func)(int)))(int) { /* signal safe iff we are resetting the current signal handler */ - SIGNAL_SAFE((___signal.current == sig)); + SIGNAL_SAFE((__signal_h.current == sig)); if (sig < 0 || sig > NSIGNALS) { /* FIXME: should errno be set? */ @@ -38,8 +38,8 @@ void (*signal(int sig, void (*func)(int)))(int) UNDEFINED("signal handler is not executable"); } - void (*prev)(int) = ___signal.handlers[sig]; - ___signal.handlers[sig] = func; + void (*prev)(int) = __signal_h.handlers[sig]; + __signal_h.handlers[sig] = func; struct sigaction act = { 0 }; act.sa_handler = __signal_handler; diff --git a/src/stdlib/__jkmalloc.c b/src/stdlib/__jkmalloc.c index e128a394..34b34fbc 100644 --- a/src/stdlib/__jkmalloc.c +++ b/src/stdlib/__jkmalloc.c @@ -119,7 +119,7 @@ static void *__jk_page_alloc(size_t npages) static void __jk_sigaction(int sig, siginfo_t *si, void *addr) { - ___signal.current = 0; + __signal_h.current = 0; (void)sig; (void)addr; |