this repo has no description
Merge branch 'master' of github.com:darlinghq/darling
+16
-3
+8
-2
CMakeLists.txt
+8
-2
CMakeLists.txt
···
3
3
4
4
# This allows setting the compiler with -DCMAKE_C_COMPILER when configuring.
5
5
if (NOT DEFINED CMAKE_C_COMPILER)
6
-
SET(CMAKE_C_COMPILER clang)
6
+
find_program(CMAKE_C_COMPILER NAMES
7
+
"clang"
8
+
"clang-4.0"
9
+
"clang-7")
7
10
endif(NOT DEFINED CMAKE_C_COMPILER)
8
11
9
12
if (NOT DEFINED CMAKE_CXX_COMPILER)
10
-
SET(CMAKE_CXX_COMPILER clang++)
13
+
find_program(CMAKE_CXX_COMPILER NAMES
14
+
"clang++"
15
+
"clang++-4.0"
16
+
"clang++-7")
11
17
endif(NOT DEFINED CMAKE_CXX_COMPILER)
12
18
13
19
SET(CMAKE_SKIP_RPATH TRUE)
+1
-1
src/CMakeLists.txt
+1
-1
src/CMakeLists.txt
···
41
41
include(compiler_include)
42
42
GetCompilerInclude(COMPILER_INC_PATH)
43
43
message(STATUS "Compiler include path detected as ${COMPILER_INC_PATH}")
44
-
include_directories(${COMPILER_INC_PATH})
44
+
include_directories(/usr/..${COMPILER_INC_PATH})
45
45
46
46
find_package(BISON)
47
47
find_package(FLEX)
+7
src/kernel/libsyscall/os/tsd.h
+7
src/kernel/libsyscall/os/tsd.h
···
54
54
#if defined(__has_attribute)
55
55
#if __has_attribute(address_space)
56
56
#define OS_GS_RELATIVE __attribute__((address_space(256)))
57
+
58
+
// On Darling, i386 uses %fs instead of %gs for TLS.
59
+
#if defined(DARLING) && defined(__i386__) && !defined(__x86_64__)
60
+
#undef OS_GS_RELATIVE
61
+
#define OS_GS_RELATIVE __attribute__((address_space(257)))
62
+
#endif
63
+
57
64
#endif
58
65
#endif
59
66