determine default architecture via uname

2025-03-09 00:00:03 +01:00 · 2018-04-22 16:47:28 +00:00 · 2018-04-22 16:47:28 +00:00 · 492cde7275
commit 492cde7275
parent 2988496ef9
72 changed files with 8 additions and 8 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -63,8 +63,8 @@ add_subdirectory(arch/aarch64)
 list(APPEND KERNEL_OBJECTS
 	$<TARGET_OBJECTS:${AARCH64_KERNEL_C_TARGET}>)
 else()
-# add arch/x86 and its objects
-add_subdirectory(arch/x86)
+# add arch/x86_64 and its objects
+add_subdirectory(arch/x86_64)
 list(APPEND KERNEL_OBJECTS
 	$<TARGET_OBJECTS:${X86_KERNEL_ASM_TARGET}>
 	$<TARGET_OBJECTS:${X86_KERNEL_C_TARGET}>)
@ -154,7 +154,7 @@ build_external(tools ${HERMIT_ROOT}/tools "")

 if("${TARGET_ARCH}" STREQUAL "x86_64-hermit")

-build_external(arch_x86_loader ${HERMIT_ROOT}/arch/x86/loader "")
+build_external(arch_x86_loader ${HERMIT_ROOT}/arch/x86_64/loader "")

 ## Intel's OpenMP runtime for x86 (libomp)
 build_external(libiomp ${HERMIT_ROOT}/usr/libomp ""
--- a/arch/x86_64/CMakeLists.txt
+++ b/arch/x86_64/CMakeLists.txt
--- a/arch/x86_64/include/asm/apic.h
+++ b/arch/x86_64/include/asm/apic.h
--- a/arch/x86_64/include/asm/atomic.h
+++ b/arch/x86_64/include/asm/atomic.h
--- a/arch/x86_64/include/asm/atomic32.h
+++ b/arch/x86_64/include/asm/atomic32.h
--- a/arch/x86_64/include/asm/atomic64.h
+++ b/arch/x86_64/include/asm/atomic64.h
--- a/arch/x86_64/include/asm/gdt.h
+++ b/arch/x86_64/include/asm/gdt.h
--- a/arch/x86_64/include/asm/idt.h
+++ b/arch/x86_64/include/asm/idt.h
--- a/arch/x86_64/include/asm/io.h
+++ b/arch/x86_64/include/asm/io.h
--- a/arch/x86_64/include/asm/irq.h
+++ b/arch/x86_64/include/asm/irq.h
--- a/arch/x86_64/include/asm/irqflags.h
+++ b/arch/x86_64/include/asm/irqflags.h
--- a/arch/x86_64/include/asm/isrs.h
+++ b/arch/x86_64/include/asm/isrs.h
--- a/arch/x86_64/include/asm/limits.h
+++ b/arch/x86_64/include/asm/limits.h
--- a/arch/x86_64/include/asm/multiboot.h
+++ b/arch/x86_64/include/asm/multiboot.h
--- a/arch/x86_64/include/asm/page.h
+++ b/arch/x86_64/include/asm/page.h
--- a/arch/x86_64/include/asm/pci.h
+++ b/arch/x86_64/include/asm/pci.h
--- a/arch/x86_64/include/asm/processor.h
+++ b/arch/x86_64/include/asm/processor.h
--- a/arch/x86_64/include/asm/stddef.h
+++ b/arch/x86_64/include/asm/stddef.h
--- a/arch/x86_64/include/asm/string.h
+++ b/arch/x86_64/include/asm/string.h
--- a/arch/x86_64/include/asm/tasks.h
+++ b/arch/x86_64/include/asm/tasks.h
--- a/arch/x86_64/include/asm/tasks_types.h
+++ b/arch/x86_64/include/asm/tasks_types.h
--- a/arch/x86_64/include/asm/time.h
+++ b/arch/x86_64/include/asm/time.h
--- a/arch/x86_64/include/asm/tss.h
+++ b/arch/x86_64/include/asm/tss.h
--- a/arch/x86_64/include/asm/uart.h
+++ b/arch/x86_64/include/asm/uart.h
--- a/arch/x86_64/include/asm/uhyve.h
+++ b/arch/x86_64/include/asm/uhyve.h
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
--- a/arch/x86_64/kernel/boot.asm
+++ b/arch/x86_64/kernel/boot.asm
--- a/arch/x86_64/kernel/entry.asm
+++ b/arch/x86_64/kernel/entry.asm
--- a/arch/x86_64/kernel/gdt.c
+++ b/arch/x86_64/kernel/gdt.c
--- a/arch/x86_64/kernel/idt.c
+++ b/arch/x86_64/kernel/idt.c
--- a/arch/x86_64/kernel/irq.c
+++ b/arch/x86_64/kernel/irq.c
--- a/arch/x86_64/kernel/isrs.c
+++ b/arch/x86_64/kernel/isrs.c
--- a/arch/x86_64/kernel/pci.c
+++ b/arch/x86_64/kernel/pci.c
--- a/arch/x86_64/kernel/pcihdr.h
+++ b/arch/x86_64/kernel/pcihdr.h
--- a/arch/x86_64/kernel/processor.c
+++ b/arch/x86_64/kernel/processor.c
--- a/arch/x86_64/kernel/signal.c
+++ b/arch/x86_64/kernel/signal.c
--- a/arch/x86_64/kernel/syscall.c
+++ b/arch/x86_64/kernel/syscall.c
--- a/arch/x86_64/kernel/tasks.c
+++ b/arch/x86_64/kernel/tasks.c
--- a/arch/x86_64/kernel/timer.c
+++ b/arch/x86_64/kernel/timer.c
--- a/arch/x86_64/kernel/uart.c
+++ b/arch/x86_64/kernel/uart.c
--- a/arch/x86_64/libkern/string.asm
+++ b/arch/x86_64/libkern/string.asm
--- a/arch/x86_64/loader/CMakeLists.txt
+++ b/arch/x86_64/loader/CMakeLists.txt
--- a/arch/x86_64/loader/entry.asm
+++ b/arch/x86_64/loader/entry.asm
--- a/arch/x86_64/loader/include/ctype.h
+++ b/arch/x86_64/loader/include/ctype.h
--- a/arch/x86_64/loader/include/elf.h
+++ b/arch/x86_64/loader/include/elf.h
--- a/arch/x86_64/loader/include/io.h
+++ b/arch/x86_64/loader/include/io.h
--- a/arch/x86_64/loader/include/limits.h
+++ b/arch/x86_64/loader/include/limits.h
--- a/arch/x86_64/loader/include/multiboot.h
+++ b/arch/x86_64/loader/include/multiboot.h
--- a/arch/x86_64/loader/include/page.h
+++ b/arch/x86_64/loader/include/page.h
--- a/arch/x86_64/loader/include/stdarg.h
+++ b/arch/x86_64/loader/include/stdarg.h
--- a/arch/x86_64/loader/include/stddef.h
+++ b/arch/x86_64/loader/include/stddef.h
--- a/arch/x86_64/loader/include/stdio.h
+++ b/arch/x86_64/loader/include/stdio.h
--- a/arch/x86_64/loader/include/string.h
+++ b/arch/x86_64/loader/include/string.h
--- a/arch/x86_64/loader/include/uart.h
+++ b/arch/x86_64/loader/include/uart.h
--- a/arch/x86_64/loader/link.ld
+++ b/arch/x86_64/loader/link.ld
--- a/arch/x86_64/loader/main.c
+++ b/arch/x86_64/loader/main.c
--- a/arch/x86_64/loader/page.c
+++ b/arch/x86_64/loader/page.c
--- a/arch/x86_64/loader/printf.c
+++ b/arch/x86_64/loader/printf.c
--- a/arch/x86_64/loader/stdio.c
+++ b/arch/x86_64/loader/stdio.c
--- a/arch/x86_64/loader/string.c
+++ b/arch/x86_64/loader/string.c
--- a/arch/x86_64/loader/strstr.c
+++ b/arch/x86_64/loader/strstr.c
--- a/arch/x86_64/loader/strtol.c
+++ b/arch/x86_64/loader/strtol.c
--- a/arch/x86_64/loader/uart.c
+++ b/arch/x86_64/loader/uart.c
--- a/arch/x86_64/mm/hbmemory.c
+++ b/arch/x86_64/mm/hbmemory.c
--- a/arch/x86_64/mm/memory.c
+++ b/arch/x86_64/mm/memory.c
--- a/arch/x86_64/mm/page.c
+++ b/arch/x86_64/mm/page.c
--- a/arch/x86_64/mm/vma.c
+++ b/arch/x86_64/mm/vma.c
--- a/cmake/HermitCore-Toolchain-x86_64-bootstrap.cmake
+++ b/cmake/HermitCore-Toolchain-x86_64-bootstrap.cmake
@ -1,4 +1,4 @@
-include(${CMAKE_CURRENT_LIST_DIR}/HermitCore-Toolchain-x86.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/HermitCore-Toolchain-x86_64.cmake)
 include_guard()

 set(CMAKE_C_COMPILER_WORKS 1 CACHE INTERNAL "")
--- a/cmake/HermitCore-Toolchain-x86_64.cmake
+++ b/cmake/HermitCore-Toolchain-x86_64.cmake
--- a/cmake/HermitCore.cmake
+++ b/cmake/HermitCore.cmake
@ -8,7 +8,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/HermitCore-Configuration.cmake)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/golang/)

 if(NOT HERMIT_ARCH)
