mirror of
https://github.com/hermitcore/libhermit.git
synced 2025-03-09 00:00:03 +01:00
determine default architecture via uname
This commit is contained in:
parent
2988496ef9
commit
492cde7275
72 changed files with 8 additions and 8 deletions
|
@ -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 ""
|
||||
|
|
|
@ -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 "")
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Reference in a new issue