darlinghq/darling
1
0
Fork 0
mirror of https://github.com/darlinghq/darling.git synced 2025-03-01 06:06:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:darlinghq/darling

Browse Source
This commit is contained in:
Andrew Hyatt 2019-04-26 22:22:32 -04:00
commit 676c1e7957
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -3,11 +3,17 @@ SET(CMAKE_SYSTEM_PROCESSOR "x86-64")
# This allows setting the compiler with -DCMAKE_C_COMPILER when configuring.
if (NOT DEFINED CMAKE_C_COMPILER)
SET(CMAKE_C_COMPILER clang)
find_program(CMAKE_C_COMPILER NAMES
"clang"
"clang-4.0"
"clang-7")
endif(NOT DEFINED CMAKE_C_COMPILER)
if (NOT DEFINED CMAKE_CXX_COMPILER)
SET(CMAKE_CXX_COMPILER clang++)
find_program(CMAKE_CXX_COMPILER NAMES
"clang++"
"clang++-4.0"
"clang++-7")
endif(NOT DEFINED CMAKE_CXX_COMPILER)
SET(CMAKE_SKIP_RPATH TRUE)

2
src/CMakeLists.txt
View File

@ -41,7 +41,7 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
include(compiler_include)
GetCompilerInclude(COMPILER_INC_PATH)
message(STATUS "Compiler include path detected as ${COMPILER_INC_PATH}")
include_directories(${COMPILER_INC_PATH})
include_directories(/usr/..${COMPILER_INC_PATH})
find_package(BISON)
find_package(FLEX)

2
src/external/cocotron vendored

@ -1 +1 @@
Subproject commit cc89db5830d5d4203c06a1dc5fbf95ad08e8c9d9
Subproject commit 912403837ad1f1049b68130bdc8231fa06c57481

2
src/external/foundation vendored

@ -1 +1 @@
Subproject commit c631998785fbfdc17e12f8e7175b6d2b066ad1f4
Subproject commit b81799e69ba27f5bb97ab08e35f3f4c682aec9c7

2
src/external/libdispatch vendored

@ -1 +1 @@
Subproject commit 369f1785280f3bba5cb2c5c036d6aa06e32e21fe
Subproject commit 0b8c59cc650f3378817dd73ad0c6a06f8d1d05ee

7
src/kernel/libsyscall/os/tsd.h
View File

@ -54,6 +54,13 @@ _os_cpu_number(void)
#if defined(__has_attribute)
#if __has_attribute(address_space)
#define OS_GS_RELATIVE __attribute__((address_space(256)))
// On Darling, i386 uses %fs instead of %gs for TLS.
#if defined(DARLING) && defined(__i386__) && !defined(__x86_64__)
#undef OS_GS_RELATIVE
#define OS_GS_RELATIVE __attribute__((address_space(257)))
#endif
#endif
#endif