-	set(HERMIT_ARCH x86)
+	execute_process(COMMAND uname -m OUTPUT_VARIABLE HERMIT_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif()

 if(PROFILING)
@ -35,7 +35,7 @@ if(NOT CMAKE_TOOLCHAIN_FILE)
 endif()

 # NASM is only required on x86_64
-if("${HERMIT_ARCH}" STREQUAL "x86")
+if("${HERMIT_ARCH}" STREQUAL "x86_64")
 # NASM detection will change binary format depending on host system, but
 # we only want to generate elf64 for HermitCore
 # Note: Has to be set *before* ASM_NASM is enabled
--- a/cmake/README.md
+++ b/cmake/README.md
@ -31,7 +31,7 @@ cmake/
 ├── HermitCore-Application.cmake
 ├── HermitCore.cmake
 ├── HermitCore-Paths.cmake
-├── HermitCore-Toolchain-x86.cmake
+├── HermitCore-Toolchain-x86_64.cmake
 ├── HermitCore-Utils.cmake
 ├── local-cmake.sh
 └── README.md
--- a/tools/proxy.c
+++ b/tools/proxy.c
@ -74,7 +74,7 @@ typedef enum {

 bool verbose = false;

-static monitor_t monitor = BAREMETAL;
+static monitor_t monitor = UHYVE;
 static int sobufsize = 131072;
 static unsigned int isle_nr = 0;
 static unsigned int port = HERMIT_PORT;