[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] Do not include seg.c when building for x86_64
|
From: |
Samuel Thibault |
|
Subject: |
Re: [PATCH] Do not include seg.c when building for x86_64 |
|
Date: |
Thu, 26 Jan 2023 01:59:56 +0100 |
|
User-agent: |
NeoMutt/20170609 (1.8.3) |
Applied, thanks!
Flavio Cruz, le mer. 25 janv. 2023 02:16:10 -0500, a ecrit:
> File was removed in a previous patch for i386.
>
> To avoid future problems, include some common files between i386 and
> x86_64 in i386/Makefrag_x86.am. It is also easier to see what is different and
> what lacks support for x86_64 (e.g., SMP).
> ---
> Makefrag.am | 7 ++++
> i386/Makefrag.am | 69 ++-----------------------------------
> i386/Makefrag_x86.am | 82 ++++++++++++++++++++++++++++++++++++++++++++
> x86_64/Makefrag.am | 68 +-----------------------------------
> 4 files changed, 92 insertions(+), 134 deletions(-)
> create mode 100644 i386/Makefrag_x86.am
>
> diff --git a/Makefrag.am b/Makefrag.am
> index bdf61246..128f7911 100644
> --- a/Makefrag.am
> +++ b/Makefrag.am
> @@ -603,6 +603,13 @@ endif
> # Architecture specific parts.
> #
>
> +if HOST_ix86
> +include i386/Makefrag_x86.am
> +endif
> +if HOST_x86_64
> +include i386/Makefrag_x86.am
> +endif
> +
> # ix86.
> include i386/Makefrag.am
>
> diff --git a/i386/Makefrag.am b/i386/Makefrag.am
> index 0d9b084d..68460c49 100644
> --- a/i386/Makefrag.am
> +++ b/i386/Makefrag.am
> @@ -89,78 +89,13 @@ endif
> #
>
> libkernel_a_SOURCES += \
> - i386/i386/ast.h \
> - i386/i386/ast_check.c \
> - i386/i386/ast_types.h \
> - i386/i386/cpu.h \
> - i386/i386/cpu_number.h \
> i386/i386/cswitch.S \
> - i386/i386/db_disasm.c \
> - i386/i386/db_interface.c \
> - i386/i386/db_interface.h \
> - i386/i386/db_machdep.h \
> - i386/i386/db_trace.c \
> - i386/i386/db_trace.h \
> - i386/i386/debug.h \
> - i386/i386/debug_i386.c \
> i386/i386/debug_trace.S \
> - i386/i386/eflags.h \
> - i386/i386/fpu.c \
> - i386/i386/fpu.h \
> - i386/i386/gdt.c \
> - i386/i386/gdt.h \
> - i386/i386/idt-gen.h \
> - i386/i386/idt.c \
> i386/i386/idt_inittab.S \
> - i386/i386/io_perm.c \
> - i386/i386/io_perm.h \
> - i386/i386/ipl.h \
> - i386/i386/ktss.c \
> - i386/i386/ktss.h \
> - i386/i386/kttd_interface.c \
> - i386/i386/kttd_machdep.h \
> - i386/i386/ldt.c \
> - i386/i386/ldt.h \
> - i386/i386/lock.h \
> i386/i386/locore.S \
> - i386/i386/locore.h \
> - i386/i386/loose_ends.c \
> - i386/i386/loose_ends.h \
> - i386/i386/mach_param.h \
> - i386/i386/machine_routines.h \
> - i386/i386/machine_task.c \
> - i386/i386/machspl.h \
> - i386/i386/model_dep.h \
> - i386/i386/mp_desc.c \
> - i386/i386/mp_desc.h \
> - i386/i386/pcb.c \
> - i386/i386/pcb.h \
> - i386/i386/phys.c \
> - i386/i386/pio.h \
> - i386/i386/pmap.h \
> - i386/i386/proc_reg.h \
> - i386/i386/sched_param.h \
> - i386/i386/seg.h \
> - i386/i386/setjmp.h \
> - i386/i386/smp.h \
> - i386/i386/smp.c \
> i386/i386/spl.S \
> - i386/i386/spl.h \
> - i386/i386/strings.c \
> - i386/i386/task.h \
> - i386/i386/thread.h \
> - i386/i386/time_stamp.h \
> - i386/i386/trap.c \
> - i386/i386/trap.h \
> - i386/i386/tss.h \
> - i386/i386/user_ldt.c \
> - i386/i386/user_ldt.h \
> - i386/i386/vm_param.h \
> - i386/i386/xpr.h \
> - i386/intel/pmap.c \
> - i386/intel/pmap.h \
> - i386/intel/read_fault.c \
> - i386/intel/read_fault.h
> + i386/i386/smp.h
> + i386/i386/smp.c
>
> if PLATFORM_at
> libkernel_a_SOURCES += \
> diff --git a/i386/Makefrag_x86.am b/i386/Makefrag_x86.am
> new file mode 100644
> index 00000000..09beef0e
> --- /dev/null
> +++ b/i386/Makefrag_x86.am
> @@ -0,0 +1,82 @@
> +# Copyright (C) 2023 Free Software Foundation, Inc.
> +
> +# Permission to use, copy, modify and distribute this software and its
> +# documentation is hereby granted, provided that both the copyright
> +# notice and this permission notice appear in all copies of the
> +# software, derivative works or modified versions, and any portions
> +# thereof, and that both notices appear in supporting documentation.
> +#
> +# THE FREE SOFTWARE FOUNDATION ALLOWS FREE USE OF THIS SOFTWARE IN ITS
> +# "AS IS" CONDITION. THE FREE SOFTWARE FOUNDATION DISCLAIMS ANY
> +# LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
> +# USE OF THIS SOFTWARE.
> +
> +# Shared files for all x86.
> +
> +libkernel_a_SOURCES += \
> + i386/i386/ast.h \
> + i386/i386/ast_check.c \
> + i386/i386/ast_types.h \
> + i386/i386/cpu.h \
> + i386/i386/cpu_number.h \
> + i386/i386/db_disasm.c \
> + i386/i386/db_interface.c \
> + i386/i386/db_interface.h \
> + i386/i386/db_machdep.h \
> + i386/i386/db_trace.c \
> + i386/i386/db_trace.h \
> + i386/i386/debug.h \
> + i386/i386/debug_i386.c \
> + i386/i386/eflags.h \
> + i386/i386/fpu.c \
> + i386/i386/fpu.h \
> + i386/i386/gdt.c \
> + i386/i386/gdt.h \
> + i386/i386/idt-gen.h \
> + i386/i386/idt.c \
> + i386/i386/io_perm.c \
> + i386/i386/io_perm.h \
> + i386/i386/ipl.h \
> + i386/i386/ktss.c \
> + i386/i386/ktss.h \
> + i386/i386/kttd_interface.c \
> + i386/i386/kttd_machdep.h \
> + i386/i386/ldt.c \
> + i386/i386/ldt.h \
> + i386/i386/lock.h \
> + i386/i386/locore.h \
> + i386/i386/loose_ends.c \
> + i386/i386/loose_ends.h \
> + i386/i386/mach_param.h \
> + i386/i386/machine_routines.h \
> + i386/i386/machine_task.c \
> + i386/i386/machspl.h \
> + i386/i386/model_dep.h \
> + i386/i386/mp_desc.c \
> + i386/i386/mp_desc.h \
> + i386/i386/pcb.c \
> + i386/i386/pcb.h \
> + i386/i386/phys.c \
> + i386/i386/pio.h \
> + i386/i386/pmap.h \
> + i386/i386/proc_reg.h \
> + i386/i386/sched_param.h \
> + i386/i386/seg.h \
> + i386/i386/setjmp.h \
> + i386/i386/spl.h \
> + i386/i386/strings.c \
> + i386/i386/task.h \
> + i386/i386/thread.h \
> + i386/i386/time_stamp.h \
> + i386/i386/trap.c \
> + i386/i386/trap.h \
> + i386/i386/tss.h \
> + i386/i386/user_ldt.c \
> + i386/i386/user_ldt.h \
> + i386/i386/vm_param.h \
> + i386/i386/xpr.h \
> + i386/intel/pmap.c \
> + i386/intel/pmap.h \
> + i386/intel/read_fault.c \
> + i386/intel/read_fault.h
> +
> diff --git a/x86_64/Makefrag.am b/x86_64/Makefrag.am
> index 71491c2a..03b1eca7 100644
> --- a/x86_64/Makefrag.am
> +++ b/x86_64/Makefrag.am
> @@ -86,78 +86,12 @@ endif
> #
>
> libkernel_a_SOURCES += \
> - i386/i386/ast.h \
> - i386/i386/ast_check.c \
> - i386/i386/ast_types.h \
> - i386/i386/cpu.h \
> - i386/i386/cpu_number.h \
> x86_64/cswitch.S \
> x86_64/copy_user.c \
> - i386/i386/db_disasm.c \
> - i386/i386/db_interface.c \
> - i386/i386/db_interface.h \
> - i386/i386/db_machdep.h \
> - i386/i386/db_trace.c \
> - i386/i386/db_trace.h \
> - i386/i386/debug.h \
> - i386/i386/debug_i386.c \
> x86_64/debug_trace.S \
> - i386/i386/eflags.h \
> - i386/i386/fpu.c \
> - i386/i386/fpu.h \
> - i386/i386/gdt.c \
> - i386/i386/gdt.h \
> - i386/i386/idt-gen.h \
> - i386/i386/idt.c \
> x86_64/idt_inittab.S \
> - i386/i386/io_perm.c \
> - i386/i386/io_perm.h \
> - i386/i386/ipl.h \
> - i386/i386/ktss.c \
> - i386/i386/ktss.h \
> - i386/i386/kttd_interface.c \
> - i386/i386/kttd_machdep.h \
> - i386/i386/ldt.c \
> - i386/i386/ldt.h \
> - i386/i386/lock.h \
> x86_64/locore.S \
> - i386/i386/locore.h \
> - i386/i386/loose_ends.c \
> - i386/i386/loose_ends.h \
> - i386/i386/mach_param.h \
> - i386/i386/machine_routines.h \
> - i386/i386/machine_task.c \
> - i386/i386/machspl.h \
> - i386/i386/model_dep.h \
> - i386/i386/mp_desc.c \
> - i386/i386/mp_desc.h \
> - i386/i386/pcb.c \
> - i386/i386/pcb.h \
> - i386/i386/phys.c \
> - i386/i386/pio.h \
> - i386/i386/pmap.h \
> - i386/i386/proc_reg.h \
> - i386/i386/sched_param.h \
> - i386/i386/seg.c \
> - i386/i386/seg.h \
> - i386/i386/setjmp.h \
> - x86_64/spl.S \
> - i386/i386/spl.h \
> - i386/i386/strings.c \
> - i386/i386/task.h \
> - i386/i386/thread.h \
> - i386/i386/time_stamp.h \
> - i386/i386/trap.c \
> - i386/i386/trap.h \
> - i386/i386/tss.h \
> - i386/i386/user_ldt.c \
> - i386/i386/user_ldt.h \
> - i386/i386/vm_param.h \
> - i386/i386/xpr.h \
> - i386/intel/pmap.c \
> - i386/intel/pmap.h \
> - i386/intel/read_fault.c \
> - i386/intel/read_fault.h
> + x86_64/spl.S
>
> if PLATFORM_at
> libkernel_a_SOURCES += \
> --
> 2.39.0
>
>
--
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.