From f386d576c67bcf4f8e89ef77ead3ec5423b9e817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20DUBOIN?= Date: Tue, 3 Mar 2026 22:31:34 +0100 Subject: [PATCH 01/10] i686/interrupts: export saved registers into x86_regs We will need to reuse this structure to foward the state of the registers to the userland signal handler. While at it, rename the 'stub' field in the interrupt_frame struct to 'regs' to make the name more explicit. Same for the 'state' field, that was renamed to 'frame' since it contains the original interupt frame pushed by hardware. --- include/kernel/arch/i686/cpu.h | 2 ++ include/kernel/arch/i686/interrupts.h | 27 ++++----------- include/kernel/arch/i686/process.h | 6 ++-- kernel/arch/i686/interrupts.c | 8 ++--- kernel/arch/i686/syscalls.c | 16 ++++----- .../dailyrun/include/dailyrun/arch/i686/cpu.h | 33 +++++++++++++++++++ 6 files changed, 57 insertions(+), 35 deletions(-) create mode 100644 root/usr/lib/dailyrun/include/dailyrun/arch/i686/cpu.h diff --git a/include/kernel/arch/i686/cpu.h b/include/kernel/arch/i686/cpu.h index 37b391a6..defdd45e 100644 --- a/include/kernel/arch/i686/cpu.h +++ b/include/kernel/arch/i686/cpu.h @@ -3,6 +3,8 @@ #include +#include + #include #include #include diff --git a/include/kernel/arch/i686/interrupts.h b/include/kernel/arch/i686/interrupts.h index f0271f46..09c11d43 100644 --- a/include/kernel/arch/i686/interrupts.h +++ b/include/kernel/arch/i686/interrupts.h @@ -42,6 +42,7 @@ #include #include +#include #include @@ -116,31 +117,17 @@ typedef struct PACKED idt_descriptor { /** @brief Frame passed onto the interrupt handlers by our stub handler */ struct interrupt_frame { - /** - * @brief Dump of the process's registers. - * These are pushed by `pusha` inside our stub handler - */ - struct registers_dump { - u32 edi, esi, ebp, esp; - u32 ebx, edx, ecx, eax; - } stub; + /** Snapshot of the registers at the time the interrupt happened.*/ + struct x86_regs regs; - /** Interrupt number (pushed by our stub) */ + /** Error code and interrupt number (pushed by our stub) */ u32 nr; - /** Error code for this exception (pushed by our stub) */ u32 error; - /** - * @brief Default x86 interrupt frame pushed by the cpu - * @ref Intel developper manual, figure 6-4 + /* + * The interrupt frame pushed by the hardware starts here. */ - struct cpu_interrupt_frame { - u32 eip; - u32 cs; - u32 flags; - u32 esp; - u32 ss; - } state; + struct x86_interrupt_frame frame; }; static ALWAYS_INLINE void arch_interrupts_disable(void) diff --git a/include/kernel/arch/i686/process.h b/include/kernel/arch/i686/process.h index 94fa13fd..71cdcbd9 100644 --- a/include/kernel/arch/i686/process.h +++ b/include/kernel/arch/i686/process.h @@ -66,12 +66,12 @@ static inline void *arch_thread_get_stack_pointer(thread_context_t *ctx) static inline void arch_thread_set_base_pointer(thread_context_t *ctx, void *ptr) { - ctx->frame.stub.ebp = (vaddr_t)ptr; + ctx->frame.regs.ebp = (vaddr_t)ptr; } static inline void *arch_thread_get_base_pointer(thread_context_t *ctx) { - return (void *)ctx->frame.stub.ebp; + return (void *)ctx->frame.regs.ebp; } static inline void @@ -113,7 +113,7 @@ static inline void *arch_thread_get_user_stack_top(const thread_context_t *ctx) static inline void * arch_thread_get_interrupt_return_address(const thread_context_t *ctx) { - return (void *)ctx->frame.state.eip; + return (void *)ctx->frame.frame.eip; } #endif /* KERNEL_ARCH_I686_PROCESS_H */ diff --git a/kernel/arch/i686/interrupts.c b/kernel/arch/i686/interrupts.c index ca5357d7..3a82a86d 100644 --- a/kernel/arch/i686/interrupts.c +++ b/kernel/arch/i686/interrupts.c @@ -85,7 +85,7 @@ void arch_interrupt_handle(interrupt_frame frame) error_t err; thread_set_interrupt_frame(current, &frame); - thread_set_stack_pointer(current, (void *)frame.state.esp); + thread_set_stack_pointer(current, (void *)frame.frame.esp); err = interrupt_handle(frame.nr); if (err == E_NOENT) { @@ -93,9 +93,9 @@ void arch_interrupt_handle(interrupt_frame frame) interrupt_name(frame.nr), frame.nr); log_dbg("Thread: '%s' (TID=%d)", current->process->name, current->tid); log_dbg("ERROR=" FMT32, frame.error); - log_dbg("FLAGS=" FMT32, frame.state.flags); - log_dbg("CS=" FMT32 ", SS=" FMT32, frame.state.cs, frame.state.ss); - log_dbg("EIP=" FMT32 ", ESP=" FMT32, frame.state.eip, frame.state.esp); + log_dbg("FLAGS=" FMT32, frame.frame.flags); + log_dbg("CS=" FMT32 ", SS=" FMT32, frame.frame.cs, frame.frame.ss); + log_dbg("EIP=" FMT32 ", ESP=" FMT32, frame.frame.eip, frame.frame.esp); } } diff --git a/kernel/arch/i686/syscalls.c b/kernel/arch/i686/syscalls.c index 1c7eeb50..2e7220e5 100644 --- a/kernel/arch/i686/syscalls.c +++ b/kernel/arch/i686/syscalls.c @@ -7,13 +7,13 @@ */ void arch_syscall_get_args(interrupt_frame *frame, syscall_args_t *args) { - args->nr = frame->stub.eax; - args->arg1 = frame->stub.ebx; - args->arg2 = frame->stub.ecx; - args->arg3 = frame->stub.edx; - args->arg4 = frame->stub.esi; - args->arg5 = frame->stub.edi; - args->arg6 = frame->stub.ebp; + args->nr = frame->regs.eax; + args->arg1 = frame->regs.ebx; + args->arg2 = frame->regs.ecx; + args->arg3 = frame->regs.edx; + args->arg4 = frame->regs.esi; + args->arg5 = frame->regs.edi; + args->arg6 = frame->regs.ebp; } /* @@ -28,5 +28,5 @@ void arch_syscall_set_return_value(u32 value) * returning to userland. */ frame = (void *)current->context.esp0 - sizeof(struct interrupt_frame); - frame->stub.eax = value; + frame->regs.eax = value; } diff --git a/root/usr/lib/dailyrun/include/dailyrun/arch/i686/cpu.h b/root/usr/lib/dailyrun/include/dailyrun/arch/i686/cpu.h new file mode 100644 index 00000000..521c8dab --- /dev/null +++ b/root/usr/lib/dailyrun/include/dailyrun/arch/i686/cpu.h @@ -0,0 +1,33 @@ +#ifndef DAILYRUN_ARCH_I686_CPU_H +#define DAILYRUN_ARCH_I686_CPU_H + +#include + +/* + * Structure containing all general purpose registers. + * + * This can be filled by the pusha instruction. + */ +struct x86_regs { + uint32_t edi; + uint32_t esi; + uint32_t ebp; + uint32_t esp; + uint32_t ebx; + uint32_t edx; + uint32_t ecx; + uint32_t eax; +}; + +/* + * Frame pushed by the CPU before an interrupt. + */ +struct x86_interrupt_frame { + uint32_t eip; + uint32_t cs; + uint32_t flags; + uint32_t esp; + uint32_t ss; +}; + +#endif /* DAILYRUN_ARCH_I686_CPU_H */ From 8386896d09d9f7990e9049239eb2c3e57c905601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20DUBOIN?= Date: Sat, 7 Mar 2026 16:39:25 +0100 Subject: [PATCH 02/10] sys/process: add global list of alive threads and processes Also rename the other linked list node structures inside struct process. --- include/kernel/process.h | 31 +++++++++++++----- kernel/misc/waitqueue.c | 8 ++--- kernel/sys/process.c | 70 +++++++++++++++++++++++++++++++++++++--- kernel/sys/sched.c | 22 ++++++------- 4 files changed, 103 insertions(+), 28 deletions(-) diff --git a/include/kernel/process.h b/include/kernel/process.h index 5a6cf98b..6fb1897a 100644 --- a/include/kernel/process.h +++ b/include/kernel/process.h @@ -90,7 +90,8 @@ struct process { llist_t threads; /*!< Linked list of the process' active threads */ llist_t children; /*!< Linked list of the process' active children */ - node_t this; /*< Node inside the parent's list of children */ + node_t this; /*!< Node inside the parent's list of children */ + node_t this_global; /*!< Used by the global list of alive processes */ size_t refcount; /*!< Reference count to this process. We only kill a process once all of its threads have @@ -135,13 +136,14 @@ typedef struct thread { thread_context_t context; thread_state_t state; /*!< Thread's current state, used by the scheduler */ - struct process *process; /*!< Containing process */ - node_t proc_this; /*!< Linked list used by the process to list threads */ - pid_t tid; /*!< Thread ID */ u32 flags; /*!< Combination of \ref thread_flags values */ - node_t this; /*!< Intrusive linked list used by the scheduler */ + struct process *process; /*!< Containing process */ + + node_t this_proc; /*!< Used by a process to list threads */ + node_t this_sched; /*!< Used by the scheduler */ + node_t this_global; /*!< Used by the global list of alive processes */ /** Information relative to the current state of the thread */ union { @@ -153,6 +155,17 @@ typedef struct thread { } thread_t; +/* + * List of all processes and threads currently alive. + * + * These list only contain live threads/processes so that lookups + * do not return objects that have already been killed. + */ +extern llist_t processes_list; +extern spinlock_t processes_list_lock; +extern llist_t threads_list; +extern spinlock_t threads_list_lock; + /** @enum thread_flags */ typedef enum thread_flags { THREAD_KERNEL = BIT(0), ///< This is a kernel thread @@ -332,6 +345,9 @@ static inline void process_set_name(struct process *process, const char *name, strlcpy(process->name, name, MIN(size + 1, PROCESS_NAME_MAX_LEN)); } +/** Find an **alive** process by its PID. */ +struct process *process_find_by_pid(pid_t pid); + /** The currently running thread */ extern thread_t *current; @@ -403,8 +419,7 @@ void thread_kill(thread_t *); */ struct thread *thread_fork(struct thread *, thread_entry_t, void *); -/** @defgroup arch_process Processes - arch specifics - * @ingroup x86_process - */ +/** Find an **alive** thread by its TID. */ +struct thread *thread_find_by_tid(pid_t tid); /** @} */ diff --git a/kernel/misc/waitqueue.c b/kernel/misc/waitqueue.c index e28a3f9f..9e1fe968 100644 --- a/kernel/misc/waitqueue.c +++ b/kernel/misc/waitqueue.c @@ -24,7 +24,7 @@ void waitqueue_enqueue_locked(struct waitqueue *queue, struct thread *thread) */ no_preemption_scope () { thread->state = SCHED_WAITING; - queue_enqueue(&queue->queue, &thread->this); + queue_enqueue(&queue->queue, &thread->this_sched); /* Release the lock held by the caller BEFORE rescheduling */ spinlock_release(&queue->lock); } @@ -41,7 +41,7 @@ const struct thread *waitqueue_peek(struct waitqueue *queue) locked_scope (&queue->lock) { if (!queue_is_empty(&queue->queue)) { node = queue_peek(&queue->queue); - thread = container_of(node, struct thread, this); + thread = container_of(node, struct thread, this_sched); } } @@ -56,7 +56,7 @@ struct thread *waitqueue_dequeue(struct waitqueue *queue) locked_scope (&queue->lock) { if (!queue_is_empty(&queue->queue)) { node = queue_dequeue(&queue->queue); - thread = container_of(node, struct thread, this); + thread = container_of(node, struct thread, this_sched); } } @@ -76,7 +76,7 @@ size_t waitqueue_dequeue_all(struct waitqueue *queue) locked_scope (&queue->lock) { while (!queue_is_empty(&queue->queue)) { node = queue_dequeue(&queue->queue); - thread = container_of(node, struct thread, this); + thread = container_of(node, struct thread, this_sched); sched_new_thread(thread); count += 1; } diff --git a/kernel/sys/process.c b/kernel/sys/process.c index 699ff10e..76e3918c 100644 --- a/kernel/sys/process.c +++ b/kernel/sys/process.c @@ -109,6 +109,11 @@ thread_t *current = &kernel_process_initial_thread; struct process *init_process = NULL; +DECLARE_LLIST(processes_list); +DECLARE_SPINLOCK(processes_list_lock); +DECLARE_LLIST(threads_list); +DECLARE_SPINLOCK(threads_list_lock); + /** Arch specific, hardware level thread switching * * This updates the content of the registers to effectively switch @@ -297,9 +302,13 @@ void process_kill(struct process *process, int status) */ locked_scope (&process->lock) { - if (process->state == SCHED_KILLED) + /* Not in the list of alive processes. */ + if (process->this_global.next == &process->this_global) goto reschedule_current; + locked_scope (&processes_list_lock) + llist_remove(&process->this_global); + /* * Avoid race condition where the current thread would be rescheduled * after being marked killable, and before having marked the rest @@ -308,7 +317,7 @@ void process_kill(struct process *process, int status) no_preemption_scope () { FOREACH_LLIST_SAFE (node, tmp, &process->threads) { struct thread *thread = container_of(node, struct thread, - proc_this); + this_proc); thread_kill_locked(thread); } } @@ -332,7 +341,7 @@ void process_init_kernel_process(void) INIT_SPINLOCK(kernel_process.files_lock); llist_add(&kernel_process.threads, - &kernel_process_initial_thread.proc_this); + &kernel_process_initial_thread.this_proc); /* * Userspace address space is inherited by processes when forking. @@ -373,6 +382,8 @@ void process_init_kernel_process(void) "any other thread"); thread_set_user_stack(&kernel_process_initial_thread, ustack); + + llist_add(&threads_list, &kernel_process_initial_thread.this_global); } int process_register_file(struct process *process, struct file *file) @@ -484,10 +495,14 @@ thread_t *thread_spawn(struct process *process, thread_entry_t entrypoint, thread->flags = flags; thread->process = process_get(process); - llist_add(&process->threads, &thread->proc_this); + llist_add(&process->threads, &thread->this_proc); spinlock_release(&process->lock); + /* Thread is officially 'alive', make it searchable. */ + locked_scope (&threads_list_lock) + llist_add(&threads_list, &thread->this_global); + return thread; kstack_free: @@ -498,6 +513,9 @@ thread_t *thread_spawn(struct process *process, thread_entry_t entrypoint, return PTR_ERR(err); } +/* + * Actually free a previously killed thread. + */ static void thread_free(thread_t *thread) { struct process *process = thread->process; @@ -548,6 +566,9 @@ static void thread_kill_locked(thread_t *thread) WARN_ON(!process->lock.locked); + locked_scope (&threads_list_lock) + llist_remove(&thread->this_global); + arch_thread_clear(thread); /* @@ -562,7 +583,7 @@ static void thread_kill_locked(thread_t *thread) * We just killed the process's last thread, we must clean the address * space while it is still loaded. */ - llist_remove(&thread->proc_this); + llist_remove(&thread->this_proc); if (llist_is_empty(&process->threads)) { arch_process_clear(process); address_space_clear(process->as); @@ -684,6 +705,9 @@ thread_fork(struct thread *thread, thread_entry_t entrypoint, void *arg) locked_scope (¤t->process->lock) llist_add(¤t->process->children, &new_process->this); + locked_scope (&processes_list_lock) + llist_add(&processes_list, &new_process->this_global); + /* * Duplicate the current thread's stack. * @@ -797,3 +821,39 @@ pid_t sys_waitpid(pid_t pid, int *stat_loc, int options) return child_pid; } + +/* + * + */ +struct process *process_find_by_pid(pid_t pid) +{ + struct process *process; + + locked_scope (&processes_list_lock) + { + FOREACH_LLIST_ENTRY(process, &processes_list, this_global) { + if (process->pid == pid) + return process; + } + } + + return NULL; +} + +/* + * + */ +struct thread *thread_find_by_tid(pid_t tid) +{ + struct thread *thread; + + locked_scope (&threads_list_lock) + { + FOREACH_LLIST_ENTRY(thread, &threads_list, this_global) { + if (thread->tid == tid) + return thread; + } + } + + return NULL; +} diff --git a/kernel/sys/sched.c b/kernel/sys/sched.c index 5f326d8e..10a3b2fe 100644 --- a/kernel/sys/sched.c +++ b/kernel/sys/sched.c @@ -57,11 +57,11 @@ static void schedule_locked(bool preempt, bool reschedule) if (next_node == NULL) return; - thread_t *next = container_of(next_node, thread_t, this); + thread_t *next = container_of(next_node, thread_t, this_sched); if (reschedule) { if (current->state != SCHED_WAITING && current->state != SCHED_ZOMBIE) - queue_enqueue(&scheduler.ready, ¤t->this); + queue_enqueue(&scheduler.ready, ¤t->this_sched); } /* @@ -71,11 +71,11 @@ static void schedule_locked(bool preempt, bool reschedule) /* * Prevent the current thread from killing itself. */ - if (queue_peek(&scheduler.ready) != ¤t->this || + if (queue_peek(&scheduler.ready) != ¤t->this_sched || current->state != SCHED_KILLED) { next_node = queue_dequeue(&scheduler.ready); - next = container_of(next_node, thread_t, this); - queue_enqueue(&scheduler.ready, &idle_thread->this); + next = container_of(next_node, thread_t, this_sched); + queue_enqueue(&scheduler.ready, &idle_thread->this_sched); } } @@ -126,7 +126,7 @@ void sched_new_thread(thread_t *thread) return; thread->state = SCHED_RUNNING; - queue_enqueue(&scheduler.ready, &thread->this); + queue_enqueue(&scheduler.ready, &thread->this_sched); } void sched_block_thread(struct thread *thread) @@ -152,7 +152,7 @@ void sched_unblock_thread(thread_t *thread) if (thread->state == SCHED_WAITING) thread->state = SCHED_RUNNING; - queue_enqueue(&scheduler.ready, &thread->this); + queue_enqueue(&scheduler.ready, &thread->this_sched); // give the least time possible to the IDLE task if (current == idle_thread) @@ -163,8 +163,8 @@ void sched_unblock_thread(thread_t *thread) static int process_cmp_wakeup(const void *current_node, const void *cmp_node) { - const thread_t *current = container_of(current_node, thread_t, this); - const thread_t *cmp = container_of(cmp_node, thread_t, this); + const thread_t *current = container_of(current_node, thread_t, this_sched); + const thread_t *cmp = container_of(cmp_node, thread_t, this_sched); RETURN_CMP(current->sleep.wakeup, cmp->sleep.wakeup); } @@ -172,7 +172,7 @@ static int process_cmp_wakeup(const void *current_node, const void *cmp_node) void sched_block_waiting_until(struct thread *thread, clock_t until) { thread->sleep.wakeup = until; - llist_insert_sorted(&sleeping_tasks, ¤t->this, process_cmp_wakeup); + llist_insert_sorted(&sleeping_tasks, ¤t->this_sched, process_cmp_wakeup); sched_block_thread(current); } @@ -185,7 +185,7 @@ void sched_unblock_waiting_before(clock_t deadline) while (!llist_is_empty(&sleeping_tasks)) { next_wakeup = container_of(llist_first(&sleeping_tasks), struct thread, - this); + this_sched); if (next_wakeup->sleep.wakeup > deadline) break; From 78e90c3ad5cda403461968831a20f653f42c4c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20DUBOIN?= Date: Sat, 7 Mar 2026 16:59:26 +0100 Subject: [PATCH 03/10] libalgo/linked_list: add llist_first/last_entry() --- lib/libalgo/include/libalgo/linked_list.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/libalgo/include/libalgo/linked_list.h b/lib/libalgo/include/libalgo/linked_list.h index 5a5da13b..4c12f196 100644 --- a/lib/libalgo/include/libalgo/linked_list.h +++ b/lib/libalgo/include/libalgo/linked_list.h @@ -193,6 +193,12 @@ static inline node_t *llist_prev(const node_t *entry) */ #define llist_entry(ptr, type, member) container_of(ptr, type, member) +#define llist_first_entry(list, type, member) \ + llist_entry(llist_first(list), type, member) + +#define llist_last_entry(list, type, member) \ + llist_entry(llist_last(list), type, member) + /** @return Whether a list is empty */ static PURE inline bool llist_is_empty(const llist_t *list) { From 15f4ea89f2722942a64c4df13f415aa2e0c9b70c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20DUBOIN?= Date: Sat, 7 Mar 2026 16:59:57 +0100 Subject: [PATCH 04/10] libalgo/queue: add queue_enqueue/peek_entry() --- lib/libalgo/include/libalgo/queue.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/libalgo/include/libalgo/queue.h b/lib/libalgo/include/libalgo/queue.h index 6df88a98..6271d624 100644 --- a/lib/libalgo/include/libalgo/queue.h +++ b/lib/libalgo/include/libalgo/queue.h @@ -72,3 +72,11 @@ static inline void queue_enqueue_all(queue_t *queue, llist_t *elements) INIT_LLIST(*elements); } + +#define queue_entry llist_entry + +#define queue_dequeue_entry(queue, type, member) \ + queue_entry(queue_dequeue(queue), type, member) + +#define queue_peek_entry(queue, type, member) \ + queue_entry(queue_peek(queue), type, member) From 0e4cd326491d723f921cdcea7da54138ccfc3859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20DUBOIN?= Date: Sat, 7 Mar 2026 21:29:05 +0100 Subject: [PATCH 05/10] sys/signal: support POSIX signals This commit adds support for the follwing POSIX syscalls: - sigaction() - sigprocmask() - sigpending() What is still missing in this implementation: - Support for process pausing and continuing - Support for real time syscalls --- include/kernel/arch/i686/signal.h | 6 + include/kernel/process.h | 23 + include/kernel/signal.h | 120 +++ include/kernel/syscalls.h | 1 + kernel/arch/i686/build.mk | 1 + kernel/arch/i686/signal.c | 93 +++ kernel/build.mk | 1 + kernel/misc/exec.c | 9 + kernel/sys/interrupts.c | 3 + kernel/sys/process.c | 60 +- kernel/sys/signal.c | 780 +++++++++++++++++- .../include/dailyrun/arch/i686/signal.h | 20 + .../lib/dailyrun/include/dailyrun/syscalls.h | 10 +- root/usr/lib/dailyrun/include/sys/signal.h | 11 + 14 files changed, 1126 insertions(+), 12 deletions(-) create mode 100644 include/kernel/arch/i686/signal.h create mode 100644 include/kernel/signal.h create mode 100644 kernel/arch/i686/signal.c create mode 100644 root/usr/lib/dailyrun/include/dailyrun/arch/i686/signal.h create mode 100644 root/usr/lib/dailyrun/include/sys/signal.h diff --git a/include/kernel/arch/i686/signal.h b/include/kernel/arch/i686/signal.h new file mode 100644 index 00000000..b3d91cf6 --- /dev/null +++ b/include/kernel/arch/i686/signal.h @@ -0,0 +1,6 @@ +#ifndef KERNEL_ARCH_I686_SIGNAL_H +#define KERNEL_ARCH_I686_SIGNAL_H + +#include + +#endif /* KERNEL_ARCH_I686_SIGNAL_H */ diff --git a/include/kernel/process.h b/include/kernel/process.h index 6fb1897a..15be34d5 100644 --- a/include/kernel/process.h +++ b/include/kernel/process.h @@ -35,6 +35,7 @@ #include #include #include +#include #include #include @@ -105,6 +106,13 @@ struct process { struct file *files[PROCESS_FD_COUNT]; spinlock_t files_lock; /*!< Lock for @ref open_files */ + /* + * Signal handling. + */ + struct signal_set *sig_set; /* Registered signal handlers. */ + struct signal_queue sig_pending; + sig_sa_sigaction_t sig_handler; /* stub handler set by sigsethandler(). */ + thread_state_t state; uint8_t exit_status; /** Transmitted to the parent process during wait() */ @@ -153,6 +161,12 @@ typedef struct thread { } sleep; }; + /* + * Signal handling. + */ + struct signal_queue sig_pending; + sigset_t sig_blocked; /* mask of currently blocked signals. */ + } thread_t; /* @@ -307,6 +321,9 @@ extern struct process *init_process; */ void process_init_kernel_process(void); +/** Kill a process. */ +void process_kill(struct process *process, int status); + /** Register an open file inside the process's open file descriptor table. * @return The registered file's index inside the open file descriptor table. */ @@ -419,6 +436,12 @@ void thread_kill(thread_t *); */ struct thread *thread_fork(struct thread *, thread_entry_t, void *); +/** Try and deliver the first non-blocked pending signal. + * + * This function should be called before returning to userland. + */ +void thread_deliver_pending_signal(struct thread *thread); + /** Find an **alive** thread by its TID. */ struct thread *thread_find_by_tid(pid_t tid); diff --git a/include/kernel/signal.h b/include/kernel/signal.h new file mode 100644 index 00000000..1efe8fc9 --- /dev/null +++ b/include/kernel/signal.h @@ -0,0 +1,120 @@ +/* + * Posix signals + * + * Reference: + * * POSIX 2.4 - Signal Concepts + */ + +#ifndef KERNEL_SIGNAL_H +#define KERNEL_SIGNAL_H + +#include +#include +#include + +#include + +#include + +#if ARCH == i686 +#include +#endif + +struct thread; +struct process; + +#define SIGNAL_MIN 1 +#define SIGNAL_MAX (SIGNAL_COUNT - 1) +#define SIGNAL_COUNT NSIG + +/* + * A pending signal. + * + * This struct holds information about a pending signals that is necessary + * to take decisions and fill the structures during signal delivery. + */ +struct signal_context { + node_t this; /* used by struct signal_queue */ + siginfo_t si_info; + int si_signo; +}; + +/* + * A queue of pending signals. + * + * There exists one queue of pending signal per process AND per thread. + */ +struct signal_queue { + spinlock_t lock; + llist_t signals; /* struct signal_context */ + sigset_t pending; +}; + +static inline void signal_queue_init(struct signal_queue *queue) +{ + INIT_SPINLOCK(queue->lock); + INIT_LLIST(queue->signals); +} + +/* + * Reflects what is specified in sigaction(). + */ +struct signal_action { + struct sigaction sa_action; +}; + +/* + * + */ +struct signal_set { + spinlock_t lock; /* should be held when accessing this structure. */ + struct signal_action sig_actions[SIGNAL_COUNT]; +}; + +/* + * Frame pushed onto the stack before calling the signal handler. + */ +struct signal_frame { + int signo; + siginfo_t *p_siginfo; + ucontext_t *p_ucontext; + /* Above are the arguments passed to the signal handler. */ + siginfo_t siginfo; + ucontext_t ucontext; +}; + +/** Free an existing signal set structure. */ +void signal_set_free(struct signal_set *set); + +/** Clone an existing signal set. */ +struct signal_set *signal_set_clone(struct signal_set *set); + +/** Reset all signal actions to their default value. */ +void signal_set_reset(struct signal_set *set); + +struct signal_context *signal_queue_pop(struct signal_queue *queue, + sigset_t blocked); + +/** Remove and free all signals present inside a signal queue. */ +size_t signal_queue_flush(struct signal_queue *queue); + +void signal_deliver(struct thread *thread, struct signal_context *sig_ctx); + +/* + * Generate a process-wide signal. + */ +error_t signal_process(struct process *process, const siginfo_t *sig_info); + +/* + * Generate a thread-specific signal. + */ +error_t signal_thread(struct thread *thread, const siginfo_t *sig_info); + +/* + * Arch-specific signal related functions. + */ + +error_t arch_signal_deliver_catch(struct thread *, const struct signal_action *, + const struct signal_context *); + +#endif /* KERNEL_SIGNAL_H */ diff --git a/include/kernel/syscalls.h b/include/kernel/syscalls.h index 660029bb..36c7bc66 100644 --- a/include/kernel/syscalls.h +++ b/include/kernel/syscalls.h @@ -27,6 +27,7 @@ #include #include +#include typedef struct syscall_args { u32 nr; diff --git a/kernel/arch/i686/build.mk b/kernel/arch/i686/build.mk index b25ab07b..ce57657a 100644 --- a/kernel/arch/i686/build.mk +++ b/kernel/arch/i686/build.mk @@ -12,6 +12,7 @@ KERNEL_ARCH_SRCS := \ interrupts.asm \ process.c \ process.S \ + signal.c \ syscalls.c \ mmu.c \ setup.c \ diff --git a/kernel/arch/i686/signal.c b/kernel/arch/i686/signal.c new file mode 100644 index 00000000..6d5ac936 --- /dev/null +++ b/kernel/arch/i686/signal.c @@ -0,0 +1,93 @@ +#include +#include +#include +#include +#include + +/* + * Setup user stack to execute the given signal handler when returning + * to userland. + */ +error_t +arch_signal_deliver_catch(struct thread *thread, + const struct signal_action *sig_action, + const struct signal_context *sig_ctx) +{ + sig_sa_sigaction_t handler; + struct interrupt_frame *interrupt_frame; + struct signal_frame *signal_frame; + void *stack; + + /* + * We do not jump directly onto the handler but instead onto a stub + * that calls sigreturn() after executing it. This stub must be + * configured by the process using sigsethandler(). + */ + handler = READ_ONCE(thread->process->sig_handler); + if (!handler) + return E_INVAL; + + interrupt_frame = ((void *)thread->context.esp0) - sizeof(struct interrupt_frame); + stack = (void *)interrupt_frame->frame.esp; + + stack -= sizeof(*signal_frame); + signal_frame = stack; + memset(signal_frame, 0, sizeof(struct signal_frame)); + + /* + * Setup user context used by sigreturn. + * + * Save the original set of registers since those will eventually + * be orverwritten when exiting back from the userland handler to kernel + * mode. + * + * Save sa_handler so the stub handler knows which function to call. + * + * Save the current signal mask to restore it in sigreturn() if the + * signal handler exits normally (see sigaction()). + */ + signal_frame->ucontext.regs = interrupt_frame->regs; + signal_frame->ucontext.interrupt_frame = interrupt_frame->frame; + signal_frame->ucontext.sa_handler = sig_action->sa_action.sa_handler; + signal_frame->ucontext.sig_blocked = thread->sig_blocked; + + /* + * Setup siginfo. + */ + memcpy(&signal_frame->siginfo, &sig_ctx->si_info, sizeof(siginfo_t)); + + /* + * Setup arguments for the handler. + */ + signal_frame->p_ucontext = &signal_frame->ucontext; + signal_frame->p_siginfo = &signal_frame->siginfo; + signal_frame->signo = sig_ctx->si_signo; + + /* + * Update the interrupt frame so that the handler is called + * when attempting to return to userland. + */ + stack -= sizeof(void *); + interrupt_frame->frame.esp = (u32)stack; + interrupt_frame->frame.eip = (u32)handler; + + return E_SUCCESS; +} + +/* + * Return from a signal handler back to the normal process flow. + */ +int sys_sigreturn(struct user_signal_context *sig_uctx) +{ + struct interrupt_frame *interrupt_frame; + + /* + * Restore the original interrupt frame (pre-signal) and signal mask. + */ + interrupt_frame = ((struct interrupt_frame *)current->context.esp0) - 1; + interrupt_frame->regs = sig_uctx->regs; + interrupt_frame->frame = sig_uctx->interrupt_frame; + current->sig_blocked = sig_uctx->sig_blocked; + + return E_SUCCESS; +} diff --git a/kernel/build.mk b/kernel/build.mk index 7def5316..9f0a8b60 100644 --- a/kernel/build.mk +++ b/kernel/build.mk @@ -26,6 +26,7 @@ KERNEL_SRCS := \ sys/process.c \ sys/pci.c \ sys/signal.c \ + sys/interrupts.c \ sys/timer.c \ sys/interrupts.c \ misc/printk.c \ diff --git a/kernel/misc/exec.c b/kernel/misc/exec.c index 6e0f007c..6ac702f1 100644 --- a/kernel/misc/exec.c +++ b/kernel/misc/exec.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include @@ -336,6 +337,14 @@ error_t execfmt_execute(struct exec_params *params) can_return = false; + /* + * Reset signals (configuration and state). + */ + signal_queue_flush(¤t->process->sig_pending); + signal_queue_flush(¤t->sig_pending); + signal_set_reset(current->process->sig_set); + current->process->sig_handler = NULL; + ret = address_space_init(current->process->as); if (ret) { log_err("failed to re-init the address space: %pe", &ret); diff --git a/kernel/sys/interrupts.c b/kernel/sys/interrupts.c index fad67c83..cbf11b06 100644 --- a/kernel/sys/interrupts.c +++ b/kernel/sys/interrupts.c @@ -49,6 +49,9 @@ error_t interrupt_handle(unsigned int nr) err = interrupt_chip_interrupt_handle(&interrupt_root_chip, nr); + if (!thread_is_kernel(current)) + thread_deliver_pending_signal(current); + /* * Try to reschedule the current thread. This is the best time to do so. * diff --git a/kernel/sys/process.c b/kernel/sys/process.c index 76e3918c..9d7a51cb 100644 --- a/kernel/sys/process.c +++ b/kernel/sys/process.c @@ -28,12 +28,10 @@ * This is also the case for the init process, which is forked from the initial * kernel process (which is provided with a dummy user-stack for this purpose). * - * Processes can only be killed in 2 ways: + * Processes can only be killed the following ways: * - * - process_kill() is called when the process calls the exit() syscall. - * - * - By the kernel when the process raises an exception or receives a signal - * whose default action is to kill the process (TODO). + * - process_kill() is called when the process calls the exit() syscall, or + * receives a signal for which the configured action is to exit the process. * * ### Kernel process * @@ -182,6 +180,7 @@ static void process_collect_zombie(struct process *zombie) WRITE_ONCE(zombie->state, SCHED_KILLED); llist_remove(&zombie->this); + signal_set_free(zombie->sig_set); kfree(zombie); } @@ -210,8 +209,10 @@ static void process_make_zombie(struct process *process) WRITE_ONCE(process->state, SCHED_ZOMBIE); /* - * Release all open files. + * Release any ressource that might still be held by the process (signal, + * open file descriptions, ...). */ + locked_scope (&process->files_lock) { for (size_t i = 0; i < PROCESS_FD_COUNT; ++i) { if (process->files[i]) @@ -219,6 +220,7 @@ static void process_make_zombie(struct process *process) } } + signal_queue_flush(&process->sig_pending); address_space_destroy(process->as); /* Attach all orphans to the init process. */ @@ -283,6 +285,8 @@ static struct process *process_new(void) INIT_LLIST(process->threads); INIT_LLIST(process->children); + signal_queue_init(&process->sig_pending); + return process; } @@ -383,6 +387,10 @@ void process_init_kernel_process(void) thread_set_user_stack(&kernel_process_initial_thread, ustack); + kernel_process.sig_set = NULL; + signal_queue_init(&kernel_process.sig_pending); + signal_queue_init(&kernel_process_initial_thread.sig_pending); + llist_add(&threads_list, &kernel_process_initial_thread.this_global); } @@ -486,6 +494,8 @@ thread_t *thread_spawn(struct process *process, thread_entry_t entrypoint, else thread->tid = process_next_pid(); + signal_queue_init(&thread->sig_pending); + err = arch_thread_init(thread, entrypoint, data, esp, ebp); if (err) { log_err("Failed to initialize new thread: %pe", &err); @@ -533,6 +543,8 @@ static void thread_free(thread_t *thread) if (unlikely(thread == current)) PANIC("thread %d tried to kill itself", thread->tid); + signal_queue_flush(&thread->sig_pending); + no_preemption_scope () { vm_free(&kernel_address_space, thread_get_kernel_stack(thread)); @@ -686,6 +698,11 @@ thread_fork(struct thread *thread, thread_entry_t entrypoint, void *arg) PROCESS_NAME_MAX_LEN); address_space_copy_current(new_process->as); new_process->creds = creds_get(current->process->creds); + new_process->sig_set = signal_set_clone(current->process->sig_set); + if (new_process->sig_set == NULL) { + err = E_NOMEM; + goto process_destroy; + } } /* Duplicate the current process' open files. */ @@ -716,10 +733,16 @@ thread_fork(struct thread *thread, thread_entry_t entrypoint, void *arg) */ thread_set_user_stack(new, thread_get_user_stack(thread)); + /* + * The signal mask for a thread is inherited from the creating thread. + */ + new->sig_blocked = thread->sig_blocked; + return new; process_destroy: address_space_destroy(new_process->as); + signal_set_free(new_process->sig_set); kfree(new_process); return PTR_ERR(err); } @@ -857,3 +880,28 @@ struct thread *thread_find_by_tid(pid_t tid) return NULL; } + +/* + * + */ +void thread_deliver_pending_signal(struct thread *thread) +{ + struct signal_context *sig_ctx; + + /* + * Find the first pending signal that is deliverable. + * + * Prioritize thread-specific signals. + */ + sig_ctx = signal_queue_pop(&thread->sig_pending, + thread->sig_blocked); + if (!sig_ctx) + sig_ctx = signal_queue_pop(&thread->process->sig_pending, + thread->sig_blocked); + + /* No pending signal. */ + if (!sig_ctx) + return; + + signal_deliver(thread, sig_ctx); +} diff --git a/kernel/sys/signal.c b/kernel/sys/signal.c index 4f4b823e..914042fd 100644 --- a/kernel/sys/signal.c +++ b/kernel/sys/signal.c @@ -1,11 +1,783 @@ +#define LOG_DOMAIN "signal" + #include +#include +#include +#include +#include +#include +#include +#include + +static struct kmem_cache *kmem_cache_sigset; +static struct kmem_cache *kmem_cache_sigctx; + +/* + * Default action taken when + */ +enum signal_action_type { + SIG_ACTION_TERMINATE, + SIG_ACTION_ABORT, + SIG_ACTION_IGNORE, + SIG_ACTION_STOP, + SIG_ACTION_CONTINUE, + SIG_ACTION_CATCH, +}; + +/* + * Default signal action performed by SIG_DFL. + */ +static const enum signal_action_type signal_actions_default[SIGNAL_COUNT] = { + [SIGABRT] = SIG_ACTION_ABORT, + [SIGALRM] = SIG_ACTION_TERMINATE, + [SIGBUS] = SIG_ACTION_ABORT, + [SIGCHLD] = SIG_ACTION_IGNORE, + [SIGCONT] = SIG_ACTION_CONTINUE, + [SIGFPE] = SIG_ACTION_ABORT, + [SIGHUP] = SIG_ACTION_TERMINATE, + [SIGILL] = SIG_ACTION_ABORT, + [SIGINT] = SIG_ACTION_TERMINATE, + [SIGKILL] = SIG_ACTION_TERMINATE, + [SIGPIPE] = SIG_ACTION_TERMINATE, + [SIGQUIT] = SIG_ACTION_ABORT, + [SIGSEGV] = SIG_ACTION_ABORT, + [SIGSTOP] = SIG_ACTION_STOP, + [SIGTERM] = SIG_ACTION_TERMINATE, + [SIGTSTP] = SIG_ACTION_STOP, + [SIGTTIN] = SIG_ACTION_STOP, + [SIGTTOU] = SIG_ACTION_STOP, + [SIGUSR1] = SIG_ACTION_TERMINATE, + [SIGUSR2] = SIG_ACTION_TERMINATE, + [SIGWINCH] = SIG_ACTION_IGNORE, + [SIGSYS] = SIG_ACTION_ABORT, + [SIGTRAP] = SIG_ACTION_ABORT, + [SIGURG] = SIG_ACTION_IGNORE, + [SIGVTALRM] = SIG_ACTION_TERMINATE, + [SIGXCPU] = SIG_ACTION_ABORT, + [SIGXFSZ] = SIG_ACTION_ABORT, +}; + +/* + * + */ +struct signal_set *signal_set_alloc(void) +{ + return kmem_cache_alloc(kmem_cache_sigset, 0); +} + +/* + * Used by the kmem_cache API. + */ +static void signal_set_constructor(void *obj) +{ + struct signal_set *set = obj; + + INIT_SPINLOCK(set->lock); +} + +/* + * + */ +void signal_set_free(struct signal_set *set) +{ + if (!set) + return; + + kmem_cache_free(kmem_cache_sigset, set); +} + +/* + * Reset all installed signal actions. + * This should be called inside execve(). + */ +void signal_set_reset(struct signal_set *set) +{ + spinlock_acquire(&set->lock); + + for (int signo = SIGNAL_MIN; signo <= SIGNAL_MAX; ++signo) { + struct sigaction *sa_action = &set->sig_actions[signo].sa_action; + + sa_action->sa_flags = 0; + sa_action->sa_mask = 0; + + /* + * Signals set to the default action, or setto be caught, must be set + * to the default action in the new process. + * + * Signals set to be ignored stay that way. The only special case + * being SIGCHLD for which the choice is implementation defined. + * In our case we always reset SIGCHLD back to the default action. + */ + if (sa_action->sa_handler != SIG_IGN || signo == SIGCHLD) + sa_action->sa_handler = SIG_DFL; + } + + spinlock_release(&set->lock); +} + +/* + * + */ +static void signal_set_init(struct signal_set *set) +{ + for (int signo = SIGNAL_MIN; signo <= SIGNAL_MAX; ++signo) + set->sig_actions[signo].sa_action.sa_handler = SIG_DFL; +} + +/* + * + */ +struct signal_set *signal_set_clone(struct signal_set *set) +{ + struct signal_set *new; + + new = signal_set_alloc(); + if (new == NULL) + return new; + + + /* init inherits a null sigset from kproc */ + if (set == NULL) + signal_set_init(new); + else + memcpy(new->sig_actions, set->sig_actions, sizeof(new->sig_actions)); + + return new; +} + +/* + * + */ +static struct signal_context *signal_context_new(const siginfo_t *sig_info) +{ + struct signal_context *sig_ctx; + + if (sig_info->si_signo < SIGNAL_MIN || sig_info->si_signo > SIGNAL_MAX) + return PTR_ERR(E_INVAL); + + sig_ctx = kmem_cache_alloc(kmem_cache_sigctx, 0); + if (!sig_ctx) + return PTR_ERR(E_NOMEM); + + sig_ctx->si_info = *sig_info; + sig_ctx->si_signo = sig_info->si_signo; + + return sig_ctx; +} + +/* + * + */ +static void signal_context_destroy(struct signal_context *sig_ctx) +{ + llist_remove(&sig_ctx->this); + + kmem_cache_free(kmem_cache_sigctx, sig_ctx); +} + +/* + * + */ +static void signal_queue_push(struct signal_queue *queue, + struct signal_context *sig_ctx) +{ + spinlock_acquire(&queue->lock); + llist_add_tail(&queue->signals, &sig_ctx->this); + sigaddset(&queue->pending, sig_ctx->si_signo); + spinlock_release(&queue->lock); +} + +/* + * Pop and return the first deliverable signal inside the queue. + */ +struct signal_context *signal_queue_pop(struct signal_queue *queue, + sigset_t blocked) +{ + struct signal_context *sig_ctx = NULL; + + locked_scope (&queue->lock) + { + struct signal_context *entry = NULL; + + if (llist_is_empty(&queue->signals)) + return NULL; + + FOREACH_LLIST_ENTRY(entry, &queue->signals, this) { + /* + * Blocked signals whose associated action is to ignore the signal + * are left inside the queue until they can be 'delivered'. + * This behaviour is implementation defined (see POSIX 2.4.1). + */ + if (!sigismember(&blocked, entry->si_signo)) { + sig_ctx = entry; + break; + } + } + + if (!sig_ctx) + return NULL; + + /* + * Check if the queue still contains other pending signals with + * the same signal number to keep the mask of pending signals updated. + */ + FOREACH_LLIST_ENTRY_REVERSE(entry, &queue->signals, this) { + if (entry->si_signo == sig_ctx->si_signo) { + if (entry == sig_ctx) + sigdelset(&queue->pending, sig_ctx->si_signo); + break; + } + } + + llist_remove(&sig_ctx->this); + } + + return sig_ctx; +} + +/* + * Remove and free all instances of a given signal inside a signal queue. + * + * @return The number of signals removed. + */ +static size_t signal_queue_flush_signals(struct signal_queue *queue, + sigset_t to_remove) +{ + struct signal_context *cur; + struct signal_context *next; + size_t count = 0; + + spinlock_acquire(&queue->lock); + FOREACH_LLIST_ENTRY_SAFE(cur, next, &queue->signals, this) { + if (sigismember(&to_remove, cur->si_signo)) { + signal_context_destroy(cur); + count += 1; + } + } + queue->pending &= ~to_remove; + spinlock_release(&queue->lock); + + return count; +} + +/* + * Remove and free all signals present inside a signal queue. + * + * @return The number of signals inside the queue. + */ +size_t signal_queue_flush(struct signal_queue *queue) +{ + struct signal_context *cur; + struct signal_context *next; + size_t count = 0; + + spinlock_acquire(&queue->lock); + FOREACH_LLIST_ENTRY_SAFE(cur, next, &queue->signals, this) { + signal_context_destroy(cur); + count += 1; + } + queue->pending = 0; /* clear mask */ + spinlock_release(&queue->lock); + + return count; +} + +/* + * POSIX 2.4.3 + * + * The process is terminated as if by a call to _exit(), except that the status + * made available to wait(), waitid(), and waitpid() indicates abnormal + * termination by the signal. + */ +static void +signal_deliver_terminate(struct thread *thread, + const struct signal_action *sig_action MAYBE_UNUSED, + const struct signal_context *sig_ctx) +{ + u16 status; + + status = (sig_ctx->si_signo << 8) | sig_ctx->si_signo; + process_kill(thread->process, status); + + assert_not_reached(); +} + +/* + * + */ +static void +signal_deliver_abort(struct thread *thread, + const struct signal_action *sig_action MAYBE_UNUSED, + const struct signal_context *sig_ctx) +{ + u16 status; + + not_implemented("abort: core dump"); + status = (sig_ctx->si_signo << 8) | 0x80; + process_kill(thread->process, status); + + assert_not_reached(); +} + +/* + * POSIX 2.4.3 - Delivery of the signal shall have no effect on the process. + */ +static void +signal_deliver_ignore(struct thread *thread, + const struct signal_action *sig_action, + const struct signal_context *sig_ctx) +{ + UNUSED(thread); + UNUSED(sig_action); + UNUSED(sig_ctx); +} + +/* + * TODO: SIGSTOP + */ +static void +signal_deliver_stop(struct thread *thread, + const struct signal_action *sig_action, + const struct signal_context *sig_ctx) +{ + not_implemented("stop"); + signal_deliver_ignore(thread, sig_action, sig_ctx); +} + +/* + * TODO: SIGCONT + */ +static void +signal_deliver_continue(struct thread *thread, + const struct signal_action *sig_action, + const struct signal_context *sig_ctx) +{ + not_implemented("continue"); + signal_deliver_ignore(thread, sig_action, sig_ctx); +} + +/* + * Catch signal in a userland function. + */ +static void +signal_deliver_catch(struct thread *thread, + const struct signal_action *sig_action, + const struct signal_context *sig_ctx) +{ + if (arch_signal_deliver_catch(thread, sig_action, sig_ctx) != E_SUCCESS) + return; + + /* Install new signal mask configured by sigaction(). */ + thread->sig_blocked |= sig_action->sa_action.sa_mask; +} + +typedef void (*signal_deliver_func_t)(struct thread *, + const struct signal_action *, + const struct signal_context *); + +static const signal_deliver_func_t signal_deliver_functions[] = { + [SIG_ACTION_TERMINATE] = signal_deliver_terminate, + [SIG_ACTION_ABORT] = signal_deliver_abort, + [SIG_ACTION_IGNORE] = signal_deliver_ignore, + [SIG_ACTION_STOP] = signal_deliver_stop, + [SIG_ACTION_CONTINUE] = signal_deliver_continue, + [SIG_ACTION_CATCH] = signal_deliver_catch, +}; + +/* + * Main signal delivery function. + * + * It determines the final action to perform for the given signal based on + * previous calls to sigaction(), and handles signal delivery accordingly. + * + * This function does not check whether a signal is blocked, this verification + * should be performed by the caller (e.g. signal_queue_pop). + */ +void signal_deliver(struct thread *thread, struct signal_context *sig_ctx) +{ + struct signal_action *sig_action; + struct signal_set *sig_set; + enum signal_action_type action_type; + signal_deliver_func_t deliver; + int signo = sig_ctx->si_signo; -#include + WARN_ON(thread != current); + sig_set = thread->process->sig_set; + spinlock_acquire(&sig_set->lock); + sig_action = &sig_set->sig_actions[signo]; + + /* + * Determine the final action to perform. + */ + action_type = SIG_ACTION_CATCH; + if (sig_action->sa_action.sa_handler == SIG_IGN) { + action_type = SIG_ACTION_IGNORE; + } else if (sig_action->sa_action.sa_handler == SIG_DFL) { + action_type = signal_actions_default[signo]; + } + + deliver = signal_deliver_functions[action_type]; + deliver(thread, sig_action, sig_ctx); + + spinlock_release(&sig_set->lock); + + signal_context_destroy(sig_ctx); +} + +/* + * + */ +static inline sigset_t signal_compute_mask(sigset_t mask) +{ + /* + * SIGKILL and SIGSTOP cannot be masked. + * + * This should be enforced without raising an error. + */ + sigdelset(&mask, SIGKILL); + sigdelset(&mask, SIGSTOP); + + return mask; +} + +/* + * Compute whether one process has permission to signal another. + */ +static inline bool +signal_can_generate(struct thread *sender, struct thread *receiver) +{ + struct user_creds *sender_creds = NULL; + struct user_creds *receiver_creds = NULL; + bool can_generate = true; + + /* + * Kernel threads cannot be signaled. + */ + if (thread_is_kernel(receiver)) + return false; + + if (thread_is_kernel(sender)) + return true; + + if (sender->process == receiver->process) + return true; + + sender_creds = creds_get(sender->process->creds); + if (creds_is_root(sender_creds)) + goto out; + + receiver_creds = creds_get(receiver->process->creds); + can_generate = (sender_creds->euid == receiver_creds->euid) || + (sender_creds->ruid == receiver_creds->ruid); + +out: + creds_put(sender_creds); + creds_put(receiver_creds); + return can_generate; +} + +/* + * Send signal to another process or thread. + */ +error_t signal_generate(struct thread *thread, const siginfo_t *sig_info, + bool to_thread) +{ + struct signal_context *sig_ctx; + struct signal_queue *queue; + struct process *process = thread->process; + struct thread *child; + sigset_t to_remove; + + if (!signal_can_generate(current, thread)) + return E_PERM; + + sig_ctx = signal_context_new(sig_info); + if (IS_ERR(sig_ctx)) + return ERR_FROM_PTR(sig_ctx); + + /* + * FIXME: Potential TOCTOU error! + * + * If another processor pulls the rug from under us and the process + * or the thread is killed and released before we arrive here. + * + * Threads should be refcounted to avoid this, and we should be able to + * increase a process's reference count also. + * + * Let's simply hold the process' lock for now as a best effort... + */ + spinlock_acquire (&process->lock); + + /* + * When any stop signal is generated, all pending SIGCONT signals + * for that process or any of the threads within that process shall be + * discarded. + * + * When SIGCONT is generated, all pending stop signals shall be discarded. + */ + + sigemptyset(&to_remove); + switch (sig_info->si_signo) { + case SIGSTOP: + case SIGTSTP: + case SIGTTIN: + case SIGTTOU: + sigaddset(&to_remove, SIGCONT); + break; + case SIGCONT: + sigaddset(&to_remove, SIGSTOP); + sigaddset(&to_remove, SIGTSTP); + sigaddset(&to_remove, SIGTTIN); + sigaddset(&to_remove, SIGTTOU); + break; + default: + break; + } + + if (to_remove) { + signal_queue_flush_signals(&process->sig_pending, to_remove); + FOREACH_LLIST_ENTRY(child, &process->children, this_proc) + signal_queue_flush_signals(&child->sig_pending, to_remove); + } + + queue = to_thread ? &thread->sig_pending : &process->sig_pending; + signal_queue_push(queue, sig_ctx); + + spinlock_release(&process->lock); + + return E_SUCCESS; +} + +/* + * Generate a process-wide signal. + */ +error_t signal_process(struct process *process, const siginfo_t *sig_info) +{ + struct thread *thread; + + thread = llist_first_entry(&process->threads, typeof(*thread), this_proc); + return signal_generate(thread, sig_info, false); +} + +/* + * Generate a thread-specific signal. + */ +error_t signal_thread(struct thread *thread, const siginfo_t *sig_info) +{ + return signal_generate(thread, sig_info, true); +} + +/* + * Generate a signal to multiple processes. + */ +static error_t signal_brodcast(pid_t pid, siginfo_t *sig_info) +{ + struct process *process; + + /* TODO: Process Group IDs. */ + if (pid < 0) + return -E_NOT_SUPPORTED; + + spinlock_acquire(&processes_list_lock); + + FOREACH_LLIST_ENTRY(process, &processes_list, this_global) { + if (pid == 0 && process->pid == pid) + signal_process(process, sig_info); + } + + spinlock_release(&processes_list_lock); + + return E_SUCCESS; + +} + +/* + * + */ int sys_kill(pid_t pid, int signal) { - UNUSED(pid); - UNUSED(signal); + siginfo_t sig_info; + + if (signal < SIGNAL_MIN || signal > SIGNAL_MAX) + return -E_INVAL; + + memset(&sig_info, 0, sizeof(sig_info)); + sig_info.si_signo = signal; + sig_info.si_code = SI_USER; + + if (pid > 0) { + struct process *process; + + /* + * FIXME: Process can also be a zombie. + */ + process = process_find_by_pid(pid); + if (!process) + return -E_SRCH; + + return -signal_process(process, &sig_info); + } + + return signal_brodcast(pid, &sig_info); +} + +/* + * + */ +static error_t signal_action_configure(struct signal_set *set, int signo, + struct signal_action *sig_action, + struct signal_action *old_sig_action) +{ + struct sigaction *sa_action = &sig_action->sa_action; + + /* + * Attempts to set a signal that cannot be caught/ignored return an error. + * + * This is an implementation defined behaviour (POSIX - sigaction). + */ + if (signo == SIGKILL || signo == SIGSTOP) + return E_INVAL; + + if (signo < SIGNAL_MIN || signo > SIGNAL_MAX) + return E_INVAL; + + /* + * Compute the final mask. + */ + sa_action->sa_mask = signal_compute_mask(sa_action->sa_mask); + + locked_scope (&set->lock) + { + struct signal_action *orig; + + orig = &set->sig_actions[signo]; + if (old_sig_action) + *old_sig_action = *orig; + *orig = *sig_action; + } + + return E_SUCCESS; +} + +/* + * + */ +int sys_sigaction(int sig, const struct sigaction *act, struct sigaction *oact) +{ + struct signal_action sig_action; + struct signal_action old_sig_action; + error_t err; + + memset(&sig_action, 0, sizeof(sig_action)); + sig_action.sa_action = *act; + + err = signal_action_configure(current->process->sig_set, sig, &sig_action, + &old_sig_action); + if (err) + return err; + + if (oact) + *oact = old_sig_action.sa_action; + + return E_SUCCESS; +} + +/* + * Change or read the signal mask of the calling thread. + * + * TODO: EFAULT: The set or oldset argument points outside the process's + * allocated address space. + */ +int sys_sigprocmask(int how, const sigset_t *set, sigset_t *old, size_t getsize) +{ + if (old) { + if (getsize != sizeof(*old)) + return -E_INVAL; + *old = current->sig_blocked; + } + + if (!set) + return 0; + + /* Clear out unmaskable signals. */ + *old = signal_compute_mask(*old); + + switch (how) { + case SIG_BLOCK: + current->sig_blocked |= *old; + break; + case SIG_UNBLOCK: + current->sig_blocked &= ~(*old); + break; + case SIG_SETMASK: + current->sig_blocked = *old; + break; + default: + return -E_INVAL; + } + + return 0; +} + +/* + * Fetch the set of pending signals that are blocked from delivery to the + * calling thread. + */ +int sys_sigpending(sigset_t *set) +{ + sigset_t pending = 0; + + pending |= current->sig_pending.pending; + pending |= current->process->sig_pending.pending; + *set = pending & current->sig_blocked; - return -E_NOT_SUPPORTED; + return 0; } + +/* + * Configure the stub signal handler. + * + * The stub handler calls the real signal handler and performs the necessary + * actions afterwards to restore the original state of the usersack + * (i.e. calling sigreturn()). + * + * @args handler The stub handler + * + * @return EINVAL The handler function is invalid. + */ +int sys_sigsethandler(sig_sa_sigaction_t handler) +{ + if (IS_KERNEL_ADDRESS(handler)) + return -E_INVAL; + + /* arch_signal_deliver_catch() must use READ_ONCE(). */ + WRITE_ONCE(current->process->sig_handler, handler); + + return 0; +} + +/* + * Initialize the signal API. + */ +static error_t init_signals(void) +{ + kmem_cache_sigset = kmem_cache_create("signal_set", + sizeof(struct signal_set), 1, + signal_set_constructor, NULL); + kmem_cache_sigctx = kmem_cache_create("signal", + sizeof(struct signal_context), 1, + NULL, NULL); + + if (IS_ERR(kmem_cache_sigset)) + return ERR_FROM_PTR(kmem_cache_sigset); + + if (IS_ERR(kmem_cache_sigctx)) { + kmem_cache_destroy(kmem_cache_sigset); + return ERR_FROM_PTR(kmem_cache_sigctx); + } + + return E_SUCCESS; +} + +DECLARE_INITCALL(INIT_NORMAL, init_signals); diff --git a/root/usr/lib/dailyrun/include/dailyrun/arch/i686/signal.h b/root/usr/lib/dailyrun/include/dailyrun/arch/i686/signal.h new file mode 100644 index 00000000..8b859d3b --- /dev/null +++ b/root/usr/lib/dailyrun/include/dailyrun/arch/i686/signal.h @@ -0,0 +1,20 @@ +#ifndef DAILYRUN_ARCH_I686_SIGNAL_H +#define DAILYRUN_ARCH_I686_SIGNAL_H + +#include + +/* + * User context structure pushed onto the stack before sending a signal + * and re-used by sigreturn() to restore the original program state after + * exiting the signal handler. + */ +struct user_signal_context { + struct x86_regs regs; + struct x86_interrupt_frame interrupt_frame; + void *sa_handler; + sigset_t sig_blocked; +}; + +typedef struct user_signal_context ucontext_t; + +#endif /* DAILYRUN_ARCH_I686_SIGNAL_H */ diff --git a/root/usr/lib/dailyrun/include/dailyrun/syscalls.h b/root/usr/lib/dailyrun/include/dailyrun/syscalls.h index 7c3c9b71..221c7b4c 100644 --- a/root/usr/lib/dailyrun/include/dailyrun/syscalls.h +++ b/root/usr/lib/dailyrun/include/dailyrun/syscalls.h @@ -33,16 +33,22 @@ F(getgid, 25, 0, default, gid_t, void) \ F(getegid, 26, 0, default, gid_t, void) \ F(kill, 27, 2, default, int, pid_t, int) \ + F(sigaction, 28, 3, default, int, int, const struct sigaction *, struct sigaction *) \ + F(sigprocmask, 29, 4, default, int, int, const sigset_t *, sigset_t *, size_t) \ + F(sigpending, 30, 1, default, int, sigset_t *) \ + F(sigsethandler, 31, 1, default, int, sig_sa_sigaction_t) \ + F(sigreturn, 32, 1, default, int, ucontext_t *) \ /* * The list of available syscall vectors. */ enum syscall_nr { #define SYSCALL_NUMBER(name, vector, ...) SYS_##name = vector, - DEFINE_SYSCALLS(SYSCALL_NUMBER) SYSCALL_COUNT + DEFINE_SYSCALLS(SYSCALL_NUMBER) /* */ + SYSCALL_COUNT #undef SYSCALL_NUMBER }; #endif /* _DAILYRUN_SYSCALLS_H */ -// vi: ft=c tabstop=4 noexpandtab +// vi: ft=c tabstop=4 shiftwidth=4 noexpandtab diff --git a/root/usr/lib/dailyrun/include/sys/signal.h b/root/usr/lib/dailyrun/include/sys/signal.h new file mode 100644 index 00000000..2c73bc4e --- /dev/null +++ b/root/usr/lib/dailyrun/include/sys/signal.h @@ -0,0 +1,11 @@ +#include_next + +/* + * Signature of both signal handler functions inside struct sigaction. + */ +typedef void (*sig_sa_handler_t)(int); +typedef void (*sig_sa_sigaction_t)(int, siginfo_t *, void *); + +#ifdef __i686__ +#include +#endif From a2d5fdc4132a03dede76895ef8df336c73261ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20DUBOIN?= Date: Wed, 11 Mar 2026 23:22:23 +0100 Subject: [PATCH 06/10] sys/process: store POSIX exit_status value in struct process From POSIX.1-2024: The value of status may be 0, EXIT_SUCCESS, EXIT_FAILURE, or any other value, though only the least significant 8 bits (that is, status & 0377) shall be available from wait() and waitpid(); Compute and store the final value in sys_exit() to make regular exits distinguishable from ones caused by a signal. --- include/kernel/process.h | 4 ++-- kernel/sys/process.c | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/kernel/process.h b/include/kernel/process.h index 15be34d5..c157fe7f 100644 --- a/include/kernel/process.h +++ b/include/kernel/process.h @@ -114,7 +114,7 @@ struct process { sig_sa_sigaction_t sig_handler; /* stub handler set by sigsethandler(). */ thread_state_t state; - uint8_t exit_status; /** Transmitted to the parent process during wait() */ + uint16_t exit_status; /** Transmitted to the parent process during wait() */ struct user_creds *creds; /** Process credentials. */ @@ -322,7 +322,7 @@ extern struct process *init_process; void process_init_kernel_process(void); /** Kill a process. */ -void process_kill(struct process *process, int status); +void process_kill(struct process *process, uint16_t status); /** Register an open file inside the process's open file descriptor table. * @return The registered file's index inside the open file descriptor table. diff --git a/kernel/sys/process.c b/kernel/sys/process.c index 9d7a51cb..f2d55a69 100644 --- a/kernel/sys/process.c +++ b/kernel/sys/process.c @@ -290,7 +290,7 @@ static struct process *process_new(void) return process; } -void process_kill(struct process *process, int status) +void process_kill(struct process *process, uint16_t status) { if (process == &kernel_process) { log_err("Trying to free the kernel process"); @@ -775,7 +775,7 @@ void thread_set_mmu(struct thread *thread, paddr_t mmu) void sys_exit(int status) { - process_kill(current->process, status); + process_kill(current->process, status << 8); } pid_t sys_getpid(void) @@ -791,7 +791,6 @@ pid_t sys_waitpid(pid_t pid, int *stat_loc, int options) struct process *process = current->process; struct process *child; pid_t child_pid; - uint8_t signo = 0; bool exists; bool found; @@ -836,8 +835,7 @@ pid_t sys_waitpid(pid_t pid, int *stat_loc, int options) schedule(); } - if (stat_loc) - *stat_loc = (child->exit_status << 8) | signo; + *stat_loc = child->exit_status; child_pid = child->pid; process_collect_zombie(child); From 44903c49466fefd4bc0e95c333e0ec42be974c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20DUBOIN?= Date: Sat, 7 Mar 2026 21:35:04 +0100 Subject: [PATCH 07/10] sys/interrupts: generate signal when a user process faults This commit defines a few default interrupt handlers that simply generates the appropriate POSIX signal when a fault occurs. Such errors should only ever be allowed for userland code. As such, the handlers call the panic fnuction if the faulting process was running in kernel mode. Link: https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/signal.h.html --- include/kernel/interrupts.h | 8 ++++++++ kernel/arch/i686/interrupts.c | 3 +++ kernel/arch/i686/mmu.c | 19 +++++++++++++++++-- kernel/sys/interrupts.c | 27 +++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 2 deletions(-) diff --git a/include/kernel/interrupts.h b/include/kernel/interrupts.h index aff53bd4..8de8a661 100644 --- a/include/kernel/interrupts.h +++ b/include/kernel/interrupts.h @@ -174,6 +174,14 @@ static inline void scope_irq_off_destructor(scope_irq_off_t *guard) scope_irq_off_constructor(); \ !guard.done; guard.done = true) + +/* + * Generic interrupt handlers. + */ + +extern struct interrupt_handler division_by_zero; +extern struct interrupt_handler invalid_instruction; + /** @} */ #endif /* KERNEL_INTERRUPTS_H */ diff --git a/kernel/arch/i686/interrupts.c b/kernel/arch/i686/interrupts.c index 3a82a86d..67ba3519 100644 --- a/kernel/arch/i686/interrupts.c +++ b/kernel/arch/i686/interrupts.c @@ -150,6 +150,9 @@ error_t arch_interrupts_init(struct interrupt_chip *root_chip) interrupt_handler_stubs[i]); } + interrupts_install_static_handler(DIVISION_ERROR, &division_by_zero); + interrupts_install_static_handler(INVALID_OPCODE, &invalid_instruction); + /* * Make syscall interrupt callable from userland. */ diff --git a/kernel/arch/i686/mmu.c b/kernel/arch/i686/mmu.c index aac5ffb8..aa1d19c6 100644 --- a/kernel/arch/i686/mmu.c +++ b/kernel/arch/i686/mmu.c @@ -794,14 +794,29 @@ static INTERRUPT_HANDLER_FUNCTION(page_fault) : current->process->as; if (unlikely(!as)) { log_err("page_fault: address space is NULL"); - goto page_fault_panic; + goto page_fault_error; } if (!address_space_fault(as, faulty_address, is_cow)) return INTERRUPT_HANDLED; } -page_fault_panic: +page_fault_error: + + if (!thread_is_kernel(current)) { + siginfo_t sig_info = { + .si_signo = SIGSEGV, + .si_code = 0, + }; + log_info("%s: segmentation fault: %s access on a %s page at %p " + "(eip: %#08x)", + current->process->name, error.write ? "write" : "read", + error.present ? "protected" : "non-present", faulty_address, + frame->frame.eip); + signal_process(current->process, &sig_info); + return INTERRUPT_HANDLED; + } + PANIC("PAGE FAULT at " FMT32 ": %s access on a %s page %s", faulty_address, error.write ? "write" : "read", error.present ? "protected" : "non-present", diff --git a/kernel/sys/interrupts.c b/kernel/sys/interrupts.c index cbf11b06..b5841e5d 100644 --- a/kernel/sys/interrupts.c +++ b/kernel/sys/interrupts.c @@ -6,6 +6,7 @@ #include #include #include +#include #include @@ -162,6 +163,32 @@ const char *interrupt_name(unsigned int nr) return interrupt_chip_interrupt_name(&interrupt_root_chip, nr); } +/* + * Define a simple default interrupt handler that signals the process + * through the appropriate UNIX signal vector. + */ +#define define_process_signal_interrupt_handler(_name, _signo, _code) \ + static u32 _name##_handler(MAYBE_UNUSED void *data) \ + { \ + siginfo_t info; \ + \ + if (thread_is_kernel(current)) \ + PANIC(stringify(_name)); \ + \ + info.si_signo = _signo; \ + info.si_code = _code; \ + signal_process(current->process, &info); \ + \ + return INTERRUPT_HANDLED; \ + } \ + \ + struct interrupt_handler _name = { \ + .handler = _name##_handler, \ + } + +define_process_signal_interrupt_handler(division_by_zero, SIGILL, 0); +define_process_signal_interrupt_handler(invalid_instruction, SIGILL, 0); + /* * */ From e545b7cb018d955b0fed8301525415e49ba52195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20DUBOIN?= Date: Tue, 10 Mar 2026 00:06:39 +0100 Subject: [PATCH 08/10] toolchain/newlib: fix /usr/lib/dailyrun not accessible when building Newlib's configure script hardcodes a few system header directories that are included before our own header. Patch the configure script to be able to insert our own system headers (in first place to be able to use #include_next). Despite this we are still unable to access our own header directly in syscalls.c (i have no clue why), so we had to come up with a little trick until we find a proper solution. --- toolchain/newlib/build.mk | 2 + toolchain/newlib/port/configure.ac | 3646 +++++++++++++++++ .../port/newlib/libc/sys/dailyrun/syscalls.c | 10 + 3 files changed, 3658 insertions(+) create mode 100644 toolchain/newlib/port/configure.ac diff --git a/toolchain/newlib/build.mk b/toolchain/newlib/build.mk index 21d3c22c..53725db7 100644 --- a/toolchain/newlib/build.mk +++ b/toolchain/newlib/build.mk @@ -22,6 +22,7 @@ $(NEWLIB_BUILD_DIR): $(NEWLIB_TAR) $(SILENT)cp -rf $(TOOLCHAIN_NEWLIB_DIR)/port/* $@ $(call LOG,RECONF,$@) $(SILENT)cd $@/newlib && autoreconf -vfi $(SILENT_OUTPUT) + $(SILENT)cd $@ && autoreconf -vfi $(SILENT_OUTPUT) $(SILENT)cp -rf $(TOOLCHAIN_NEWLIB_DIR)/port/* $@ newlib/configure: $(NEWLIB_BUILD_DIR)/config.status @@ -35,6 +36,7 @@ $(NEWLIB_BUILD_DIR)/config.status: $(NEWLIB_BUILD_DIR) --prefix="$(SYSROOT)/usr" \ --with-tooldir="$(SYSROOT)/usr" \ --with-build-sysroot="$(SYSROOT)" \ + --with-flags-for-target="-isystem $(SYSROOT)/usr/lib/dailyrun/include" \ $(NEWLIB_CONFIGURE_FLAGS) \ > configure.log \ 2> configure.err diff --git a/toolchain/newlib/port/configure.ac b/toolchain/newlib/port/configure.ac new file mode 100644 index 00000000..f6af08e2 --- /dev/null +++ b/toolchain/newlib/port/configure.ac @@ -0,0 +1,3646 @@ +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, +# 2014, 2015, 2016 Free Software Foundation, Inc. +# +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program 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 +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; see the file COPYING3. If not see +# . + +############################################################################## +### WARNING: this file contains embedded tabs. Do not run untabify on this file. + +m4_include(config/acx.m4) +m4_include(config/override.m4) +m4_include(config/proginstall.m4) +m4_include(config/elf.m4) +m4_include(config/gcc-plugin.m4) +m4_include([libtool.m4]) +m4_include([ltoptions.m4]) +m4_include([ltsugar.m4]) +m4_include([ltversion.m4]) +m4_include([lt~obsolete.m4]) +m4_include([config/isl.m4]) + +AC_INIT(move-if-change) +AC_DISABLE_OPTION_CHECKING + +progname=$0 +# if PWD already has a value, it is probably wrong. +if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi + +# Export original configure arguments for use by sub-configures. +# Quote arguments with shell meta charatcers. +TOPLEVEL_CONFIGURE_ARGUMENTS= +set -- "$progname" "$@" +for ac_arg +do + case "$ac_arg" in + *" "*|*" "*|*[[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\']]*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` + # if the argument is of the form -foo=baz, quote the baz part only + ac_arg=`echo "'$ac_arg'" | sed "s/^'\([[-a-zA-Z0-9]]*=\)/\\1'/"` ;; + *) ;; + esac + # Add the quoted argument to the list. + TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS $ac_arg" +done +if test "$silent" = yes; then + TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS --silent" +fi +# Remove the initial space we just introduced and, as these will be +# expanded by make, quote '$'. +TOPLEVEL_CONFIGURE_ARGUMENTS=`echo "x$TOPLEVEL_CONFIGURE_ARGUMENTS" | sed -e 's/^x *//' -e 's,\\$,$$,g'` +AC_SUBST(TOPLEVEL_CONFIGURE_ARGUMENTS) + +# Find the build, host, and target systems. +ACX_NONCANONICAL_BUILD +ACX_NONCANONICAL_HOST +ACX_NONCANONICAL_TARGET + +dnl Autoconf 2.5x and later will set a default program prefix if +dnl --target was used, even if it was the same as --host. Disable +dnl that behavior. This must be done before AC_CANONICAL_SYSTEM +dnl to take effect. +test "$host_noncanonical" = "$target_noncanonical" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_transform_name=s,y,y, + +AC_CANONICAL_SYSTEM +AC_ARG_PROGRAM + +m4_pattern_allow([^AS_FOR_TARGET$])dnl +m4_pattern_allow([^AS_FOR_BUILD$])dnl + +# Get 'install' or 'install-sh' and its variants. +AC_PROG_INSTALL +ACX_PROG_LN +AC_PROG_LN_S +AC_PROG_SED +AC_PROG_AWK + +srcpwd=`cd ${srcdir} ; ${PWDCMD-pwd}` + +# We pass INSTALL explicitly to sub-makes. Make sure that it is not +# a relative path. +if test "$INSTALL" = "${srcdir}/install-sh -c"; then + INSTALL="${srcpwd}/install-sh -c" +fi + +# Set srcdir to "." if that's what it is. +# This is important for multilib support. +pwd=`${PWDCMD-pwd}` +if test "${pwd}" = "${srcpwd}" ; then + srcdir=. +fi + +topsrcdir=$srcpwd + +extra_host_args= + +### To add a new directory to the tree, first choose whether it is a target +### or a host dependent tool. Then put it into the appropriate list +### (library or tools, host or target), doing a dependency sort. + +# Subdirs will be configured in the order listed in build_configdirs, +# configdirs, or target_configdirs; see the serialization section below. + +# Dependency sorting is only needed when *configuration* must be done in +# a particular order. In all cases a dependency should be specified in +# the Makefile, whether or not it's implicitly specified here. + +# Double entries in build_configdirs, configdirs, or target_configdirs may +# cause circular dependencies and break everything horribly. + +# these library is used by various programs built for the build +# environment +# +build_libs="build-libiberty build-libcpp" + +# these tools are built for the build environment +build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes" + +# these libraries are used by various programs built for the host environment +#f +host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libdecnumber gmp mpfr mpc isl libelf libiconv" + +# these tools are built for the host environment +# Note, the powerpc-eabi build depends on sim occurring before gdb in order to +# know that we are building the simulator. +# binutils, gas and ld appear in that order because it makes sense to run +# "make check" in that particular order. +# If --enable-gold is used, "gold" may replace "ld". +host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools" + +# libgcj represents the runtime libraries only used by gcj. +libgcj="target-libffi \ + target-zlib \ + target-libjava" + +# these libraries are built for the target environment, and are built after +# the host libraries and the host tools (which may be a cross compiler) +# Note that libiberty is not a target library. +target_libraries="target-libgcc \ + target-libbacktrace \ + target-libgloss \ + target-newlib \ + target-libgomp \ + target-libcilkrts \ + target-liboffloadmic \ + target-libatomic \ + target-libitm \ + target-libstdc++-v3 \ + target-libsanitizer \ + target-libvtv \ + target-libmpx \ + target-libssp \ + target-libquadmath \ + target-libgfortran \ + target-boehm-gc \ + ${libgcj} \ + target-libobjc \ + target-libada \ + target-libgo" + +# these tools are built using the target libraries, and are intended to +# run only in the target environment +# +# note: any program that *uses* libraries that are in the "target_libraries" +# list belongs in this list. +# +target_tools="target-rda" + +################################################################################ + +## All tools belong in one of the four categories, and are assigned above +## We assign ${configdirs} this way to remove all embedded newlines. This +## is important because configure will choke if they ever get through. +## ${configdirs} is directories we build using the host tools. +## ${target_configdirs} is directories we build using the target tools. +configdirs=`echo ${host_libs} ${host_tools}` +target_configdirs=`echo ${target_libraries} ${target_tools}` +build_configdirs=`echo ${build_libs} ${build_tools}` + +m4_divert_text([PARSE_ARGS], +[case $srcdir in + *" "*) +m4_pushdef([AS_MESSAGE_LOG_FD], [])dnl + AC_MSG_ERROR([path to source, $srcdir, contains spaces]) +m4_popdef([AS_MESSAGE_LOG_FD])dnl + ;; +esac +ac_subdirs_all=`cd $srcdir && echo */configure | sed 's,/configure,,g'` +]) + +################################################################################ + +srcname="gnu development package" + +# This gets set non-empty for some net releases of packages. +appdirs="" + +# Define is_cross_compiler to save on calls to 'test'. +is_cross_compiler= +if test x"${host}" = x"${target}" ; then + is_cross_compiler=no +else + is_cross_compiler=yes +fi + +# Find the build and target subdir names. +GCC_TOPLEV_SUBDIRS +# Be sure to cover against remnants of an in-tree build. +if test $srcdir != . && test -d $srcdir/host-${host_noncanonical}; then + AC_MSG_ERROR([building out of tree but $srcdir contains host-${host_noncanonical}. +Use a pristine source tree when building in a separate tree]) +fi + +# Skipdirs are removed silently. +skipdirs= +# Noconfigdirs are removed loudly. +noconfigdirs="" + +use_gnu_ld= +# Make sure we don't let GNU ld be added if we didn't want it. +if test x$with_gnu_ld = xno ; then + use_gnu_ld=no + noconfigdirs="$noconfigdirs ld gold" +fi + +use_gnu_as= +# Make sure we don't let GNU as be added if we didn't want it. +if test x$with_gnu_as = xno ; then + use_gnu_as=no + noconfigdirs="$noconfigdirs gas" +fi + +use_included_zlib= +AC_ARG_WITH(system-zlib, +[AS_HELP_STRING([--with-system-zlib], [use installed libz])]) +# Make sure we don't let ZLIB be added if we didn't want it. +if test x$with_system_zlib = xyes ; then + use_included_zlib=no + noconfigdirs="$noconfigdirs zlib" +fi + +# some tools are so dependent upon X11 that if we're not building with X, +# it's not even worth trying to configure, much less build, that tool. + +case ${with_x} in + yes | "") ;; # the default value for this tree is that X11 is available + no) + skipdirs="${skipdirs} tk itcl libgui" + # We won't be able to build gdbtk without X. + enable_gdbtk=no + ;; + *) echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;; +esac + +# Some are only suitable for cross toolchains. +# Remove these if host=target. +cross_only="target-libgloss target-newlib target-opcodes" + +case $is_cross_compiler in + no) skipdirs="${skipdirs} ${cross_only}" ;; +esac + +# If both --with-headers and --with-libs are specified, default to +# --without-newlib. +if test x"${with_headers}" != x && test x"${with_headers}" != xno \ + && test x"${with_libs}" != x && test x"${with_libs}" != xno ; then + if test x"${with_newlib}" = x ; then + with_newlib=no + fi +fi + +# Recognize --with-newlib/--without-newlib. +case ${with_newlib} in + no) skipdirs="${skipdirs} target-newlib" ;; + yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;; +esac + +AC_ARG_ENABLE(as-accelerator-for, +[AS_HELP_STRING([--enable-as-accelerator-for=ARG], + [build as offload target compiler. + Specify offload host triple by ARG])]) + +AC_ARG_ENABLE(offload-targets, +[AS_HELP_STRING([--enable-offload-targets=LIST], + [enable offloading to devices from comma-separated LIST of + TARGET[=DIR]. Use optional path to find offload target compiler + during the build])], +[ + if test x"$enable_offload_targets" = x; then + AC_MSG_ERROR([no offload targets specified]) + fi +], [enable_offload_targets=]) + +# Handle --enable-gold, --enable-ld. +# --disable-gold [--enable-ld] +# Build only ld. Default option. +# --enable-gold [--enable-ld] +# Build both gold and ld. Install gold as "ld.gold", install ld +# as "ld.bfd" and "ld". +# --enable-gold=default [--enable-ld] +# Build both gold and ld. Install gold as "ld.gold" and "ld", +# install ld as "ld.bfd". +# --enable-gold[=default] --disable-ld +# Build only gold, which is then installed as both "ld.gold" and "ld". +# --enable-gold --enable-ld=default +# Build both gold (installed as "ld.gold") and ld (installed as "ld" +# and ld.bfd). +# In other words, ld is default +# --enable-gold=default --enable-ld=default +# Error. + +default_ld= +AC_ARG_ENABLE(gold, +[AS_HELP_STRING([[--enable-gold[=ARG]]], + [build gold @<:@ARG={default,yes,no}@:>@])], +ENABLE_GOLD=$enableval, +ENABLE_GOLD=no) +case "${ENABLE_GOLD}" in + yes|default) + # Check for ELF target. + is_elf=no + case "${target}" in + *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \ + | *-*-linux* | *-*-gnu* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \ + | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \ + | *-*-solaris2* | *-*-nto* | *-*-nacl* | *-*-haiku*) + case "${target}" in + *-*-linux*aout* | *-*-linux*oldld*) + ;; + *) + is_elf=yes + ;; + esac + esac + + if test "$is_elf" = "yes"; then + # Check for target supported by gold. + case "${target}" in + i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-* \ + | aarch64*-*-* | tilegx*-*-* | mips*-*-* | s390*-*-*) + configdirs="$configdirs gold" + if test x${ENABLE_GOLD} = xdefault; then + default_ld=gold + fi + ENABLE_GOLD=yes + ;; + esac + fi + ;; + no) + ;; + *) + AC_MSG_ERROR([invalid --enable-gold argument]) + ;; +esac + +AC_ARG_ENABLE(ld, +[AS_HELP_STRING([[--enable-ld[=ARG]]], + [build ld @<:@ARG={default,yes,no}@:>@])], +ENABLE_LD=$enableval, +ENABLE_LD=yes) + +case "${ENABLE_LD}" in + default) + if test x${default_ld} != x; then + AC_MSG_ERROR([either gold or ld can be the default ld]) + fi + ;; + yes) + ;; + no) + if test x${ENABLE_GOLD} != xyes; then + AC_MSG_WARN([neither ld nor gold are enabled]) + fi + configdirs=`echo " ${configdirs} " | sed -e 's/ ld / /'` + ;; + *) + AC_MSG_ERROR([invalid --enable-ld argument]) + ;; +esac + +# PR gas/19109 +# Decide the default method for compressing debug sections. +# Provide a configure time option to override our default. +AC_ARG_ENABLE(compressed_debug_sections, +[AS_HELP_STRING([--enable-compressed-debug-sections={all,gas,gold,ld,none}], + [Enable compressed debug sections for gas, gold or ld by + default])], +[ + if test x"$enable_compressed_debug_sections" = xyes; then + AC_MSG_ERROR([no program with compressed debug sections specified]) + fi +], [enable_compressed_debug_sections=]) + +# Configure extra directories which are host specific + +case "${host}" in + *-cygwin*) + configdirs="$configdirs libtermcap" ;; +esac + +# A target can indicate whether a language isn't supported for some reason. +# Only spaces may be used in this macro; not newlines or tabs. +unsupported_languages= + +# Remove more programs from consideration, based on the host or +# target this usually means that a port of the program doesn't +# exist yet. + +case "${host}" in + i[[3456789]]86-*-msdosdjgpp*) + noconfigdirs="$noconfigdirs tcl tk itcl" + ;; +esac + + +AC_ARG_ENABLE(libquadmath, +AS_HELP_STRING([--disable-libquadmath], + [do not build libquadmath directory]), +ENABLE_LIBQUADMATH=$enableval, +ENABLE_LIBQUADMATH=yes) +if test "${ENABLE_LIBQUADMATH}" = "no" ; then + noconfigdirs="$noconfigdirs target-libquadmath" +fi + + +AC_ARG_ENABLE(libquadmath-support, +AS_HELP_STRING([--disable-libquadmath-support], + [disable libquadmath support for Fortran]), +ENABLE_LIBQUADMATH_SUPPORT=$enableval, +ENABLE_LIBQUADMATH_SUPPORT=yes) +enable_libquadmath_support= +if test "${ENABLE_LIBQUADMATH_SUPPORT}" = "no" ; then + enable_libquadmath_support=no +fi + + +AC_ARG_ENABLE(libada, +[AS_HELP_STRING([--enable-libada], [build libada directory])], +ENABLE_LIBADA=$enableval, +ENABLE_LIBADA=yes) +if test "${ENABLE_LIBADA}" != "yes" ; then + noconfigdirs="$noconfigdirs gnattools" +fi + +AC_ARG_ENABLE(libssp, +[AS_HELP_STRING([--enable-libssp], [build libssp directory])], +ENABLE_LIBSSP=$enableval, +ENABLE_LIBSSP=yes) + +AC_ARG_ENABLE(libstdcxx, +AS_HELP_STRING([--disable-libstdcxx], + [do not build libstdc++-v3 directory]), +ENABLE_LIBSTDCXX=$enableval, +ENABLE_LIBSTDCXX=default) +[if test "${ENABLE_LIBSTDCXX}" = "no" ; then + noconfigdirs="$noconfigdirs target-libstdc++-v3" +fi] + +# If this is accelerator compiler and its target is intelmic we enable +# target liboffloadmic by default. If this is compiler with offloading +# for intelmic we enable host liboffloadmic by default. Otherwise +# liboffloadmic is disabled by default. +AC_ARG_ENABLE([liboffloadmic], +AC_HELP_STRING([[--enable-liboffloadmic[=ARG]]], + [build liboffloadmic @<:@ARG={no,host,target}@:>@]), +[case "$enableval" in + no | host | target) + enable_liboffloadmic=$enableval ;; + *) + AC_MSG_ERROR([--enable-liboffloadmic=no/host/target]) ;; +esac], +[if test x"$enable_as_accelerator_for" != x; then + case "${target}" in + *-intelmic-* | *-intelmicemul-*) + enable_liboffloadmic=target + extra_liboffloadmic_configure_flags="--enable-liboffloadmic=target" + ;; + *) + enable_liboffloadmic=no + ;; + esac +else + case "${enable_offload_targets}" in + *-intelmic-* | *-intelmicemul-*) + enable_liboffloadmic=host + extra_liboffloadmic_configure_flags="--enable-liboffloadmic=host" + ;; + *) + enable_liboffloadmic=no + ;; + esac +fi]) +AC_SUBST(extra_liboffloadmic_configure_flags) + +# Save it here so that, even in case of --enable-libgcj, if the Java +# front-end isn't enabled, we still get libgcj disabled. +libgcj_saved=$libgcj +case $enable_libgcj in +yes) + # If we reset it here, it won't get added to noconfigdirs in the + # target-specific build rules, so it will be forcibly enabled + # (unless the Java language itself isn't enabled). + libgcj= + ;; +no) + # Make sure we get it printed in the list of not supported target libs. + # Don't disable libffi, though, other languages use it. + noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`" + # Clear libgcj_saved so that even if java is enabled libffi won't be + # built. + libgcj_saved= + ;; +esac + +AC_ARG_ENABLE(static-libjava, +[AS_HELP_STRING([[--enable-static-libjava[=ARG]]], + [build static libjava @<:@default=no@:>@])], +ENABLE_STATIC_LIBJAVA=$enableval, +ENABLE_STATIC_LIBJAVA=no) +enable_static_libjava= +if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then + enable_static_libjava=yes +fi + +if test x$enable_static_libjava != xyes ; then + EXTRA_CONFIGARGS_LIBJAVA=--disable-static +fi +AC_SUBST(EXTRA_CONFIGARGS_LIBJAVA) + +# Enable libgomp by default on hosted POSIX systems, and a few others. +if test x$enable_libgomp = x ; then + case "${target}" in + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) + ;; + *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*) + ;; + *-*-solaris2* | *-*-hpux11*) + ;; + *-*-darwin* | *-*-aix*) + ;; + nvptx*-*-*) + ;; + *) + noconfigdirs="$noconfigdirs target-libgomp" + ;; + esac +fi + +# Disable libatomic on unsupported systems. +if test -d ${srcdir}/libatomic; then + if test x$enable_libatomic = x; then + AC_MSG_CHECKING([for libatomic support]) + if (srcdir=${srcdir}/libatomic; \ + . ${srcdir}/configure.tgt; \ + test -n "$UNSUPPORTED") + then + AC_MSG_RESULT([no]) + noconfigdirs="$noconfigdirs target-libatomic" + else + AC_MSG_RESULT([yes]) + fi + fi +fi + +# Disable libcilkrts on unsupported systems. +if test -d ${srcdir}/libcilkrts; then + if test x$enable_libcilkrts = x; then + AC_MSG_CHECKING([for libcilkrts support]) + if (srcdir=${srcdir}/libcilkrts; \ + . ${srcdir}/configure.tgt; \ + test -n "$UNSUPPORTED") + then + AC_MSG_RESULT([no]) + noconfigdirs="$noconfigdirs target-libcilkrts" + else + AC_MSG_RESULT([yes]) + fi + fi +fi + +# Disable liboffloadmic on unsupported systems. +if test -d ${srcdir}/liboffloadmic; then + if test x$enable_liboffloadmic != xno; then + AC_MSG_CHECKING([for liboffloadmic support]) + if (srcdir=${srcdir}/liboffloadmic; \ + . ${srcdir}/configure.tgt; \ + test -n "$UNSUPPORTED") + then + AC_MSG_RESULT([no]) + noconfigdirs="$noconfigdirs target-liboffloadmic" + else + AC_MSG_RESULT([yes]) + fi + fi +fi + +# Disable libitm on unsupported systems. +if test -d ${srcdir}/libitm; then + if test x$enable_libitm = x; then + AC_MSG_CHECKING([for libitm support]) + if (srcdir=${srcdir}/libitm; \ + . ${srcdir}/configure.tgt; \ + test -n "$UNSUPPORTED") + then + AC_MSG_RESULT([no]) + noconfigdirs="$noconfigdirs target-libitm" + else + AC_MSG_RESULT([yes]) + fi + fi +fi + +# Disable libsanitizer on unsupported systems. +if test -d ${srcdir}/libsanitizer; then + if test x$enable_libsanitizer = x; then + AC_MSG_CHECKING([for libsanitizer support]) + if (srcdir=${srcdir}/libsanitizer; \ + . ${srcdir}/configure.tgt; \ + test -n "$UNSUPPORTED") + then + AC_MSG_RESULT([no]) + noconfigdirs="$noconfigdirs target-libsanitizer" + else + AC_MSG_RESULT([yes]) + fi + fi +fi + +# Disable libvtv on unsupported systems. +if test -d ${srcdir}/libvtv; then + if test x$enable_libvtv = x; then + AC_MSG_CHECKING([for libvtv support]) + if (srcdir=${srcdir}/libvtv; \ + . ${srcdir}/configure.tgt; \ + test "$VTV_SUPPORTED" != "yes") + then + AC_MSG_RESULT([no]) + noconfigdirs="$noconfigdirs target-libvtv" + else + AC_MSG_RESULT([yes]) + fi + fi +fi + + +# Enable libmpx on supported systems by request. +if test -d ${srcdir}/libmpx; then + if test x$enable_libmpx = x; then + AC_MSG_CHECKING([for libmpx support]) + if (srcdir=${srcdir}/libmpx; \ + . ${srcdir}/configure.tgt; \ + test "$LIBMPX_SUPPORTED" != "yes") + then + AC_MSG_RESULT([no]) + noconfigdirs="$noconfigdirs target-libmpx" + else + AC_MSG_RESULT([yes]) + fi + fi +fi + + + +# Disable libquadmath for some systems. +case "${target}" in + avr-*-*) + noconfigdirs="$noconfigdirs target-libquadmath" + ;; + # libquadmath is unused on AIX and libquadmath build process use of + # LD_LIBRARY_PATH can break AIX bootstrap. + powerpc-*-aix* | rs6000-*-aix*) + noconfigdirs="$noconfigdirs target-libquadmath" + ;; +esac + +# Disable libssp for some systems. +case "${target}" in + avr-*-*) + # No hosted I/O support. + noconfigdirs="$noconfigdirs target-libssp" + ;; + powerpc-*-aix* | rs6000-*-aix*) + noconfigdirs="$noconfigdirs target-libssp" + ;; + rl78-*-*) + # libssp uses a misaligned load to trigger a fault, but the RL78 + # doesn't fault for those - instead, it gives a build-time error + # for explicit misaligned loads. + noconfigdirs="$noconfigdirs target-libssp" + ;; + visium-*-*) + # No hosted I/O support. + noconfigdirs="$noconfigdirs target-libssp" + ;; +esac + +# Disable libstdc++-v3 for some systems. +# Allow user to override this if they pass --enable-libstdc++-v3 +if test "${ENABLE_LIBSTDCXX}" = "default" ; then + case "${target}" in + *-*-vxworks*) + # VxWorks uses the Dinkumware C++ library. + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + arm*-wince-pe*) + # the C++ libraries don't build on top of CE's C libraries + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + avr-*-*) + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + ft32-*-*) + noconfigdirs="$noconfigdirs target-libstdc++-v3" + ;; + esac +fi + +# Disable Fortran for some systems. +case "${target}" in + mmix-*-*) + # See . + unsupported_languages="$unsupported_languages fortran" + ;; +esac + +# Disable Java if libffi is not supported. +case "${target}" in + aarch64-*-*) + ;; + alpha*-*-*) + ;; + arm*-*-*) + ;; + cris-*-*) + ;; + frv-*-*) + ;; + hppa*-*-linux*) + ;; + hppa*-*-hpux*) + ;; + i?86-*-*) + ;; + ia64*-*-*) + ;; + m32r*-*-*) + ;; + m68k-*-*) + ;; + mips*-*-rtems*) + ;; + mips*-*-linux*) + ;; + powerpc*-*-linux*) + ;; + powerpc-*-darwin*) + ;; + powerpc-*-aix* | rs6000-*-aix*) + ;; + powerpc-*-freebsd*) + ;; + powerpc64-*-freebsd*) + ;; + powerpc*-*-rtems*) + ;; + s390-*-* | s390x-*-*) + ;; + sh-*-* | sh[[34]]*-*-*) + ;; + sparc*-*-*) + ;; + x86_64-*-*) + ;; + *-*-*) + unsupported_languages="$unsupported_languages java" + ;; +esac + +# Disable Java, libgcj or related libraries for some systems. +case "${target}" in + powerpc-*-darwin*) + ;; + i[[3456789]]86-*-darwin*) + ;; + x86_64-*-darwin[[912]]*) + ;; + *-*-darwin*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-netware*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-phoenix*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-rtems*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-tpf*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-uclinux*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-vxworks*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + alpha*-*-*vms*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + arm*-*-freebsd*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + arm-wince-pe) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + arm*-*-symbianelf*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + bfin-*-*) + noconfigdirs="$noconfigdirs target-boehm-gc" + ;; + cris-*-* | crisv32-*-*) + unsupported_languages="$unsupported_languages java" + case "${target}" in + *-*-linux*) + ;; + *) # See PR46792 regarding target-libffi. + noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";; + esac + ;; + hppa*64*-*-linux*) + # In this case, it's because the hppa64-linux target is for + # the kernel only at this point and has no libc, and thus no + # headers, crt*.o, etc., all of which are needed by these. + unsupported_languages="$unsupported_languages java" + ;; + hppa*64*-*-hpux*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + hppa*-hp-hpux11*) + ;; + hppa*-*-hpux*) + # According to Alexandre Oliva , libjava won't + # build on HP-UX 10.20. + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + ia64*-*-*vms*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + i[[3456789]]86-w64-mingw*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + i[[3456789]]86-*-mingw*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + x86_64-*-mingw*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + mmix-*-*) + noconfigdirs="$noconfigdirs target-libffi target-boehm-gc" + ;; + powerpc-*-aix*) + # copied from rs6000-*-* entry + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + rs6000-*-aix*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + ft32-*-*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; + *-*-lynxos*) + noconfigdirs="$noconfigdirs ${libgcj}" + ;; +esac + +# Disable the go frontend on systems where it is known to not work. Please keep +# this in sync with contrib/config-list.mk. +case "${target}" in +*-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*) + unsupported_languages="$unsupported_languages go" + ;; +esac + +# Disable libgo for some systems where it is known to not work. +# For testing, you can easily override this with --enable-libgo. +if test x$enable_libgo = x; then + case "${target}" in + *-*-darwin*) + # PR 46986 + noconfigdirs="$noconfigdirs target-libgo" + ;; + *-*-cygwin* | *-*-mingw*) + noconfigdirs="$noconfigdirs target-libgo" + ;; + *-*-aix*) + noconfigdirs="$noconfigdirs target-libgo" + ;; + esac +fi + +# Default libgloss CPU subdirectory. +libgloss_dir="$target_cpu" + +case "${target}" in + sh*-*-pe|mips*-*-pe|*arm-wince-pe) + libgloss_dir=wince + ;; + aarch64*-*-* ) + libgloss_dir=aarch64 + ;; + arm*-*-*) + libgloss_dir=arm + ;; + cris-*-* | crisv32-*-*) + libgloss_dir=cris + ;; + hppa*-*-*) + libgloss_dir=pa + ;; + i[[3456789]]86-*-*) + libgloss_dir=i386 + ;; + m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*) + libgloss_dir=m68hc11 + ;; + m68*-*-* | fido-*-*) + libgloss_dir=m68k + ;; + mips*-*-*) + libgloss_dir=mips + ;; + powerpc*-*-*) + libgloss_dir=rs6000 + ;; + sparc*-*-*) + libgloss_dir=sparc + ;; +esac + +# Disable newlib and libgloss for various target OSes. +case "${target}" in + alpha*-dec-osf*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + i[[3456789]]86-*-linux*) + # This section makes it possible to build newlib natively on linux. + # If we are using a cross compiler then don't configure newlib. + if test x${is_cross_compiler} != xno ; then + noconfigdirs="$noconfigdirs target-newlib" + fi + noconfigdirs="$noconfigdirs target-libgloss" + # If we are not using a cross compiler, do configure newlib. + # Note however, that newlib will only be configured in this situation + # if the --with-newlib option has been given, because otherwise + # 'target-newlib' will appear in skipdirs. + ;; + i[[3456789]]86-*-rdos*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + sh*-*-pe|mips*-*-pe|arm-wince-pe) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + sparc-*-sunos4*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-aix*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-beos*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-chorusos) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-dragonfly*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-freebsd*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-lynxos*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-mingw*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-netbsd*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-netware*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-tpf*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-uclinux*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + *-*-vxworks*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; +esac + +case "${target}" in + *-*-chorusos) + ;; + aarch64-*-darwin*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; + arm-*-darwin*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; + powerpc-*-darwin*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; + i[[3456789]]86-*-darwin*) + noconfigdirs="$noconfigdirs ld gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; + x86_64-*-darwin[[912]]*) + noconfigdirs="$noconfigdirs ld gas gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; + *-*-darwin*) + noconfigdirs="$noconfigdirs ld gas gdb gprof" + noconfigdirs="$noconfigdirs sim target-rda" + ;; + *-*-dragonfly*) + ;; + *-*-freebsd*) + if test "x$with_gmp" = x && test "x$with_gmp_dir" = x \ + && test -f /usr/local/include/gmp.h; then + with_gmp=/usr/local + fi + ;; + *-*-kaos*) + # Remove unsupported stuff on all kaOS configurations. + noconfigdirs="$noconfigdirs target-libgloss" + ;; + *-*-netbsd*) + ;; + *-*-netware*) + ;; + *-*-phoenix*) + noconfigdirs="$noconfigdirs target-libgloss" + ;; + *-*-rtems*) + noconfigdirs="$noconfigdirs target-libgloss" + # this is not caught below because this stanza matches earlier + case $target in + or1k*-*-*) noconfigdirs="$noconfigdirs gdb" ;; + esac + ;; + # The tpf target doesn't support gdb yet. + *-*-tpf*) + noconfigdirs="$noconfigdirs gdb tcl tk libgui itcl" + ;; + *-*-uclinux*) + noconfigdirs="$noconfigdirs target-rda" + ;; + *-*-vxworks*) + ;; + alpha*-dec-osf*) + # ld works, but does not support shared libraries. + # gas doesn't generate exception information. + noconfigdirs="$noconfigdirs gas ld" + ;; + alpha*-*-*vms*) + noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss" + ;; + alpha*-*-*) + # newlib is not 64 bit ready + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) + noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" + ;; + arm-*-pe*) + noconfigdirs="$noconfigdirs target-libgloss" + ;; + arm-*-riscix*) + noconfigdirs="$noconfigdirs ld target-libgloss" + ;; + avr-*-*) + if test x${with_avrlibc} != xno; then + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + fi + ;; + c4x-*-* | tic4x-*-*) + noconfigdirs="$noconfigdirs target-libgloss" + ;; + tic54x-*-*) + noconfigdirs="$noconfigdirs target-libgloss gdb" + ;; + d10v-*-*) + noconfigdirs="$noconfigdirs target-libgloss" + ;; + d30v-*-*) + noconfigdirs="$noconfigdirs gdb" + ;; + fr30-*-elf*) + noconfigdirs="$noconfigdirs gdb" + ;; + ft32-*-*) + noconfigdirs="$noconfigdirs target-rda gprof" + ;; + moxie-*-*) + noconfigdirs="$noconfigdirs" + ;; + h8300*-*-*) + noconfigdirs="$noconfigdirs target-libgloss" + ;; + h8500-*-*) + noconfigdirs="$noconfigdirs target-libgloss" + ;; + hppa1.1-*-osf* | hppa1.1-*-bsd* ) + ;; + hppa*64*-*-hpux*) + noconfigdirs="$noconfigdirs gdb" + ;; + hppa*-*-hpux11*) + noconfigdirs="$noconfigdirs gdb ld" + ;; + hppa*64*-*-linux*) + ;; + hppa*-*-linux*) + ;; + hppa*-*-*elf* | \ + hppa*-*-lites* | \ + hppa*-*-openbsd* | \ + hppa*64*-*-*) + ;; + hppa*-*-pro*) + ;; + hppa*-*-*) + noconfigdirs="$noconfigdirs ld" + ;; + i960-*-*) + noconfigdirs="$noconfigdirs gdb" + ;; + ia64*-*-elf*) + # No gdb support yet. + noconfigdirs="$noconfigdirs readline libgui itcl gdb" + ;; + ia64*-**-hpux*) + # No ld support yet. + noconfigdirs="$noconfigdirs gdb libgui itcl ld" + ;; + ia64*-*-*vms*) + # No ld support yet. + noconfigdirs="$noconfigdirs libgui itcl ld" + ;; + i[[3456789]]86-w64-mingw*) + ;; + i[[3456789]]86-*-mingw*) + target_configdirs="$target_configdirs target-winsup" + ;; + *-*-cygwin*) + target_configdirs="$target_configdirs target-libtermcap target-winsup" + noconfigdirs="$noconfigdirs target-libgloss" + # always build newlib if winsup directory is present. + if test -d "$srcdir/winsup/cygwin"; then + skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` + elif test -d "$srcdir/newlib"; then + echo "Warning: winsup/cygwin is missing so newlib can't be built." + fi + ;; + i[[3456789]]86-*-pe) + noconfigdirs="$noconfigdirs target-libgloss" + ;; + i[[3456789]]86-*-sco3.2v5*) + # The linker does not yet know about weak symbols in COFF, + # and is not configured to handle mixed ELF and COFF. + noconfigdirs="$noconfigdirs ld target-libgloss" + ;; + i[[3456789]]86-*-sco*) + noconfigdirs="$noconfigdirs gprof target-libgloss" + ;; + i[[3456789]]86-*-solaris2* | x86_64-*-solaris2.1[[0-9]]*) + noconfigdirs="$noconfigdirs target-libgloss" + ;; + i[[3456789]]86-*-sysv4*) + noconfigdirs="$noconfigdirs target-libgloss" + ;; + i[[3456789]]86-*-beos*) + noconfigdirs="$noconfigdirs gdb" + ;; + i[[3456789]]86-*-rdos*) + noconfigdirs="$noconfigdirs gdb" + ;; + mmix-*-*) + noconfigdirs="$noconfigdirs gdb" + ;; + mt-*-*) + noconfigdirs="$noconfigdirs sim" + ;; + powerpc-*-aix*) + # copied from rs6000-*-* entry + noconfigdirs="$noconfigdirs gprof" + ;; + powerpc*-*-winnt* | powerpc*-*-pe*) + target_configdirs="$target_configdirs target-winsup" + noconfigdirs="$noconfigdirs gdb tcl tk target-libgloss itcl" + # always build newlib. + skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` + ;; + # This is temporary until we can link against shared libraries + powerpcle-*-solaris*) + noconfigdirs="$noconfigdirs gdb sim tcl tk itcl" + ;; + powerpc-*-beos*) + noconfigdirs="$noconfigdirs gdb" + ;; + rs6000-*-lynxos*) + noconfigdirs="$noconfigdirs gprof" + ;; + rs6000-*-aix*) + noconfigdirs="$noconfigdirs gprof" + ;; + rs6000-*-*) + noconfigdirs="$noconfigdirs gprof" + ;; + m68k-apollo-*) + noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss" + ;; + microblaze*) + noconfigdirs="$noconfigdirs gprof" + ;; + mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) + if test x$with_newlib = xyes; then + noconfigdirs="$noconfigdirs gprof" + fi + ;; + mips*-*-irix5*) + noconfigdirs="$noconfigdirs gprof target-libgloss" + ;; + mips*-*-irix6*) + noconfigdirs="$noconfigdirs gprof target-libgloss" + ;; + mips*-*-bsd*) + noconfigdirs="$noconfigdirs ld gas gprof target-libgloss" + ;; + mips*-*-linux*) + ;; + mips*-*-ultrix* | mips*-*-osf* | mips*-*-ecoff* | mips*-*-pe* \ + | mips*-*-irix* | mips*-*-lnews* | mips*-*-riscos*) + noconfigdirs="$noconfigdirs ld gas gprof" + ;; + mips*-*-*) + noconfigdirs="$noconfigdirs gprof" + ;; + nds32*-*-*) + noconfigdirs="$noconfigdirs gdb" + ;; + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; + or1k*-*-*) + noconfigdirs="$noconfigdirs gdb" + ;; + sh-*-*) + case "${target}" in + sh*-*-elf) + ;; + *) + noconfigdirs="$noconfigdirs target-libgloss" ;; + esac + ;; + sparc-*-sunos4*) + if test x${is_cross_compiler} = xno ; then + use_gnu_ld=no + fi + ;; + tic6x-*-*) + noconfigdirs="$noconfigdirs sim" + ;; + tilepro*-*-* | tilegx*-*-*) + noconfigdirs="$noconfigdirs sim" + ;; + v810-*-*) + noconfigdirs="$noconfigdirs bfd binutils gas gdb ld opcodes target-libgloss" + ;; + vax-*-*) + noconfigdirs="$noconfigdirs target-newlib target-libgloss" + ;; +esac + +# If we aren't building newlib, then don't build libgloss, since libgloss +# depends upon some newlib header files. +case "${noconfigdirs}" in + *target-libgloss*) ;; + *target-newlib*) noconfigdirs="$noconfigdirs target-libgloss" ;; +esac + +# Work in distributions that contain no compiler tools, like Autoconf. +host_makefile_frag=/dev/null +if test -d ${srcdir}/config ; then +case "${host}" in + i[[3456789]]86-*-msdosdjgpp*) + host_makefile_frag="config/mh-djgpp" + ;; + *-cygwin*) + ACX_CHECK_CYGWIN_CAT_WORKS + host_makefile_frag="config/mh-cygwin" + ;; + *-mingw*) + host_makefile_frag="config/mh-mingw" + ;; + alpha*-linux*) + host_makefile_frag="config/mh-alpha-linux" + ;; + hppa*-hp-hpux10*) + host_makefile_frag="config/mh-pa-hpux10" + ;; + hppa*-hp-hpux*) + host_makefile_frag="config/mh-pa" + ;; + hppa*-*) + host_makefile_frag="config/mh-pa" + ;; + *-*-darwin*) + host_makefile_frag="config/mh-darwin" + ;; + powerpc-*-aix*) + host_makefile_frag="config/mh-ppc-aix" + ;; + rs6000-*-aix*) + host_makefile_frag="config/mh-ppc-aix" + ;; +esac +fi + +if test "${build}" != "${host}" ; then + AR_FOR_BUILD=${AR_FOR_BUILD-ar} + AS_FOR_BUILD=${AS_FOR_BUILD-as} + CC_FOR_BUILD=${CC_FOR_BUILD-gcc} + CXX_FOR_BUILD=${CXX_FOR_BUILD-g++} + GCJ_FOR_BUILD=${GCJ_FOR_BUILD-gcj} + GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran} + GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo} + DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool} + LD_FOR_BUILD=${LD_FOR_BUILD-ld} + NM_FOR_BUILD=${NM_FOR_BUILD-nm} + RANLIB_FOR_BUILD=${RANLIB_FOR_BUILD-ranlib} + WINDRES_FOR_BUILD=${WINDRES_FOR_BUILD-windres} + WINDMC_FOR_BUILD=${WINDMC_FOR_BUILD-windmc} +else + AR_FOR_BUILD="\$(AR)" + AS_FOR_BUILD="\$(AS)" + CC_FOR_BUILD="\$(CC)" + CXX_FOR_BUILD="\$(CXX)" + GCJ_FOR_BUILD="\$(GCJ)" + GFORTRAN_FOR_BUILD="\$(GFORTRAN)" + GOC_FOR_BUILD="\$(GOC)" + DLLTOOL_FOR_BUILD="\$(DLLTOOL)" + LD_FOR_BUILD="\$(LD)" + NM_FOR_BUILD="\$(NM)" + RANLIB_FOR_BUILD="\$(RANLIB)" + WINDRES_FOR_BUILD="\$(WINDRES)" + WINDMC_FOR_BUILD="\$(WINDMC)" +fi + +AC_PROG_CC +AC_PROG_CXX + +# We must set the default linker to the linker used by gcc for the correct +# operation of libtool. If LD is not defined and we are using gcc, try to +# set the LD default to the ld used by gcc. +if test -z "$LD"; then + if test "$GCC" = yes; then + case $build in + *-*-mingw*) + gcc_prog_ld=`$CC -print-prog-name=ld 2>&1 | tr -d '\015'` ;; + *) + gcc_prog_ld=`$CC -print-prog-name=ld 2>&1` ;; + esac + case $gcc_prog_ld in + # Accept absolute paths. + [[\\/]* | [A-Za-z]:[\\/]*)] + LD="$gcc_prog_ld" ;; + esac + fi +fi + +# Check whether -static-libstdc++ -static-libgcc is supported. +have_static_libs=no +if test "$GCC" = yes; then + saved_LDFLAGS="$LDFLAGS" + + LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" + AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) + AC_LANG_PUSH(C++) + AC_LINK_IFELSE([AC_LANG_SOURCE([ +#if (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) +#error -static-libstdc++ not implemented +#endif +int main() {}])], + [AC_MSG_RESULT([yes]); have_static_libs=yes], + [AC_MSG_RESULT([no])]) + AC_LANG_POP(C++) + + LDFLAGS="$saved_LDFLAGS" +fi + +ACX_PROG_GNAT +ACX_PROG_CMP_IGNORE_INITIAL + +AC_ARG_ENABLE([bootstrap], +[AS_HELP_STRING([--enable-bootstrap], + [enable bootstrapping @<:@yes if native build@:>@])],, +enable_bootstrap=default) + +# Issue errors and warnings for invalid/strange bootstrap combinations. +if test -r $srcdir/gcc/configure; then + have_compiler=yes +else + have_compiler=no +fi + +case "$have_compiler:$host:$target:$enable_bootstrap" in + *:*:*:no) ;; + + # Default behavior. Enable bootstrap if we have a compiler + # and we are in a native configuration. + yes:$build:$build:default) + enable_bootstrap=yes ;; + + *:*:*:default) + enable_bootstrap=no ;; + + # We have a compiler and we are in a native configuration, bootstrap is ok + yes:$build:$build:yes) + ;; + + # Other configurations, but we have a compiler. Assume the user knows + # what he's doing. + yes:*:*:yes) + AC_MSG_WARN([trying to bootstrap a cross compiler]) + ;; + + # No compiler: if they passed --enable-bootstrap explicitly, fail + no:*:*:yes) + AC_MSG_ERROR([cannot bootstrap without a compiler]) ;; + + # Fail if wrong command line + *) + AC_MSG_ERROR([invalid option for --enable-bootstrap]) + ;; +esac + +# When bootstrapping with GCC, build stage 1 in C++98 mode to ensure that a +# C++98 compiler can still start the bootstrap. +if test "$enable_bootstrap:$GXX" = "yes:yes"; then + CXX="$CXX -std=gnu++98" +fi + +# Used for setting $lt_cv_objdir +_LT_CHECK_OBJDIR + +# Check for GMP, MPFR and MPC +gmplibs="-lmpc -lmpfr -lgmp" +gmpinc= +have_gmp=no + +# Specify a location for mpc +# check for this first so it ends up on the link line before mpfr. +AC_ARG_WITH(mpc, +[AS_HELP_STRING([--with-mpc=PATH], + [specify prefix directory for installed MPC package. + Equivalent to --with-mpc-include=PATH/include + plus --with-mpc-lib=PATH/lib])]) +AC_ARG_WITH(mpc-include, +[AS_HELP_STRING([--with-mpc-include=PATH], + [specify directory for installed MPC include files])]) +AC_ARG_WITH(mpc-lib, +[AS_HELP_STRING([--with-mpc-lib=PATH], + [specify directory for the installed MPC library])]) + +if test "x$with_mpc" != x; then + gmplibs="-L$with_mpc/lib $gmplibs" + gmpinc="-I$with_mpc/include $gmpinc" +fi +if test "x$with_mpc_include" != x; then + gmpinc="-I$with_mpc_include $gmpinc" +fi +if test "x$with_mpc_lib" != x; then + gmplibs="-L$with_mpc_lib $gmplibs" +fi +if test "x$with_mpc$with_mpc_include$with_mpc_lib" = x && test -d ${srcdir}/mpc; then + gmplibs='-L$$r/$(HOST_SUBDIR)/mpc/src/'"$lt_cv_objdir $gmplibs" + gmpinc='-I$$s/mpc/src '"$gmpinc" + # Do not test the mpc version. Assume that it is sufficient, since + # it is in the source tree, and the library has not been built yet + # but it would be included on the link line in the version check below + # hence making the test fail. + have_gmp=yes +fi + +# Specify a location for mpfr +# check for this first so it ends up on the link line before gmp. +AC_ARG_WITH(mpfr-dir, +[AS_HELP_STRING([--with-mpfr-dir=PATH], [this option has been REMOVED])], +[AC_MSG_ERROR([The --with-mpfr-dir=PATH option has been removed. +Use --with-mpfr=PATH or --with-mpfr-include=PATH plus --with-mpfr-lib=PATH])]) + +AC_ARG_WITH(mpfr, +[AS_HELP_STRING([--with-mpfr=PATH], + [specify prefix directory for installed MPFR package. + Equivalent to --with-mpfr-include=PATH/include + plus --with-mpfr-lib=PATH/lib])]) + +AC_ARG_WITH(mpfr-include, +[AS_HELP_STRING([--with-mpfr-include=PATH], + [specify directory for installed MPFR include files])]) +AC_ARG_WITH(mpfr-lib, +[AS_HELP_STRING([--with-mpfr-lib=PATH], + [specify directory for the installed MPFR library])]) + +if test "x$with_mpfr" != x; then + gmplibs="-L$with_mpfr/lib $gmplibs" + gmpinc="-I$with_mpfr/include $gmpinc" +fi +if test "x$with_mpfr_include" != x; then + gmpinc="-I$with_mpfr_include $gmpinc" +fi +if test "x$with_mpfr_lib" != x; then + gmplibs="-L$with_mpfr_lib $gmplibs" +fi +if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then + gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs" + gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc" + extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir" + # Do not test the mpfr version. Assume that it is sufficient, since + # it is in the source tree, and the library has not been built yet + # but it would be included on the link line in the version check below + # hence making the test fail. + have_gmp=yes +fi + +# Specify a location for gmp +AC_ARG_WITH(gmp-dir, +[AS_HELP_STRING([--with-gmp-dir=PATH], [this option has been REMOVED])], +[AC_MSG_ERROR([The --with-gmp-dir=PATH option has been removed. +Use --with-gmp=PATH or --with-gmp-include=PATH plus --with-gmp-lib=PATH])]) + +AC_ARG_WITH(gmp, +[AS_HELP_STRING([--with-gmp=PATH], + [specify prefix directory for the installed GMP package. + Equivalent to --with-gmp-include=PATH/include + plus --with-gmp-lib=PATH/lib])]) +AC_ARG_WITH(gmp-include, +[AS_HELP_STRING([--with-gmp-include=PATH], + [specify directory for installed GMP include files])]) +AC_ARG_WITH(gmp-lib, +[AS_HELP_STRING([--with-gmp-lib=PATH], + [specify directory for the installed GMP library])]) + + +if test "x$with_gmp" != x; then + gmplibs="-L$with_gmp/lib $gmplibs" + gmpinc="-I$with_gmp/include $gmpinc" +fi +if test "x$with_gmp_include" != x; then + gmpinc="-I$with_gmp_include $gmpinc" +fi +if test "x$with_gmp_lib" != x; then + gmplibs="-L$with_gmp_lib $gmplibs" +fi +if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then + gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs" + gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc" + extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir" + extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir" + extra_isl_gmp_configure_flags='--with-gmp-builddir=$$r/$(HOST_SUBDIR)/gmp' + # Do not test the gmp version. Assume that it is sufficient, since + # it is in the source tree, and the library has not been built yet + # but it would be included on the link line in the version check below + # hence making the test fail. + have_gmp=yes +fi + +if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then + have_gmp=yes + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $gmpinc" + # Check for the recommended and required versions of GMP. + AC_MSG_CHECKING([for the correct version of gmp.h]) + AC_TRY_COMPILE([#include "gmp.h"],[ + #define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) + #define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL) + #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,3) + choke me + #endif + ], [AC_TRY_COMPILE([#include ],[ + #define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) + #define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL) + #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,3,2) + choke me + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])], + [AC_MSG_RESULT([no]); have_gmp=no]) + + # If we have GMP, check the MPFR version. + if test x"$have_gmp" = xyes; then + # Check for the recommended and required versions of MPFR. + AC_MSG_CHECKING([for the correct version of mpfr.h]) + AC_TRY_COMPILE([#include + #include ],[ + #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,0) + choke me + #endif + ], [AC_TRY_COMPILE([#include + #include ],[ + #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,2) + choke me + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])], + [AC_MSG_RESULT([no]); have_gmp=no]) + fi + + # Check for the MPC header version. + if test x"$have_gmp" = xyes ; then + # Check for the recommended and required versions of MPC. + AC_MSG_CHECKING([for the correct version of mpc.h]) + AC_TRY_COMPILE([#include ],[ + #if MPC_VERSION < MPC_VERSION_NUM(0,8,0) + choke me + #endif + ], [AC_TRY_COMPILE([#include ],[ + #if MPC_VERSION < MPC_VERSION_NUM(0,8,1) + choke me + #endif + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])], + [AC_MSG_RESULT([no]); have_gmp=no]) + fi + + # Now check the MPFR library. + if test x"$have_gmp" = xyes; then + saved_LIBS="$LIBS" + LIBS="$LIBS $gmplibs" + AC_MSG_CHECKING([for the correct version of the gmp/mpfr/mpc libraries]) + AC_TRY_LINK([#include ],[ + mpfr_t n; + mpfr_t x; + mpc_t c; + int t; + mpfr_init (n); + mpfr_init (x); + mpfr_atan2 (n, n, x, GMP_RNDN); + mpfr_erfc (n, x, GMP_RNDN); + mpfr_subnormalize (x, t, GMP_RNDN); + mpfr_clear(n); + mpfr_clear(x); + mpc_init2 (c, 53); + mpc_set_ui_ui (c, 1, 1, MPC_RNDNN); + mpc_cosh (c, c, MPC_RNDNN); + mpc_pow (c, c, c, MPC_RNDNN); + mpc_acosh (c, c, MPC_RNDNN); + mpc_clear (c); + ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); have_gmp=no]) + LIBS="$saved_LIBS" + fi + + CFLAGS="$saved_CFLAGS" + +# The library versions listed in the error message below should match +# the HARD-minimums enforced above. + if test x$have_gmp != xyes; then + AC_MSG_ERROR([Building GCC requires GMP 4.2+, MPFR 2.4.0+ and MPC 0.8.0+. +Try the --with-gmp, --with-mpfr and/or --with-mpc options to specify +their locations. Source code for these libraries can be found at +their respective hosting sites as well as at +ftp://gcc.gnu.org/pub/gcc/infrastructure/. See also +http://gcc.gnu.org/install/prerequisites.html for additional info. If +you obtained GMP, MPFR and/or MPC from a vendor distribution package, +make sure that you have installed both the libraries and the header +files. They may be located in separate packages.]) + fi +fi + +# Flags needed for both GMP, MPFR and/or MPC. +AC_SUBST(gmplibs) +AC_SUBST(gmpinc) +AC_SUBST(extra_mpfr_configure_flags) +AC_SUBST(extra_mpc_gmp_configure_flags) +AC_SUBST(extra_mpc_mpfr_configure_flags) +AC_SUBST(extra_isl_gmp_configure_flags) + +# Libraries to use for stage1 or when not bootstrapping. +AC_ARG_WITH(stage1-libs, +[AS_HELP_STRING([--with-stage1-libs=LIBS], [libraries for stage1])], +[if test "$withval" = "no" -o "$withval" = "yes"; then + stage1_libs= + else + stage1_libs=$withval + fi], +[stage1_libs=]) +AC_SUBST(stage1_libs) + +# Linker flags to use for stage1 or when not bootstrapping. +AC_ARG_WITH(stage1-ldflags, +[AS_HELP_STRING([--with-stage1-ldflags=FLAGS], [linker flags for stage1])], +[if test "$withval" = "no" -o "$withval" = "yes"; then + stage1_ldflags= + else + stage1_ldflags=$withval + fi], +[stage1_ldflags= + # In stage 1, default to linking libstdc++ and libgcc statically with GCC + # if supported. But if the user explicitly specified the libraries to use, + # trust that they are doing what they want. + if test "$stage1_libs" = "" -a "$have_static_libs" = yes; then + stage1_ldflags="-static-libstdc++ -static-libgcc" + fi]) +AC_SUBST(stage1_ldflags) + +# Libraries to use for stage2 and later builds. +AC_ARG_WITH(boot-libs, +[AS_HELP_STRING([--with-boot-libs=LIBS], [libraries for stage2 and later])], +[if test "$withval" = "no" -o "$withval" = "yes"; then + poststage1_libs= + else + poststage1_libs=$withval + fi], +[poststage1_libs=]) +AC_SUBST(poststage1_libs) + +# Linker flags to use for stage2 and later builds. +AC_ARG_WITH(boot-ldflags, +[AS_HELP_STRING([--with-boot-ldflags=FLAGS], + [linker flags for stage2 and later])], +[if test "$withval" = "no" -o "$withval" = "yes"; then + poststage1_ldflags= + else + poststage1_ldflags=$withval + fi], +[poststage1_ldflags= + # In stages 2 and 3, default to linking libstdc++ and libgcc + # statically. But if the user explicitly specified the libraries to + # use, trust that they are doing what they want. + if test "$poststage1_libs" = ""; then + poststage1_ldflags="-static-libstdc++ -static-libgcc" + fi]) +AC_SUBST(poststage1_ldflags) + +# GCC GRAPHITE dependency isl. +# Basic setup is inlined here, actual checks are in config/isl.m4 + +AC_ARG_WITH(isl, + [AS_HELP_STRING( + [--with-isl=PATH], + [Specify prefix directory for the installed isl package. + Equivalent to --with-isl-include=PATH/include + plus --with-isl-lib=PATH/lib])]) + +# Treat --without-isl as a request to disable +# GRAPHITE support and skip all following checks. +if test "x$with_isl" != "xno"; then + # Check for isl + dnl Provide configure switches and initialize islinc & isllibs + dnl with user input. + ISL_INIT_FLAGS + dnl The versions of isl that work for Graphite + ISL_CHECK_VERSION() + dnl Only execute fail-action, if isl has been requested. + ISL_IF_FAILED([ + AC_MSG_ERROR([Unable to find a usable isl. See config.log for details.])]) +fi + +# If the isl check failed, disable builds of in-tree variant of isl +if test "x$with_isl" = xno || + test "x$gcc_cv_isl" = xno; then + noconfigdirs="$noconfigdirs isl" + islinc= +fi + +AC_SUBST(isllibs) +AC_SUBST(islinc) + +# Check for LTO support. +AC_ARG_ENABLE(lto, +[AS_HELP_STRING([--enable-lto], [enable link time optimization support])], +enable_lto=$enableval, +enable_lto=yes; default_enable_lto=yes) + +ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always. + build_lto_plugin=yes +],[if test x"$default_enable_lto" = x"yes" ; then + case $target in + *-apple-darwin9* | *-cygwin* | *-mingw* | *djgpp*) ;; + # On other non-ELF platforms, LTO has yet to be validated. + *) enable_lto=no ;; + esac + else + # Apart from ELF platforms, only Windows and Darwin support LTO so far. + # It would also be nice to check the binutils support, but we don't + # have gcc_GAS_CHECK_FEATURE available here. For now, we'll just + # warn during gcc/ subconfigure; unless you're bootstrapping with + # -flto it won't be needed until after installation anyway. + case $target in + *-cygwin* | *-mingw* | *-apple-darwin* | *djgpp*) ;; + *) if test x"$enable_lto" = x"yes"; then + AC_MSG_ERROR([LTO support is not enabled for this target.]) + fi + ;; + esac + fi + # Among non-ELF, only Windows platforms support the lto-plugin so far. + # Build it unless LTO was explicitly disabled. + case $target in + *-cygwin* | *-mingw*) build_lto_plugin=$enable_lto ;; + *) ;; + esac +]) + +AC_ARG_ENABLE(linker-plugin-configure-flags, + [AS_HELP_STRING([[--enable-linker-plugin-configure-flags=FLAGS]], + [additional flags for configuring linker plugins @<:@none@:>@])], + extra_linker_plugin_configure_flags=$enableval, + extra_linker_plugin_configure_flags=) +AC_SUBST(extra_linker_plugin_configure_flags) +AC_ARG_ENABLE(linker-plugin-flags, + [AS_HELP_STRING([[--enable-linker-plugin-flags=FLAGS]], + [additional flags for configuring and building linker plugins @<:@none@:>@])], + extra_linker_plugin_flags=$enableval, + extra_linker_plugin_flags=) +AC_SUBST(extra_linker_plugin_flags) + + +# By default, C and C++ are the only stage 1 languages. +stage1_languages=,c, + +# Target libraries that we bootstrap. +bootstrap_target_libs=,target-libgcc, + +# Figure out what language subdirectories are present. +# Look if the user specified --enable-languages="..."; if not, use +# the environment variable $LANGUAGES if defined. $LANGUAGES might +# go away some day. +# NB: embedded tabs in this IF block -- do not untabify +if test -d ${srcdir}/gcc; then + if test x"${enable_languages+set}" != xset; then + if test x"${LANGUAGES+set}" = xset; then + enable_languages="${LANGUAGES}" + echo configure.ac: warning: setting LANGUAGES is deprecated, use --enable-languages instead 1>&2 + else + enable_languages=all + fi + else + if test x"${enable_languages}" = x || + test x"${enable_languages}" = xyes; + then + echo configure.ac: --enable-languages needs at least one language argument 1>&2 + exit 1 + fi + fi + enable_languages=`echo "${enable_languages}" | sed -e 's/[[ ,]][[ ,]]*/,/g' -e 's/,$//'` + + # 'f95' is the old name for the 'fortran' language. We issue a warning + # and make the substitution. + case ,${enable_languages}, in + *,f95,*) + echo configure.ac: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2 + enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'` + ;; + esac + + # If bootstrapping, C++ must be enabled. + case ",$enable_languages,:$enable_bootstrap" in + *,c++,*:*) ;; + *:yes) + if test -f ${srcdir}/gcc/cp/config-lang.in; then + enable_languages="${enable_languages},c++" + else + AC_MSG_ERROR([bootstrapping requires c++ sources]) + fi + ;; + esac + + # First scan to see if an enabled language requires some other language. + # We assume that a given config-lang.in will list all the language + # front ends it requires, even if some are required indirectly. + for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do + case ${lang_frag} in + ..) ;; + # The odd quoting in the next line works around + # an apparent bug in bash 1.12 on linux. + ${srcdir}/gcc/[[*]]/config-lang.in) ;; + *) + # From the config-lang.in, get $language, $lang_requires, and + # $lang_requires_boot_languages. + language= + lang_requires= + lang_requires_boot_languages= + . ${lang_frag} + for other in ${lang_requires} ${lang_requires_boot_languages}; do + case ,${enable_languages}, in + *,$other,*) ;; + *,all,*) ;; + *,$language,*) + echo " \`$other' language required by \`$language'; enabling" 1>&2 + enable_languages="${enable_languages},${other}" + ;; + esac + done + for other in ${lang_requires_boot_languages} ; do + if test "$other" != "c"; then + case ,${enable_stage1_languages}, in + *,$other,*) ;; + *,all,*) ;; + *) + case ,${enable_languages}, in + *,$language,*) + echo " '$other' language required by '$language' in stage 1; enabling" 1>&2 + enable_stage1_languages="$enable_stage1_languages,${other}" + ;; + esac + ;; + esac + fi + done + ;; + esac + done + + new_enable_languages=,c, + + # If LTO is enabled, add the LTO front end. + if test "$enable_lto" = "yes" ; then + case ,${enable_languages}, in + *,lto,*) ;; + *) enable_languages="${enable_languages},lto" ;; + esac + if test "${build_lto_plugin}" = "yes" ; then + configdirs="$configdirs lto-plugin" + fi + fi + + # If we're building an offloading compiler, add the LTO front end. + if test x"$enable_as_accelerator_for" != x ; then + case ,${enable_languages}, in + *,lto,*) ;; + *) enable_languages="${enable_languages},lto" ;; + esac + fi + + missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ ` + potential_languages=,c, + + enabled_target_libs= + disabled_target_libs= + + for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do + case ${lang_frag} in + ..) ;; + # The odd quoting in the next line works around + # an apparent bug in bash 1.12 on linux. + ${srcdir}/gcc/[[*]]/config-lang.in) ;; + *) + # From the config-lang.in, get $language, $target_libs, + # $lang_dirs, $boot_language, and $build_by_default + language= + target_libs= + lang_dirs= + subdir_requires= + boot_language=no + build_by_default=yes + . ${lang_frag} + if test x${language} = x; then + echo "${lang_frag} doesn't set \$language." 1>&2 + exit 1 + fi + + if test "$language" = "c++"; then + boot_language=yes + fi + + add_this_lang=no + case ,${enable_languages}, in + *,${language},*) + # Language was explicitly selected; include it + # unless it is C, which is enabled by default. + if test "$language" != "c"; then + add_this_lang=yes + fi + ;; + *,all,*) + # 'all' was selected, select it if it is a default language + if test "$language" != "c"; then + add_this_lang=${build_by_default} + fi + ;; + esac + + # Disable languages that need other directories if these aren't available. + for i in $subdir_requires; do + test -f "$srcdir/gcc/$i/config-lang.in" && continue + case ,${enable_languages}, in + *,${language},*) + # Specifically requested language; tell them. + AC_MSG_ERROR([The gcc/$i directory contains parts of $language but is missing]) + ;; + *) + # Silently disable. + add_this_lang=unsupported + ;; + esac + done + + # Disable Ada if no preexisting GNAT is available. + case ,${enable_languages},:${language}:${have_gnat} in + *,${language},*:ada:no) + # Specifically requested language; tell them. + AC_MSG_ERROR([GNAT is required to build $language]) + ;; + *:ada:no) + # Silently disable. + add_this_lang=unsupported + ;; + esac + + # Disable a language that is unsupported by the target. + case " $unsupported_languages " in + *" $language "*) + add_this_lang=unsupported + ;; + esac + + case $add_this_lang in + unsupported) + # Remove language-dependent dirs. + disabled_target_libs="$disabled_target_libs $target_libs" + noconfigdirs="$noconfigdirs $lang_dirs" + ;; + no) + # Remove language-dependent dirs; still show language as supported. + disabled_target_libs="$disabled_target_libs $target_libs" + noconfigdirs="$noconfigdirs $lang_dirs" + potential_languages="${potential_languages}${language}," + ;; + yes) + new_enable_languages="${new_enable_languages}${language}," + potential_languages="${potential_languages}${language}," + missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"` + enabled_target_libs="$enabled_target_libs $target_libs" + case "${boot_language}:,$enable_stage1_languages," in + yes:* | *:*,$language,* | *:*,yes, | *:*,all,) + # Add to (comma-separated) list of stage 1 languages. + case ",$stage1_languages," in + *,$language,* | ,yes, | ,all,) ;; + *) stage1_languages="${stage1_languages}${language}," ;; + esac + # We need to bootstrap any supporting libraries. + bootstrap_target_libs="${bootstrap_target_libs}${target_libs}," + ;; + esac + ;; + esac + ;; + esac + done + + # Add target libraries which are only needed for disabled languages + # to noconfigdirs. + if test -n "$disabled_target_libs"; then + for dir in $disabled_target_libs; do + case " $enabled_target_libs " in + *" ${dir} "*) ;; + *) noconfigdirs="$noconfigdirs $dir" ;; + esac + done + fi + + AC_ARG_ENABLE(stage1-languages, + [AS_HELP_STRING([[--enable-stage1-languages[=all]]], + [choose additional languages to build during + stage1. Mostly useful for compiler development])], + [case ,${enable_stage1_languages}, in + ,no,|,,) + # Set it to something that will have no effect in the loop below + enable_stage1_languages=c ;; + ,yes,) + enable_stage1_languages=`echo $new_enable_languages | \ + sed -e "s/^,//" -e "s/,$//" ` ;; + *,all,*) + enable_stage1_languages=`echo ,$enable_stage1_languages, | \ + sed -e "s/,all,/$new_enable_languages/" -e "s/^,//" -e "s/,$//" ` ;; + esac + + # Add "good" languages from enable_stage1_languages to stage1_languages, + # while "bad" languages go in missing_languages. Leave no duplicates. + for i in `echo $enable_stage1_languages | sed 's/,/ /g' `; do + case $potential_languages in + *,$i,*) + case $stage1_languages in + *,$i,*) ;; + *) stage1_languages="$stage1_languages$i," ;; + esac ;; + *) + case $missing_languages in + *,$i,*) ;; + *) missing_languages="$missing_languages$i," ;; + esac ;; + esac + done]) + + # Remove leading/trailing commas that were added for simplicity + potential_languages=`echo "$potential_languages" | sed -e "s/^,//" -e "s/,$//"` + missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"` + stage1_languages=`echo "$stage1_languages" | sed -e "s/^,//" -e "s/,$//"` + new_enable_languages=`echo "$new_enable_languages" | sed -e "s/^,//" -e "s/,$//"` + + if test "x$missing_languages" != x; then + AC_MSG_ERROR([ +The following requested languages could not be built: ${missing_languages} +Supported languages are: ${potential_languages}]) + fi + if test "x$new_enable_languages" != "x$enable_languages"; then + echo The following languages will be built: ${new_enable_languages} + enable_languages="$new_enable_languages" + fi + + AC_SUBST(stage1_languages) + ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[[^ ]]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" ` +fi + +# Handle --disable- generically. +for dir in $configdirs $build_configdirs $target_configdirs ; do + dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g` + varname=`echo $dirname | sed -e s/+/_/g` + if eval test x\${enable_${varname}} "=" xno ; then + noconfigdirs="$noconfigdirs $dir" + fi +done + +# Check for Boehm's garbage collector +AC_ARG_ENABLE(objc-gc, +[AS_HELP_STRING([--enable-objc-gc], + [enable use of Boehm's garbage collector with the + GNU Objective-C runtime])], +[case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in + *,objc,*:*:yes:*target-boehm-gc*) + AC_MSG_ERROR([Boehm's garbage collector was requested yet not supported in this configuration]) + ;; +esac]) + +# Make sure we only build Boehm's garbage collector if required. +case ,${enable_languages},:${enable_objc_gc} in + *,objc,*:yes) + # Keep target-boehm-gc if requested for Objective-C. + ;; + *) + # Otherwise remove target-boehm-gc depending on target-libjava. + if echo " ${noconfigdirs} " | grep "target-libjava" >/dev/null 2>&1; then + noconfigdirs="$noconfigdirs target-boehm-gc" + fi + ;; +esac + +# Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++ +case ,${enable_languages}, in + *,c++,*) + # Disable libcilkrts, libitm, libsanitizer if we're not building libstdc++ + case "${noconfigdirs}" in + *target-libstdc++-v3*) + noconfigdirs="$noconfigdirs target-libcilkrts target-libitm target-libsanitizer" + ;; + *) ;; + esac + ;; + *) + noconfigdirs="$noconfigdirs target-libcilkrts target-liboffloadmic target-libitm target-libsanitizer target-libvtv" + ;; +esac + +# Remove the entries in $skipdirs and $noconfigdirs from $configdirs, +# $build_configdirs and $target_configdirs. +# If we have the source for $noconfigdirs entries, add them to $notsupp. + +notsupp="" +for dir in . $skipdirs $noconfigdirs ; do + dirname=`echo $dir | sed -e s/target-//g -e s/build-//g` + if test $dir != . && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then + configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"` + if test -r $srcdir/$dirname/configure ; then + if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then + true + else + notsupp="$notsupp $dir" + fi + fi + fi + if test $dir != . && echo " ${build_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then + build_configdirs=`echo " ${build_configdirs} " | sed -e "s/ ${dir} / /"` + if test -r $srcdir/$dirname/configure ; then + if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then + true + else + notsupp="$notsupp $dir" + fi + fi + fi + if test $dir != . && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then + target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"` + if test -r $srcdir/$dirname/configure ; then + if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then + true + else + notsupp="$notsupp $dir" + fi + fi + fi +done + +# Quietly strip out all directories which aren't configurable in this tree. +# This relies on all configurable subdirectories being autoconfiscated, which +# is now the case. +build_configdirs_all="$build_configdirs" +build_configdirs= +for i in ${build_configdirs_all} ; do + j=`echo $i | sed -e s/build-//g` + if test -f ${srcdir}/$j/configure ; then + build_configdirs="${build_configdirs} $i" + fi +done + +configdirs_all="$configdirs" +configdirs= +for i in ${configdirs_all} ; do + if test -f ${srcdir}/$i/configure ; then + configdirs="${configdirs} $i" + fi +done + +target_configdirs_all="$target_configdirs" +target_configdirs= +for i in ${target_configdirs_all} ; do + j=`echo $i | sed -e s/target-//g` + if test -f ${srcdir}/$j/configure ; then + target_configdirs="${target_configdirs} $i" + fi +done + +# Exclude target-zlib if target-libjava isn't built. +case ${target_configdirs} in +*target-libjava*) + ;; +*) + target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`" + ;; +esac + +# libiberty-linker-plugin is special: it doesn't have its own source directory, +# so we have to add it after the preceding checks. +if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x +then + case " $configdirs " in + *" libiberty "*) + # If we can build libiberty, we can also build libiberty-linker-plugin. + configdirs="$configdirs libiberty-linker-plugin" + extra_linker_plugin_configure_flags="$extra_linker_plugin_configure_flags \ + --with-libiberty=../libiberty-linker-plugin";; + *) + AC_MSG_ERROR([libiberty missing]);; + esac +fi + +# Sometimes we have special requirements for the host libiberty. +extra_host_libiberty_configure_flags= +extra_host_zlib_configure_flags= +case " $configdirs " in + *" lto-plugin "* | *" libcc1 "*) + # When these are to be built as shared libraries, the same applies to + # libiberty. + extra_host_libiberty_configure_flags=--enable-shared + ;; + *" bfd "*) + # When bfd is to be built as a shared library, the same applies to + # zlib. + if test "$enable_shared" = "yes"; then + extra_host_zlib_configure_flags=--enable-host-shared + fi + ;; +esac +AC_SUBST(extra_host_libiberty_configure_flags) +AC_SUBST(extra_host_zlib_configure_flags) + +# Produce a warning message for the subdirs we can't configure. +# This isn't especially interesting in the Cygnus tree, but in the individual +# FSF releases, it's important to let people know when their machine isn't +# supported by the one or two programs in a package. + +if test -n "${notsupp}" && test -z "${norecursion}" ; then + # If $appdirs is non-empty, at least one of those directories must still + # be configured, or we error out. (E.g., if the gas release supports a + # specified target in some subdirs but not the gas subdir, we shouldn't + # pretend that all is well.) + if test -n "$appdirs" ; then + for dir in $appdirs ; do + if test -r $dir/Makefile.in ; then + if echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then + appdirs="" + break + fi + if echo " ${target_configdirs} " | grep " target-${dir} " >/dev/null 2>&1; then + appdirs="" + break + fi + fi + done + if test -n "$appdirs" ; then + echo "*** This configuration is not supported by this package." 1>&2 + exit 1 + fi + fi + # Okay, some application will build, or we don't care to check. Still + # notify of subdirs not getting built. + echo "*** This configuration is not supported in the following subdirectories:" 1>&2 + echo " ${notsupp}" 1>&2 + echo " (Any other directories should still work fine.)" 1>&2 +fi + +case "$host" in + *msdosdjgpp*) + enable_gdbtk=no ;; +esac + +# To find our prefix, in gcc_cv_tool_prefix. +ACX_TOOL_DIRS + +copy_dirs= + +AC_ARG_WITH([build-sysroot], + [AS_HELP_STRING([--with-build-sysroot=SYSROOT], + [use sysroot as the system root during the build])], + [if test x"$withval" != x ; then + SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" + fi], + [SYSROOT_CFLAGS_FOR_TARGET=]) +AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET) + +AC_ARG_WITH([debug-prefix-map], + [AS_HELP_STRING([--with-debug-prefix-map='A=B C=D ...'], + [map A to B, C to D ... in debug information])], + [if test x"$withval" != x; then + DEBUG_PREFIX_CFLAGS_FOR_TARGET= + for debug_map in $withval; do + DEBUG_PREFIX_CFLAGS_FOR_TARGET="$DEBUG_PREFIX_CFLAGS_FOR_TARGET -fdebug-prefix-map=$debug_map" + done + fi], + [DEBUG_PREFIX_CFLAGS_FOR_TARGET=]) +AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET) + +# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS +# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS +# might also be empty (or "-g", if a non-GCC C++ compiler is in the path). +# We want to ensure that TARGET libraries (which we know are built with +# gcc) are built with "-O2 -g", so include those options when setting +# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET. +if test "x$CFLAGS_FOR_TARGET" = x; then + if test "x${is_cross_compiler}" = xyes; then + CFLAGS_FOR_TARGET="-g -O2" + else + CFLAGS_FOR_TARGET=$CFLAGS + case " $CFLAGS " in + *" -O2 "*) ;; + *) CFLAGS_FOR_TARGET="-O2 $CFLAGS_FOR_TARGET" ;; + esac + case " $CFLAGS " in + *" -g "* | *" -g3 "*) ;; + *) CFLAGS_FOR_TARGET="-g $CFLAGS_FOR_TARGET" ;; + esac + fi +fi +AC_SUBST(CFLAGS_FOR_TARGET) + +if test "x$CXXFLAGS_FOR_TARGET" = x; then + if test "x${is_cross_compiler}" = xyes; then + CXXFLAGS_FOR_TARGET="-g -O2" + else + CXXFLAGS_FOR_TARGET=$CXXFLAGS + case " $CXXFLAGS " in + *" -O2 "*) ;; + *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS_FOR_TARGET" ;; + esac + case " $CXXFLAGS " in + *" -g "* | *" -g3 "*) ;; + *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS_FOR_TARGET" ;; + esac + fi +fi +AC_SUBST(CXXFLAGS_FOR_TARGET) + +AC_SUBST(LDFLAGS_FOR_TARGET) + +# Handle --with-headers=XXX. If the value is not "yes", the contents of +# the named directory are copied to $(tooldir)/sys-include. +if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then + if test x${is_cross_compiler} = xno ; then + echo 1>&2 '***' --with-headers is only supported when cross compiling + exit 1 + fi + if test x"${with_headers}" != xyes ; then + x=${gcc_cv_tool_prefix} + copy_dirs="${copy_dirs} ${with_headers} $x/${target_noncanonical}/sys-include" + fi +fi + +# Handle --with-libs=XXX. If the value is not "yes", the contents of +# the name directories are copied to $(tooldir)/lib. Multiple directories +# are permitted. +if test x"${with_libs}" != x && test x"${with_libs}" != xno ; then + if test x${is_cross_compiler} = xno ; then + echo 1>&2 '***' --with-libs is only supported when cross compiling + exit 1 + fi + if test x"${with_libs}" != xyes ; then + # Copy the libraries in reverse order, so that files in the first named + # library override files in subsequent libraries. + x=${gcc_cv_tool_prefix} + for l in ${with_libs}; do + copy_dirs="$l $x/${target_noncanonical}/lib ${copy_dirs}" + done + fi +fi + +# Set with_gnu_as, with_gnu_ld, and with_system_zlib as appropriate. +# +# This is done by determining whether or not the appropriate directory +# is available, and by checking whether or not specific configurations +# have requested that this magic not happen. +# +# The command line options always override the explicit settings in +# configure.ac, and the settings in configure.ac override this magic. +# +# If the default for a toolchain is to use GNU as and ld, and you don't +# want to do that, then you should use the --without-gnu-as and +# --without-gnu-ld options for the configure script. Similarly, if +# the default is to use the included zlib and you don't want to do that, +# you should use the --with-system-zlib option for the configure script. + +if test x${use_gnu_as} = x && + echo " ${configdirs} " | grep " gas " > /dev/null 2>&1 ; then + with_gnu_as=yes + extra_host_args="$extra_host_args --with-gnu-as" +fi + +if test x${use_gnu_ld} = x && + echo " ${configdirs} " | egrep " (go)?ld " > /dev/null 2>&1 ; then + with_gnu_ld=yes + extra_host_args="$extra_host_args --with-gnu-ld" +fi + +if test x${use_included_zlib} = x && + echo " ${configdirs} " | grep " zlib " > /dev/null 2>&1 ; then + : +else + with_system_zlib=yes + extra_host_args="$extra_host_args --with-system-zlib" +fi + +# If using newlib, add --with-newlib to the extra_host_args so that gcc/configure +# can detect this case. + +if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " target-newlib " > /dev/null 2>&1 ; then + with_newlib=yes + extra_host_args="$extra_host_args --with-newlib" +fi + +# Handle ${copy_dirs} +set fnord ${copy_dirs} +shift +while test $# != 0 ; do + if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then + : + else + echo Copying $1 to $2 + + # Use the install script to create the directory and all required + # parent directories. + if test -d $2 ; then + : + else + echo >config.temp + ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED + fi + + # Copy the directory, assuming we have tar. + # FIXME: Should we use B in the second tar? Not all systems support it. + (cd $1; tar -cf - .) | (cd $2; tar -xpf -) + + # It is the responsibility of the user to correctly adjust all + # symlinks. If somebody can figure out how to handle them correctly + # here, feel free to add the code. + + echo $1 > $2/COPIED + fi + shift; shift +done + +# Determine a target-dependent exec_prefix that the installed +# gcc will search in. Keep this list sorted by triplet, with +# the *-*-osname triplets last. +md_exec_prefix= +case "${target}" in + i[[34567]]86-pc-msdosdjgpp*) + md_exec_prefix=/dev/env/DJDIR/bin + ;; + *-*-hpux* | \ + *-*-nto-qnx* | \ + *-*-solaris2*) + md_exec_prefix=/usr/ccs/bin + ;; +esac + +extra_arflags_for_target= +extra_nmflags_for_target= +extra_ranlibflags_for_target= +target_makefile_frag=/dev/null +case "${target}" in + spu-*-*) + target_makefile_frag="config/mt-spu" + ;; + mips*-sde-elf* | mips*-mti-elf* | mips*-img-elf*) + target_makefile_frag="config/mt-sde" + ;; + mipsisa*-*-elfoabi*) + target_makefile_frag="config/mt-mips-elfoabi" + ;; + mips*-*-*linux* | mips*-*-gnu*) + target_makefile_frag="config/mt-mips-gnu" + ;; + nios2-*-elf*) + target_makefile_frag="config/mt-nios2-elf" + ;; + *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu) + target_makefile_frag="config/mt-gnu" + ;; + *-*-aix4.[[3456789]]* | *-*-aix[[56789]].*) + # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm + # commands to handle both 32-bit and 64-bit objects. These flags are + # harmless if we're using GNU nm or ar. + extra_arflags_for_target=" -X32_64" + extra_nmflags_for_target=" -B -X32_64" + ;; +esac + +alphaieee_frag=/dev/null +case $target in + alpha*-*-*) + # This just makes sure to use the -mieee option to build target libs. + # This should probably be set individually by each library. + alphaieee_frag="config/mt-alphaieee" + ;; +esac + +# If --enable-target-optspace always use -Os instead of -O2 to build +# the target libraries, similarly if it is not specified, use -Os +# on selected platforms. +ospace_frag=/dev/null +case "${enable_target_optspace}:${target}" in + yes:*) + ospace_frag="config/mt-ospace" + ;; + :d30v-*) + ospace_frag="config/mt-d30v" + ;; + :m32r-* | :d10v-* | :fr30-* | :i?86*-*-elfiamcu) + ospace_frag="config/mt-ospace" + ;; + no:* | :*) + ;; + *) + echo "*** bad value \"${enable_target_optspace}\" for --enable-target-optspace flag; ignored" 1>&2 + ;; +esac + +# Some systems (e.g., one of the i386-aix systems the gas testers are +# using) don't handle "\$" correctly, so don't use it here. +AC_ARG_WITH([tooldir], + [AS_HELP_STRING([--with-tooldir=PATH], + [use given path to install target tools after build])], + [AS_CASE([x"$withval"], + [x/*],, + [AC_MSG_ERROR([argument to --with-tooldir must be an absolute path])]) + ], + [with_tooldir='${exec_prefix}'/${target_noncanonical}]) +tooldir=${with_tooldir} +build_tooldir=${tooldir} + +# Create a .gdbinit file which runs the one in srcdir +# and tells GDB to look there for source files. + +if test -r ${srcdir}/.gdbinit ; then + case ${srcdir} in + .) ;; + *) cat > ./.gdbinit < conftest.c +${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c +if test $? = 0 ; then + if test -s conftest || test -s conftest.exe ; then + we_are_ok=yes + fi +fi +case $we_are_ok in + no) + echo 1>&2 "*** The command '${CC} -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c' failed." + echo 1>&2 "*** You must set the environment variable CC to a working compiler." + rm -f conftest* + exit 1 + ;; +esac +rm -f conftest* + +# Decide which environment variable is used to find dynamic libraries. +case "${host}" in + *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; + *-*-darwin*) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; + *-*-mingw* | *-*-cygwin ) RPATH_ENVVAR=PATH ;; + *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; +esac + +# On systems where the dynamic library environment variable is PATH, +# gcc/ will put dynamic libraries into a subdirectory to avoid adding +# built executables to PATH. +if test "$RPATH_ENVVAR" = PATH; then + GCC_SHLIB_SUBDIR=/shlib +else + GCC_SHLIB_SUBDIR= +fi + +# Adjust the toplevel makefile according to whether bootstrap was selected. +case $enable_bootstrap in + yes) + bootstrap_suffix=bootstrap + BUILD_CONFIG=bootstrap-debug + ;; + no) + bootstrap_suffix=no-bootstrap + BUILD_CONFIG= + ;; +esac + +AC_MSG_CHECKING(for default BUILD_CONFIG) + +AC_ARG_WITH([build-config], + [AS_HELP_STRING([--with-build-config='NAME NAME2...'], + [use config/NAME.mk build configuration])], + [case $with_build_config in + yes) with_build_config= ;; + no) with_build_config= BUILD_CONFIG= ;; + esac]) + +if test "x${with_build_config}" != x; then + BUILD_CONFIG=$with_build_config +else + case $BUILD_CONFIG in + bootstrap-debug) + if echo "int f (void) { return 0; }" > conftest.c && + ${CC} -c conftest.c && + mv conftest.o conftest.o.g0 && + ${CC} -c -g conftest.c && + mv conftest.o conftest.o.g && + ${srcdir}/contrib/compare-debug conftest.o.g0 conftest.o.g > /dev/null 2>&1; then + : + else + BUILD_CONFIG= + fi + rm -f conftest.c conftest.o conftest.o.g0 conftest.o.g + ;; + esac +fi +AC_MSG_RESULT($BUILD_CONFIG) +AC_SUBST(BUILD_CONFIG) + +# Use same top-level configure hooks in libgcc/libstdc++/libvtv. +AC_MSG_CHECKING([for --enable-vtable-verify]) +AC_ARG_ENABLE(vtable-verify, +[AS_HELP_STRING([--enable-vtable-verify], + [Enable vtable verification feature])], +[case "$enableval" in + yes) enable_vtable_verify=yes ;; + no) enable_vtable_verify=no ;; + *) enable_vtable_verify=no;; + esac], +[enable_vtable_verify=no]) +AC_MSG_RESULT($enable_vtable_verify) + +# Record target_configdirs and the configure arguments for target and +# build configuration in Makefile. +target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'` +build_configdirs=`echo "${build_configdirs}" | sed -e 's/build-//g'` +bootstrap_fixincludes=no + +# If we are building libgomp, bootstrap it. +if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then + bootstrap_target_libs=${bootstrap_target_libs}target-libgomp, +fi + +# If we are building libsanitizer and $BUILD_CONFIG contains bootstrap-asan +# or bootstrap-ubsan, bootstrap it. +if echo " ${target_configdirs} " | grep " libsanitizer " > /dev/null 2>&1; then + case "$BUILD_CONFIG" in + *bootstrap-asan* | *bootstrap-ubsan* ) + bootstrap_target_libs=${bootstrap_target_libs}target-libsanitizer, + bootstrap_fixincludes=yes + ;; + esac +fi + +# If we are building libvtv and --enable-vtable-verify, bootstrap it. +if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 && + test "$enable_vtable_verify" != no; then + bootstrap_target_libs=${bootstrap_target_libs}target-libvtv, +fi + +# If we are building libmpx, bootstrap it. +if echo " ${target_configdirs} " | grep " libmpx " > /dev/null 2>&1; then + bootstrap_target_libs=${bootstrap_target_libs}target-libmpx, +fi + +# Determine whether gdb needs tk/tcl or not. +# Use 'maybe' since enable_gdbtk might be true even if tk isn't available +# and in that case we want gdb to be built without tk. Ugh! +# In fact I believe gdb is the *only* package directly dependent on tk, +# so we should be able to put the 'maybe's in unconditionally and +# leave out the maybe dependencies when enable_gdbtk is false. I'm not +# 100% sure that that's safe though. + +gdb_tk="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-libgui" +case "$enable_gdbtk" in + no) + GDB_TK="" ;; + yes) + GDB_TK="${gdb_tk}" ;; + *) + # Only add the dependency on gdbtk when GDBtk is part of the gdb + # distro. Eventually someone will fix this and move Insight, nee + # gdbtk to a separate directory. + if test -d ${srcdir}/gdb/gdbtk ; then + GDB_TK="${gdb_tk}" + else + GDB_TK="" + fi + ;; +esac +CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g` +INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` + +# Strip out unwanted targets. + +# While at that, we remove Makefiles if we were started for recursive +# configuration, so that the top-level Makefile reconfigures them, +# like we used to do when configure itself was recursive. + +# Loop over modules. We used to use the "$extrasub" feature from Autoconf +# but now we're fixing up the Makefile ourselves with the additional +# commands passed to AC_CONFIG_FILES. Use separate variables +# extrasub-{build,host,target} not because there is any reason to split +# the substitutions up that way, but only to remain below the limit of +# 99 commands in a script, for HP-UX sed. + +# Do not nest @if/@endif or @unless/@endunless pairs, because +# configure will not warn you at all. + +case "$enable_bootstrap:$ENABLE_GOLD: $configdirs :,$stage1_languages," in + yes:yes:*\ gold\ *:*,c++,*) ;; + yes:yes:*\ gold\ *:*) + AC_MSG_ERROR([in a combined tree, bootstrapping with --enable-gold requires c++ in stage1_languages]) + ;; +esac + +extrasub_build= +for module in ${build_configdirs} ; do + if test -z "${no_recursion}" \ + && test -f ${build_subdir}/${module}/Makefile; then + echo 1>&2 "*** removing ${build_subdir}/${module}/Makefile to force reconfigure" + rm -f ${build_subdir}/${module}/Makefile + fi + extrasub_build="$extrasub_build +/^@if build-$module\$/d +/^@endif build-$module\$/d +/^@unless build-$module\$/,/^@endunless build-$module\$/d +/^@if build-$module-$bootstrap_suffix\$/d +/^@endif build-$module-$bootstrap_suffix\$/d +/^@unless build-$module-$bootstrap_suffix\$/,/^@endunless build-$module-$bootstrap_suffix\$/d" +done +extrasub_host= +for module in ${configdirs} ; do + if test -z "${no_recursion}"; then + for file in stage*-${module}/Makefile prev-${module}/Makefile ${module}/Makefile; do + if test -f ${file}; then + echo 1>&2 "*** removing ${file} to force reconfigure" + rm -f ${file} + fi + done + fi + case ${module},${bootstrap_fixincludes} in + fixincludes,no) host_bootstrap_suffix=no-bootstrap ;; + *) host_bootstrap_suffix=$bootstrap_suffix ;; + esac + extrasub_host="$extrasub_host +/^@if $module\$/d +/^@endif $module\$/d +/^@unless $module\$/,/^@endunless $module\$/d +/^@if $module-$host_bootstrap_suffix\$/d +/^@endif $module-$host_bootstrap_suffix\$/d +/^@unless $module-$host_bootstrap_suffix\$/,/^@endunless $module-$host_bootstrap_suffix\$/d" +done +extrasub_target= +for module in ${target_configdirs} ; do + if test -z "${no_recursion}" \ + && test -f ${target_subdir}/${module}/Makefile; then + echo 1>&2 "*** removing ${target_subdir}/${module}/Makefile to force reconfigure" + rm -f ${target_subdir}/${module}/Makefile + fi + + # We only bootstrap target libraries listed in bootstrap_target_libs. + case $bootstrap_target_libs in + *,target-$module,*) target_bootstrap_suffix=$bootstrap_suffix ;; + *) target_bootstrap_suffix=no-bootstrap ;; + esac + + extrasub_target="$extrasub_target +/^@if target-$module\$/d +/^@endif target-$module\$/d +/^@unless target-$module\$/,/^@endunless target-$module\$/d +/^@if target-$module-$target_bootstrap_suffix\$/d +/^@endif target-$module-$target_bootstrap_suffix\$/d +/^@unless target-$module-$target_bootstrap_suffix\$/,/^@endunless target-$module-$target_bootstrap_suffix\$/d" +done + +# Do the final fixup along with target modules. +extrasub_target="$extrasub_target +/^@if /,/^@endif /d +/^@unless /d +/^@endunless /d" + +# Create the serialization dependencies. This uses a temporary file. + +AC_ARG_ENABLE([serial-configure], +[AS_HELP_STRING([[--enable-serial-[{host,target,build}-]configure]], + [force sequential configuration of + sub-packages for the host, target or build + machine, or all sub-packages])]) + +case ${enable_serial_configure} in + yes) + enable_serial_build_configure=yes + enable_serial_host_configure=yes + enable_serial_target_configure=yes + ;; +esac + +# These force 'configure's to be done one at a time, to avoid problems +# with contention over a shared config.cache. +rm -f serdep.tmp +echo '# serdep.tmp' > serdep.tmp +olditem= +test "x${enable_serial_build_configure}" = xyes && +for item in ${build_configdirs} ; do + case ${olditem} in + "") ;; + *) echo "configure-build-${item}: configure-build-${olditem}" >> serdep.tmp ;; + esac + olditem=${item} +done +olditem= +test "x${enable_serial_host_configure}" = xyes && +for item in ${configdirs} ; do + case ${olditem} in + "") ;; + *) echo "configure-${item}: configure-${olditem}" >> serdep.tmp ;; + esac + olditem=${item} +done +olditem= +test "x${enable_serial_target_configure}" = xyes && +for item in ${target_configdirs} ; do + case ${olditem} in + "") ;; + *) echo "configure-target-${item}: configure-target-${olditem}" >> serdep.tmp ;; + esac + olditem=${item} +done +serialization_dependencies=serdep.tmp +AC_SUBST_FILE(serialization_dependencies) + +# Base args. Strip norecursion, cache-file, srcdir, host, build, +# target, nonopt, and variable assignments. These are the ones we +# might not want to pass down to subconfigures. The exception being +# --cache-file=/dev/null, which is used to turn off the use of cache +# files altogether, and which should be passed on to subconfigures. +# Also strip program-prefix, program-suffix, and program-transform-name, +# so that we can pass down a consistent program-transform-name. +baseargs= +tbaseargs= +keep_next=no +skip_next=no +eval "set -- $ac_configure_args" +for ac_arg +do + if test X"$skip_next" = X"yes"; then + skip_next=no + continue + fi + if test X"$keep_next" = X"yes"; then + case $ac_arg in + *\'*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + baseargs="$baseargs '$ac_arg'" + tbaseargs="$tbaseargs '$ac_arg'" + keep_next=no + continue + fi + + # Handle separated arguments. Based on the logic generated by + # autoconf 2.59. + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + separate_arg=no + ;; + -*) + separate_arg=yes + ;; + *) + separate_arg=no + ;; + esac + + skip_targ=no + case $ac_arg in +changequote(,) + --with-* | --without-*) + libopt=`echo "$ac_arg" | sed -e 's,^--[^-_]*[-_],,' -e 's,=.*$,,'` + + case $libopt in + *[-_]include) + lib=`echo "$libopt" | sed 's,[-_]include$,,'` + ;; + *[-_]lib) + lib=`echo "$libopt" | sed 's,[-_]lib$,,'` + ;; + *) + lib=$libopt + ;; + esac +changequote([,]) + + case $lib in + mpc | mpfr | gmp | isl) + # If we're processing --with-$lib, --with-$lib-include or + # --with-$lib-lib, for one of the libs above, and target is + # different from host, don't pass the current argument to any + # target library's configure. + if test x$is_cross_compiler = xyes; then + skip_targ=yes + fi + ;; + esac + ;; + esac + + case "$ac_arg" in + --cache-file=/dev/null | \ + -cache-file=/dev/null ) + # Handled here to avoid the test to skip args below. + baseargs="$baseargs '$ac_arg'" + tbaseargs="$tbaseargs '$ac_arg'" + # Assert: $separate_arg should always be no. + keep_next=$separate_arg + ;; + --no*) + continue + ;; + --c* | \ + --sr* | \ + --ho* | \ + --bu* | \ + --t* | \ + --program-* | \ + -cache_file* | \ + -srcdir* | \ + -host* | \ + -build* | \ + -target* | \ + -program-prefix* | \ + -program-suffix* | \ + -program-transform-name* ) + skip_next=$separate_arg + continue + ;; + -*) + # An option. Add it. + case $ac_arg in + *\'*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + baseargs="$baseargs '$ac_arg'" + if test X"$skip_targ" = Xno; then + tbaseargs="$tbaseargs '$ac_arg'" + fi + keep_next=$separate_arg + ;; + *) + # Either a variable assignment, or a nonopt (triplet). Don't + # pass it down; let the Makefile handle this. + continue + ;; + esac +done +# Remove the initial space we just introduced and, as these will be +# expanded by make, quote '$'. +baseargs=`echo "x$baseargs" | sed -e 's/^x *//' -e 's,\\$,$$,g'` + +# Add in --program-transform-name, after --program-prefix and +# --program-suffix have been applied to it. Autoconf has already +# doubled dollar signs and backslashes in program_transform_name; we want +# the backslashes un-doubled, and then the entire thing wrapped in single +# quotes, because this will be expanded first by make and then by the shell. +# Also, because we want to override the logic in subdir configure scripts to +# choose program_transform_name, replace any s,x,x, with s,y,y,. +sed -e "s,\\\\\\\\,\\\\,g; s,','\\\\'',g; s/s,x,x,/s,y,y,/" < conftestsed.out +${program_transform_name} +EOF_SED +gcc_transform_name=`cat conftestsed.out` +rm -f conftestsed.out +baseargs="$baseargs --program-transform-name='${gcc_transform_name}'" +tbaseargs="$tbaseargs --program-transform-name='${gcc_transform_name}'" +if test "$silent" = yes; then + baseargs="$baseargs --silent" + tbaseargs="$tbaseargs --silent" +fi +baseargs="$baseargs --disable-option-checking" +tbaseargs="$tbaseargs --disable-option-checking" + +# Record and document user additions to sub configure arguments. +AC_ARG_VAR([build_configargs], + [additional configure arguments for build directories]) +AC_ARG_VAR([host_configargs], + [additional configure arguments for host directories]) +AC_ARG_VAR([target_configargs], + [additional configure arguments for target directories]) + +# For the build-side libraries, we just need to pretend we're native, +# and not use the same cache file. Multilibs are neither needed nor +# desired. We can't even use the same cache file for all build-side +# libraries, as they're compiled differently; some with C, some with +# C++ or with different feature-enabling options. +build_configargs="$build_configargs --cache-file=./config.cache ${baseargs}" + +# For host modules, accept cache file option, or specification as blank. +case "${cache_file}" in +"") # empty + cache_file_option="" ;; +/* | [[A-Za-z]]:[[\\/]]* ) # absolute path + cache_file_option="--cache-file=${cache_file}" ;; +*) # relative path + cache_file_option="--cache-file=../${cache_file}" ;; +esac + +# Host dirs don't like to share a cache file either, horribly enough. +# This seems to be due to autoconf 2.5x stupidity. +host_configargs="$host_configargs --cache-file=./config.cache ${extra_host_args} ${baseargs}" + +target_configargs="$target_configargs ${tbaseargs}" + +# Passing a --with-cross-host argument lets the target libraries know +# whether they are being built with a cross-compiler or being built +# native. However, it would be better to use other mechanisms to make the +# sorts of decisions they want to make on this basis. Please consider +# this option to be deprecated. FIXME. +if test x${is_cross_compiler} = xyes ; then + target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}" +fi + +# Special user-friendly check for native x86_64-linux build, if +# multilib is not explicitly enabled. +case "$target:$have_compiler:$host:$target:$enable_multilib" in + x86_64-*linux*:yes:$build:$build:) + # Make sure we have a development environment that handles 32-bit + dev64=no + echo "int main () { return 0; }" > conftest.c + ${CC} -m32 -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c + if test $? = 0 ; then + if test -s conftest || test -s conftest.exe ; then + dev64=yes + fi + fi + rm -f conftest* + if test x${dev64} != xyes ; then + AC_MSG_ERROR([I suspect your system does not have 32-bit development libraries (libc and headers). If you have them, rerun configure with --enable-multilib. If you do not have them, and want to build a 64-bit-only compiler, rerun configure with --disable-multilib.]) + fi + ;; +esac + +# Default to --enable-multilib. +if test x${enable_multilib} = x ; then + target_configargs="--enable-multilib ${target_configargs}" +fi + +# Pass --with-newlib if appropriate. Note that target_configdirs has +# changed from the earlier setting of with_newlib. +if test x${with_newlib} != xno && echo " ${target_configdirs} " | grep " newlib " > /dev/null 2>&1 && test -d ${srcdir}/newlib ; then + target_configargs="--with-newlib ${target_configargs}" +fi + +# Different target subdirs use different values of certain variables +# (notably CXX). Worse, multilibs use *lots* of different values. +# Worse yet, autoconf 2.5x makes some of these 'precious', meaning that +# it doesn't automatically accept command-line overrides of them. +# This means it's not safe for target subdirs to share a cache file, +# which is disgusting, but there you have it. Hopefully this can be +# fixed in future. It's still worthwhile to use a cache file for each +# directory. I think. + +# Pass the appropriate --build, --host, --target and --cache-file arguments. +# We need to pass --target, as newer autoconf's requires consistency +# for target_alias and gcc doesn't manage it consistently. +target_configargs="--cache-file=./config.cache ${target_configargs}" + +FLAGS_FOR_TARGET= + +AC_ARG_WITH([flags-for-target], + [AS_HELP_STRING([--with-flags-for-target=FLAGS], + [additional flags defined when building the target])] +) + +FLAGS_FOR_TARGET=${with_flags_for_target} +case " $target_configdirs " in + *" newlib "*) + case " $target_configargs " in + *" --with-newlib "*) + case "$target" in + *-cygwin*) + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -isystem $$s/winsup/cygwin/include' + ;; + esac + + # If we're not building GCC, don't discard standard headers. + if test -d ${srcdir}/gcc; then + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -nostdinc' + + if test "${build}" != "${host}"; then + # On Canadian crosses, CC_FOR_TARGET will have already been set + # by `configure', so we won't have an opportunity to add -Bgcc/ + # to it. This is right: we don't want to search that directory + # for binaries, but we want the header files in there, so add + # them explicitly. + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed' + + # Someone might think of using the pre-installed headers on + # Canadian crosses, in case the installed compiler is not fully + # compatible with the compiler being built. In this case, it + # would be better to flag an error than risking having + # incompatible object files being constructed. We can't + # guarantee that an error will be flagged, but let's hope the + # compiler will do it, when presented with incompatible header + # files. + fi + fi + + case "${target}-${is_cross_compiler}" in + i[[3456789]]86-*-linux*-no) + # Here host == target, so we don't need to build gcc, + # so we don't want to discard standard headers. + FLAGS_FOR_TARGET=`echo " $FLAGS_FOR_TARGET " | sed -e 's/ -nostdinc / /'` + ;; + *) + # If we're building newlib, use its generic headers last, but search + # for any libc-related directories first (so make it the last -B + # switch). + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/newlib/ -isystem $$r/$(TARGET_SUBDIR)/newlib/targ-include -isystem $$s/newlib/libc/include' + + # If we're building libgloss, find the startup file, simulator library + # and linker script. + case " $target_configdirs " in + *" libgloss "*) + # Look for startup file, simulator library and maybe linker script. + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/libgloss/'"$libgloss_dir" + # Look for libnosys.a in case the target needs it. + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/libnosys' + # Most targets have the linker script in the source directory. + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$s/libgloss/'"$libgloss_dir" + ;; + esac + ;; + esac + ;; + esac + ;; +esac + +case "$target" in + x86_64-*mingw* | *-w64-mingw*) + # MinGW-w64 does not use newlib, nor does it use winsup. It may, + # however, use a symlink named 'mingw' in ${prefix} . + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L${prefix}/${target}/lib -L${prefix}/mingw/lib -isystem ${prefix}/${target}/include -isystem ${prefix}/mingw/include' + ;; + *-mingw*) + # MinGW can't be handled as Cygwin above since it does not use newlib. + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/mingw -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/mingw/include -isystem $$s/winsup/w32api/include' + ;; +esac + +# Allow the user to override the flags for +# our build compiler if desired. +if test x"${build}" = x"${host}" ; then + CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}} + CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} + LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} +fi + +# On Canadian crosses, we'll be searching the right directories for +# the previously-installed cross compiler, so don't bother to add +# flags for directories within the install tree of the compiler +# being built; programs in there won't even run. +if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then + # Search for pre-installed headers if nothing else fits. + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -isystem $(build_tooldir)/include -isystem $(build_tooldir)/sys-include' +fi + +if test "x${use_gnu_ld}" = x && + echo " ${configdirs} " | grep " ld " > /dev/null ; then + # Arrange for us to find uninstalled linker scripts. + FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(HOST_SUBDIR)/ld' +fi + +# Search for other target-specific linker scripts and such. +case "${target}" in + mep*) + FLAGS_FOR_TARGET="$FLAGS_FOR_TARGET -mlibrary" + ;; +esac + +# Makefile fragments. +for frag in host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag; +do + eval fragval=\$$frag + if test $fragval != /dev/null; then + eval $frag=${srcdir}/$fragval + fi +done +AC_SUBST_FILE(host_makefile_frag) +AC_SUBST_FILE(target_makefile_frag) +AC_SUBST_FILE(alphaieee_frag) +AC_SUBST_FILE(ospace_frag) + +# Miscellanea: directories, flags, etc. +AC_SUBST(RPATH_ENVVAR) +AC_SUBST(GCC_SHLIB_SUBDIR) +AC_SUBST(tooldir) +AC_SUBST(build_tooldir) +AC_SUBST(CONFIGURE_GDB_TK) +AC_SUBST(GDB_TK) +AC_SUBST(INSTALL_GDB_TK) + +# Build module lists & subconfigure args. +AC_SUBST(build_configargs) +AC_SUBST(build_configdirs) + +# Host module lists & subconfigure args. +AC_SUBST(host_configargs) +AC_SUBST(configdirs) +AC_SUBST(target_configdirs) + +# Target module lists & subconfigure args. +AC_SUBST(target_configargs) + + +# Build tools. +AC_SUBST(AR_FOR_BUILD) +AC_SUBST(AS_FOR_BUILD) +AC_SUBST(CC_FOR_BUILD) +AC_SUBST(CFLAGS_FOR_BUILD) +AC_SUBST(CXXFLAGS_FOR_BUILD) +AC_SUBST(CXX_FOR_BUILD) +AC_SUBST(DLLTOOL_FOR_BUILD) +AC_SUBST(GCJ_FOR_BUILD) +AC_SUBST(GFORTRAN_FOR_BUILD) +AC_SUBST(GOC_FOR_BUILD) +AC_SUBST(LDFLAGS_FOR_BUILD) +AC_SUBST(LD_FOR_BUILD) +AC_SUBST(NM_FOR_BUILD) +AC_SUBST(RANLIB_FOR_BUILD) +AC_SUBST(WINDMC_FOR_BUILD) +AC_SUBST(WINDRES_FOR_BUILD) + +# Generate default definitions for YACC, M4, LEX and other programs that run +# on the build machine. These are used if the Makefile can't locate these +# programs in objdir. +MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing + +AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [$MISSING bison -y]) +case " $build_configdirs " in + *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;; +esac + +AC_CHECK_PROGS([BISON], [bison], [$MISSING bison]) +case " $build_configdirs " in + *" bison "*) BISON='$$r/$(BUILD_SUBDIR)/bison/tests/bison' ;; +esac + +AC_CHECK_PROGS([M4], [gm4 gnum4 m4], [$MISSING m4]) +case " $build_configdirs " in + *" m4 "*) M4='$$r/$(BUILD_SUBDIR)/m4/m4' ;; +esac + +AC_CHECK_PROGS([LEX], [flex lex], [$MISSING flex]) +case " $build_configdirs " in + *" flex "*) LEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;; + *" lex "*) LEX='$$r/$(BUILD_SUBDIR)/lex/lex' ;; +esac + +AC_CHECK_PROGS([FLEX], [flex], [$MISSING flex]) +case " $build_configdirs " in + *" flex "*) FLEX='$$r/$(BUILD_SUBDIR)/flex/flex' ;; +esac + +AC_CHECK_PROGS([MAKEINFO], makeinfo, [$MISSING makeinfo]) +case " $build_configdirs " in + *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; + *) +changequote(,) + # For an installed makeinfo, we require it to be from texinfo 4.7 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ + | egrep 'texinfo[^0-9]*(4\.([7-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" + fi + ;; +changequote([,]) +esac + +# FIXME: expect and dejagnu may become build tools? + +AC_CHECK_PROGS(EXPECT, expect, expect) +case " $configdirs " in + *" expect "*) + test $host = $build && EXPECT='$$r/$(HOST_SUBDIR)/expect/expect' + ;; +esac + +AC_CHECK_PROGS(RUNTEST, runtest, runtest) +case " $configdirs " in + *" dejagnu "*) + test $host = $build && RUNTEST='$$s/$(HOST_SUBDIR)/dejagnu/runtest' + ;; +esac + + +# Host tools. +NCN_STRICT_CHECK_TOOLS(AR, ar) +NCN_STRICT_CHECK_TOOLS(AS, as) +NCN_STRICT_CHECK_TOOLS(DLLTOOL, dlltool) +NCN_STRICT_CHECK_TOOLS(LD, ld) +NCN_STRICT_CHECK_TOOLS(LIPO, lipo) +NCN_STRICT_CHECK_TOOLS(NM, nm) +NCN_STRICT_CHECK_TOOLS(RANLIB, ranlib, true) +NCN_STRICT_CHECK_TOOLS(STRIP, strip, true) +NCN_STRICT_CHECK_TOOLS(WINDRES, windres) +NCN_STRICT_CHECK_TOOLS(WINDMC, windmc) +NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy) +NCN_STRICT_CHECK_TOOLS(OBJDUMP, objdump) +NCN_STRICT_CHECK_TOOLS(READELF, readelf) +AC_SUBST(CC) +AC_SUBST(CXX) +AC_SUBST(CFLAGS) +AC_SUBST(CXXFLAGS) + +GCC_PLUGIN_OPTION(PLUGIN_OPTION) +AR_PLUGIN_OPTION= +RANLIB_PLUGIN_OPTION= +if test -n "$PLUGIN_OPTION"; then + if $AR --help 2>&1 | grep -q "\--plugin"; then + AR_PLUGIN_OPTION="$PLUGIN_OPTION" + fi + if $RANLIB --help 2>&1 | grep -q "\--plugin"; then + RANLIB_PLUGIN_OPTION="$PLUGIN_OPTION" + fi +fi +AC_SUBST(AR_PLUGIN_OPTION) +AC_SUBST(RANLIB_PLUGIN_OPTION) + +# Target tools. +AC_ARG_WITH([build-time-tools], + [AS_HELP_STRING([--with-build-time-tools=PATH], + [use given path to find target tools during the build])], + [case x"$withval" in + x/*) ;; + *) + with_build_time_tools= + AC_MSG_WARN([argument to --with-build-time-tools must be an absolute path]) + ;; + esac], + [with_build_time_tools=]) + +NCN_STRICT_CHECK_TARGET_TOOLS(CC_FOR_TARGET, cc gcc) +NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TARGET, c++ g++ cxx gxx) +NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET}) +NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj) +NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran) +NCN_STRICT_CHECK_TARGET_TOOLS(GOC_FOR_TARGET, gccgo) + +ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar) +ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as) +ACX_CHECK_INSTALLED_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool) +ACX_CHECK_INSTALLED_TARGET_TOOL(LD_FOR_TARGET, ld) +ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo) +ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm) +ACX_CHECK_INSTALLED_TARGET_TOOL(OBJCOPY_FOR_TARGET, objcopy) +ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump) +ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib) +ACX_CHECK_INSTALLED_TARGET_TOOL(READELF_FOR_TARGET, readelf) +ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip) +ACX_CHECK_INSTALLED_TARGET_TOOL(WINDRES_FOR_TARGET, windres) +ACX_CHECK_INSTALLED_TARGET_TOOL(WINDMC_FOR_TARGET, windmc) + +RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET" + +GCC_TARGET_TOOL(ar, AR_FOR_TARGET, AR, [binutils/ar]) +GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new]) +GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/]) +dnl see comments for CXX_FOR_TARGET_FLAG_TO_PASS +GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX, + [gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs], + c++) +GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX, + [gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs], + c++) +GCC_TARGET_TOOL(dlltool, DLLTOOL_FOR_TARGET, DLLTOOL, [binutils/dlltool]) +GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/]) +GCC_TARGET_TOOL(gcj, GCJ_FOR_TARGET, GCJ, + [gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/], java) +GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_TARGET, GFORTRAN, + [gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran) +GCC_TARGET_TOOL(gccgo, GOC_FOR_TARGET, GOC, + [gcc/gccgo -B$$r/$(HOST_SUBDIR)/gcc/], go) +GCC_TARGET_TOOL(ld, LD_FOR_TARGET, LD, [ld/ld-new]) +GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO) +GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new]) +GCC_TARGET_TOOL(objcopy, OBJCOPY_FOR_TARGET, OBJCOPY, [binutils/objcopy]) +GCC_TARGET_TOOL(objdump, OBJDUMP_FOR_TARGET, OBJDUMP, [binutils/objdump]) +GCC_TARGET_TOOL(ranlib, RANLIB_FOR_TARGET, RANLIB, [binutils/ranlib]) +GCC_TARGET_TOOL(readelf, READELF_FOR_TARGET, READELF, [binutils/readelf]) +GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip-new]) +GCC_TARGET_TOOL(windres, WINDRES_FOR_TARGET, WINDRES, [binutils/windres]) +GCC_TARGET_TOOL(windmc, WINDMC_FOR_TARGET, WINDMC, [binutils/windmc]) + +AC_SUBST(FLAGS_FOR_TARGET) +AC_SUBST(RAW_CXX_FOR_TARGET) + +# Certain tools may need extra flags. +AR_FOR_TARGET=${AR_FOR_TARGET}${extra_arflags_for_target} +RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target} +NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target} + +# When building target libraries, except in a Canadian cross, we use +# the same toolchain as the compiler we just built. +COMPILER_AS_FOR_TARGET='$(AS_FOR_TARGET)' +COMPILER_LD_FOR_TARGET='$(LD_FOR_TARGET)' +COMPILER_NM_FOR_TARGET='$(NM_FOR_TARGET)' +if test $host = $build; then + case " $configdirs " in + *" gcc "*) + COMPILER_AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/as' + COMPILER_LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/collect-ld' + COMPILER_NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/nm'${extra_nmflags_for_target} + ;; + esac +fi + +AC_SUBST(COMPILER_AS_FOR_TARGET) +AC_SUBST(COMPILER_LD_FOR_TARGET) +AC_SUBST(COMPILER_NM_FOR_TARGET) + +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) +AC_ARG_ENABLE(maintainer-mode, +[AS_HELP_STRING([--enable-maintainer-mode], + [enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) +AC_MSG_RESULT($USE_MAINTAINER_MODE) +AC_SUBST(MAINTAINER_MODE_TRUE) +AC_SUBST(MAINTAINER_MODE_FALSE) +if test "$USE_MAINTAINER_MODE" = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' +else + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= +fi +MAINT=$MAINTAINER_MODE_TRUE +AC_SUBST(MAINT)dnl + +# --------------------- +# GCC bootstrap support +# --------------------- + +# Stage specific cflags for build. +stage1_cflags="-g" +case $build in + vax-*-*) + case ${GCC} in + yes) stage1_cflags="-g -Wa,-J" ;; + *) stage1_cflags="-g -J" ;; + esac ;; +esac + +AC_SUBST(stage1_cflags) + +# Enable --enable-checking in stage1 of the compiler. +AC_ARG_ENABLE(stage1-checking, +[AS_HELP_STRING([[--enable-stage1-checking[=all]]], + [choose additional checking for stage1 of the compiler])], +[stage1_checking=--enable-checking=${enable_stage1_checking}], +[if test "x$enable_checking" = xno || test "x$enable_checking" = x; then + # For --disable-checking or implicit --enable-checking=release, avoid + # setting --enable-checking=gc in the default stage1 checking for LTO + # bootstraps. See PR62077. + case $BUILD_CONFIG in + *lto*) + stage1_checking=--enable-checking=release,misc,gimple,rtlflag,tree,types;; + *) + stage1_checking=--enable-checking=yes,types;; + esac + if test "x$enable_checking" = x && \ + test -d ${srcdir}/gcc && \ + test x"`cat ${srcdir}/gcc/DEV-PHASE`" = xexperimental; then + stage1_checking=--enable-checking=yes,types,extra + fi +else + stage1_checking=--enable-checking=$enable_checking,types +fi]) +AC_SUBST(stage1_checking) + +# Enable -Werror in bootstrap stage2 and later. +AC_ARG_ENABLE(werror, +[AS_HELP_STRING([--enable-werror], + [enable -Werror in bootstrap stage2 and later])], [], +[if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then + enable_werror=yes +else + enable_werror=no +fi]) +case ${enable_werror} in + yes) stage2_werror_flag="--enable-werror-always" ;; + *) stage2_werror_flag="" ;; +esac +AC_SUBST(stage2_werror_flag) + +# Enable --enable-host-shared. +AC_ARG_ENABLE(host-shared, +[AS_HELP_STRING([--enable-host-shared], + [build host code as shared libraries])], +[host_shared=$enableval], [host_shared=no]) +AC_SUBST(host_shared) + +# PR jit/64780: Require the user to explicitly specify +# --enable-host-shared if the jit is enabled, hinting +# that they might want to do a separate configure/build of +# the jit, to avoid users from slowing down the rest of the +# compiler by enabling the jit. +if test ${host_shared} = "no" ; then + case "${enable_languages}" in + *jit*) + AC_MSG_ERROR([ +Enabling language "jit" requires --enable-host-shared. + +--enable-host-shared typically slows the rest of the compiler down by +a few %, so you must explicitly enable it. + +If you want to build both the jit and the regular compiler, it is often +best to do this via two separate configure/builds, in separate +directories, to avoid imposing the performance cost of +--enable-host-shared on the regular compiler.]) + ;; + *) + ;; + esac +fi + +# Specify what files to not compare during bootstrap. + +compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*" +case "$target" in + hppa*64*-*-hpux*) ;; + hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;; + powerpc*-ibm-aix*) compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/* | *libgomp*\$(objext)" ;; +esac +AC_SUBST(compare_exclusions) + +AC_CONFIG_FILES([Makefile], + [sed "$extrasub_build" Makefile | + sed "$extrasub_host" | + sed "$extrasub_target" > mf$$ + mv -f mf$$ Makefile], + [extrasub_build="$extrasub_build" + extrasub_host="$extrasub_host" + extrasub_target="$extrasub_target"]) +AC_OUTPUT + diff --git a/toolchain/newlib/port/newlib/libc/sys/dailyrun/syscalls.c b/toolchain/newlib/port/newlib/libc/sys/dailyrun/syscalls.c index 7846d5b9..e38e03b5 100644 --- a/toolchain/newlib/port/newlib/libc/sys/dailyrun/syscalls.c +++ b/toolchain/newlib/port/newlib/libc/sys/dailyrun/syscalls.c @@ -1,5 +1,15 @@ #include +/* + * NOTE: I'm not able to access our definition of standard headers inside + * /usr/lib/dailyrun/include even when inserting it in first place + * inside in FLAGS_FOR_TARGET. + * + * Use this small trick to be able to access them until we come up + * with a proper fix (if possible). + */ +#include + #include #include #include From 25fac099d7eae158badfe95e14c7d47de9e639b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20DUBOIN?= Date: Tue, 10 Mar 2026 00:11:05 +0100 Subject: [PATCH 09/10] toolchain/newlib: configure to use our own POSIX signal implementation Also implement BSD's killpg() which is defined but not implemented by newlib. --- root/usr/lib/dailyrun/include/sys/signal.h | 3 ++ toolchain/newlib/port/newlib/configure.host | 1 + .../newlib/libc/sys/dailyrun/Makefile.inc | 1 + .../port/newlib/libc/sys/dailyrun/crt0.c | 32 +++++++++++++ .../port/newlib/libc/sys/dailyrun/killpg.c | 7 +++ .../port/newlib/libc/sys/dailyrun/syscalls.c | 45 +++++++++++++++++++ 6 files changed, 89 insertions(+) create mode 100644 toolchain/newlib/port/newlib/libc/sys/dailyrun/killpg.c diff --git a/root/usr/lib/dailyrun/include/sys/signal.h b/root/usr/lib/dailyrun/include/sys/signal.h index 2c73bc4e..59dc07e2 100644 --- a/root/usr/lib/dailyrun/include/sys/signal.h +++ b/root/usr/lib/dailyrun/include/sys/signal.h @@ -9,3 +9,6 @@ typedef void (*sig_sa_sigaction_t)(int, siginfo_t *, void *); #ifdef __i686__ #include #endif + +int sigsethandler(sig_sa_sigaction_t); +int sigreturn(ucontext_t *); diff --git a/toolchain/newlib/port/newlib/configure.host b/toolchain/newlib/port/newlib/configure.host index dceb3d6f..06e3a9d8 100644 --- a/toolchain/newlib/port/newlib/configure.host +++ b/toolchain/newlib/port/newlib/configure.host @@ -614,6 +614,7 @@ case "${host}" in ;; *-*-dailyrun*) syscall_dir=syscalls + newlib_cflags="${newlib_cflags} -DSIGNAL_PROVIDED" ;; # RTEMS supplies its own versions of some routines: # malloc() (reentrant version) diff --git a/toolchain/newlib/port/newlib/libc/sys/dailyrun/Makefile.inc b/toolchain/newlib/port/newlib/libc/sys/dailyrun/Makefile.inc index ced87446..9497b1b3 100644 --- a/toolchain/newlib/port/newlib/libc/sys/dailyrun/Makefile.inc +++ b/toolchain/newlib/port/newlib/libc/sys/dailyrun/Makefile.inc @@ -1,2 +1,3 @@ libc_a_SOURCES += %D%/syscalls.c libc_a_SOURCES += %D%/isatty.c +libc_a_SOURCES += %D%/killpg.c diff --git a/toolchain/newlib/port/newlib/libc/sys/dailyrun/crt0.c b/toolchain/newlib/port/newlib/libc/sys/dailyrun/crt0.c index 6f3baea4..3c787624 100644 --- a/toolchain/newlib/port/newlib/libc/sys/dailyrun/crt0.c +++ b/toolchain/newlib/port/newlib/libc/sys/dailyrun/crt0.c @@ -1,3 +1,8 @@ +#include + +#include +#include +#include #include extern int main(int argc, char **argv, char **envp); @@ -5,6 +10,24 @@ extern int main(int argc, char **argv, char **envp); extern char _edata; extern char _end; +/* + * Signal handler trampoline. + * + * This function calls the actual signal handler and makes sure + * the process exits from the signal correctly. + * + * Must be installed using sigsethandler() first before installing + * custom signal handlers. + */ +static void handle_signal(int signal, siginfo_t *info, void *data) +{ + ucontext_t *ucontext = data; + sig_sa_sigaction_t handler = ucontext->sa_handler; + + handler(signal, info, ucontext); + sigreturn(ucontext); +} + void _start(int argc, char **argv, char **envp) { char *bss; @@ -15,6 +38,15 @@ void _start(int argc, char **argv, char **envp) while (bss < &_end) *bss++ = 0; + /* Install signal handler trampoline. */ + ret = sigsethandler(handle_signal); + if (ret) { + fprintf(stdout, "crt0: sigsethandler failed: %s\n", strerror(errno)); + goto out; + } + ret = main(argc, argv, envp); + +out: _exit(ret); } diff --git a/toolchain/newlib/port/newlib/libc/sys/dailyrun/killpg.c b/toolchain/newlib/port/newlib/libc/sys/dailyrun/killpg.c new file mode 100644 index 00000000..18db3bad --- /dev/null +++ b/toolchain/newlib/port/newlib/libc/sys/dailyrun/killpg.c @@ -0,0 +1,7 @@ +#include +#include + +int killpg(pid_t pid, int signal) +{ + return kill(-pid, signal); +} diff --git a/toolchain/newlib/port/newlib/libc/sys/dailyrun/syscalls.c b/toolchain/newlib/port/newlib/libc/sys/dailyrun/syscalls.c index e38e03b5..a6cc0467 100644 --- a/toolchain/newlib/port/newlib/libc/sys/dailyrun/syscalls.c +++ b/toolchain/newlib/port/newlib/libc/sys/dailyrun/syscalls.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -85,6 +86,24 @@ char **environ; /* pointer to array of char * strings that define the current return ret; \ } +#define DEFINE_SYSCALL_4_default(_ret_type, _syscall, _nr, _type1, _type2, \ + _type3, _type4, ...) \ + _ret_type _##_syscall(_type1 arg1, _type2 arg2, _type3 arg3, _type4 arg4, \ + ##__VA_ARGS__) \ + { \ + _ret_type ret; \ + __asm__ volatile("int $0x80" \ + : "=a"(ret) \ + : "a"(_nr), "b"(arg1), "c"(arg2), "d"(arg3), \ + "S"(arg4) \ + : "memory"); \ + if (ret < 0) { \ + errno = (int)ret; \ + ret = (_ret_type) - 1; \ + } \ + return ret; \ + } + /* * Noreturn syscalls (exit) */ @@ -113,6 +132,32 @@ pid_t _wait(int *status) return _waitpid(-1, status, 0); } +/* + * signal() should not be used for anything else than setting the handler + * to SIGDFL or SIGIGN. For other values follow the BSD semantics: the signal + * is masked until delivered and handler (also the same as glibc). + */ +sig_sa_handler_t signal(int signo, sig_sa_handler_t handler) +{ + struct sigaction sigaction = { + .sa_handler = handler, + .sa_flags = 0, + }; + + sigemptyset(&sigaction.sa_mask); + sigaddset(&sigaction.sa_mask, signo); + + if (_sigaction(signo, &sigaction, &sigaction) < 0) + return SIG_ERR; + + return sigaction.sa_handler; +} + +#define alias(f) __attribute__((__alias__(f))) + +int sigreturn(ucontext_t *ucontext) alias("_sigreturn"); +int sigsethandler(sig_sa_sigaction_t handler) alias("_sigsethandler"); + /* * Unimplemented syscalls */ From 6c6d54b417e591ace0cd5fee90cfca59ecd35449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20DUBOIN?= Date: Thu, 12 Mar 2026 11:24:40 +0100 Subject: [PATCH 10/10] sys/process: send SIGCHLD to parent on exit --- include/kernel/process.h | 13 ++++++ kernel/sys/process.c | 48 ++++++++++++++++++++-- kernel/sys/signal.c | 16 ++++++++ root/usr/lib/dailyrun/include/sys/signal.h | 2 + 4 files changed, 75 insertions(+), 4 deletions(-) diff --git a/include/kernel/process.h b/include/kernel/process.h index c157fe7f..f5965446 100644 --- a/include/kernel/process.h +++ b/include/kernel/process.h @@ -86,11 +86,14 @@ typedef enum thread_state { struct process { char name[PROCESS_NAME_MAX_LEN]; /*!< The thread's name */ pid_t pid; /*!< Process' unique ID */ + unsigned int flags; struct address_space *as; /*!< The process's address space */ + struct process *parent; llist_t threads; /*!< Linked list of the process' active threads */ llist_t children; /*!< Linked list of the process' active children */ + node_t this; /*!< Node inside the parent's list of children */ node_t this_global; /*!< Used by the global list of alive processes */ @@ -121,6 +124,16 @@ struct process { spinlock_t lock; }; +/* + * Possible values for (struct process)->flags. + */ +enum process_flags { + PROC_SA_NOCLDWAIT = BIT(0), /* Do not generate SIGCHLD when children stop */ +}; + +/* Union of all the flags that should be inherited when forking. */ +#define PROC_FLAGS_INHERITED (PROC_SA_NOCLDWAIT) + /** * @brief A single thread. * diff --git a/kernel/sys/process.c b/kernel/sys/process.c index f2d55a69..b0c7b332 100644 --- a/kernel/sys/process.c +++ b/kernel/sys/process.c @@ -198,6 +198,8 @@ static void process_collect_zombie(struct process *zombie) static void process_make_zombie(struct process *process) { struct process *child; + struct process *parent; + siginfo_t sigchld; log_info("freeing process: %s", process->name); @@ -223,19 +225,53 @@ static void process_make_zombie(struct process *process) signal_queue_flush(&process->sig_pending); address_space_destroy(process->as); - /* Attach all orphans to the init process. */ + /* + * Attach all orphans to the init process. + */ FOREACH_LLIST_ENTRY(child, &process->children, this) { locked_scope (&child->lock) { llist_add(&init_process->children, &child->this); + child->parent = init_process; } } - spinlock_release(&process->lock); + /* + * We cannot hold a reference to the process' parents so it might be in + * the process of being made into a zombie itself. Detect this case and + * move ourselves into the init process' children before sending SIGCHLD. + */ + parent = process->parent; + if (READ_ONCE(parent->state) == SCHED_ZOMBIE) { + llist_add(&init_process->children, &process->this); + parent = init_process; + } /* - * TODO: a SIGCHLD shall be sent to the parent process. + * If the parent process' ignores the SIGCHLD signal the process' lifetime + * must end immediately. This avoids dangling references to uncollectable + * zombie processes. + * + * FIXME: We should delay this a bit to make sure no one's holding + * the lock anymore. This may the source of use after free errors. + * But ... that's for another day, this will work for now. */ + if (parent->flags & PROC_SA_NOCLDWAIT) { + process_collect_zombie(process); + return; + } + + /* + * TODO: Use our own signal.h header since newlib defines almost no macro... + * We should be forwarding additional informations, such as the exit + * code and CLD_* values... + */ + memset(&sigchld, 0, sizeof(sigchld)); + sigchld.si_signo = SIGCHLD; + signal_process(parent, &sigchld); + + spinlock_release(&process->lock); + } static struct process *process_get(struct process *process) @@ -387,6 +423,8 @@ void process_init_kernel_process(void) thread_set_user_stack(&kernel_process_initial_thread, ustack); + kernel_process.flags = 0; + kernel_process.sig_set = NULL; signal_queue_init(&kernel_process.sig_pending); signal_queue_init(&kernel_process_initial_thread.sig_pending); @@ -698,6 +736,7 @@ thread_fork(struct thread *thread, thread_entry_t entrypoint, void *arg) PROCESS_NAME_MAX_LEN); address_space_copy_current(new_process->as); new_process->creds = creds_get(current->process->creds); + new_process->flags = current->process->flags & PROC_FLAGS_INHERITED; new_process->sig_set = signal_set_clone(current->process->sig_set); if (new_process->sig_set == NULL) { err = E_NOMEM; @@ -719,6 +758,7 @@ thread_fork(struct thread *thread, thread_entry_t entrypoint, void *arg) goto process_destroy; } + new_process->parent = current->process; locked_scope (¤t->process->lock) llist_add(¤t->process->children, &new_process->this); @@ -784,7 +824,7 @@ pid_t sys_getpid(void) } /* - * TODO: waitpid(): hande signals + * */ pid_t sys_waitpid(pid_t pid, int *stat_loc, int options) { diff --git a/kernel/sys/signal.c b/kernel/sys/signal.c index 914042fd..b260040f 100644 --- a/kernel/sys/signal.c +++ b/kernel/sys/signal.c @@ -122,6 +122,7 @@ static void signal_set_init(struct signal_set *set) { for (int signo = SIGNAL_MIN; signo <= SIGNAL_MAX; ++signo) set->sig_actions[signo].sa_action.sa_handler = SIG_DFL; + current->process->flags |= PROC_SA_NOCLDWAIT; } /* @@ -657,6 +658,21 @@ static error_t signal_action_configure(struct signal_set *set, int signo, *orig = *sig_action; } + /* + * Pre-compute whether children should issue a SIGCHLD signal when exiting. + * According to the spec the signal should still be generated if sa_handler + * is set to SI_IGN and SA_NOCLDWAIT is not set, but this things easier to + * understand and who cares I guess. + */ + if (signo == SIGCHLD) { + if (sa_action->sa_flags & SA_NOCLDWAIT || + sa_action->sa_handler == SIG_IGN || + sa_action->sa_handler == SIG_DFL) /* SIGCHLD: SIG_DFL == ignore */ + current->process->flags |= SA_NOCLDWAIT; + else + current->process->flags &= ~SA_NOCLDWAIT; + } + return E_SUCCESS; } diff --git a/root/usr/lib/dailyrun/include/sys/signal.h b/root/usr/lib/dailyrun/include/sys/signal.h index 59dc07e2..7023f26e 100644 --- a/root/usr/lib/dailyrun/include/sys/signal.h +++ b/root/usr/lib/dailyrun/include/sys/signal.h @@ -1,5 +1,7 @@ #include_next +#define SA_NOCLDWAIT 0x20 /* Children dont' generate SIGCHLD in _exit(). */ + /* * Signature of both signal handler functions inside struct sigaction. */