mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-07-10 05:39:27 +00:00
86 lines
4.2 KiB
Diff
86 lines
4.2 KiB
Diff
Index: llvm-toolchain-snapshot_4.0~svn280802/compiler-rt/cmake/config-ix.cmake
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_4.0~svn280802.orig/compiler-rt/cmake/config-ix.cmake
|
|
+++ llvm-toolchain-snapshot_4.0~svn280802/compiler-rt/cmake/config-ix.cmake
|
|
@@ -415,7 +415,8 @@ list_replace(COMPILER_RT_SANITIZERS_TO_B
|
|
|
|
if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
|
|
(OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD" OR
|
|
- (OS_NAME MATCHES "Windows" AND MSVC)))
|
|
+ (OS_NAME MATCHES "Windows" AND MSVC))
|
|
+ AND NOT (OS_NAME STREQUAL "kFreeBSD"))
|
|
set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
|
|
else()
|
|
set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)
|
|
Index: llvm-toolchain-snapshot_4.0~svn280802/tools/llvm-shlib/CMakeLists.txt
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_4.0~svn280802.orig/tools/llvm-shlib/CMakeLists.txt
|
|
+++ llvm-toolchain-snapshot_4.0~svn280802/tools/llvm-shlib/CMakeLists.txt
|
|
@@ -40,7 +40,7 @@ add_llvm_library(LLVM SHARED DISABLE_LLV
|
|
set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME
|
|
|
|
list(REMOVE_DUPLICATES LIB_NAMES)
|
|
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf"
|
|
+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "GNU" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "kFreeBSD") # FIXME: It should be "GNU ld for elf"
|
|
# GNU ld doesn't resolve symbols in the version script.
|
|
set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
|
|
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
|
|
Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/cmake/LLDBDependencies.cmake
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/cmake/LLDBDependencies.cmake
|
|
+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/cmake/LLDBDependencies.cmake
|
|
@@ -166,7 +166,7 @@ if (NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB )
|
|
endif()
|
|
|
|
# On FreeBSD/NetBSD backtrace() is provided by libexecinfo, not libc.
|
|
-if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "NetBSD")
|
|
+if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "NetBSD") AND NOT CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD")
|
|
list(APPEND LLDB_SYSTEM_LIBS execinfo)
|
|
endif()
|
|
|
|
Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/utilsOsType.py
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/scripts/utilsOsType.py
|
|
+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/utilsOsType.py
|
|
@@ -36,6 +36,7 @@ if sys.version_info.major >= 3:
|
|
Linux = 3
|
|
NetBSD = 4
|
|
Windows = 5
|
|
+ kFreeBSD = 6
|
|
else:
|
|
class EnumOsType(object):
|
|
values = ["Unknown",
|
|
@@ -43,7 +44,9 @@ else:
|
|
"FreeBSD",
|
|
"Linux",
|
|
"NetBSD",
|
|
- "Windows"]
|
|
+ "Windows",
|
|
+ "kFreeBSD"
|
|
+ ]
|
|
|
|
class __metaclass__(type):
|
|
#++----------------------------------------------------------------
|
|
@@ -91,5 +94,7 @@ def determine_os_type():
|
|
eOSType = EnumOsType.NetBSD
|
|
elif strOS == "win32":
|
|
eOSType = EnumOsType.Windows
|
|
+ elif strOS.startswith("gnukfreebsd"):
|
|
+ eOSType = EnumOsType.kFreeBSD
|
|
|
|
return eOSType
|
|
Index: llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/Python/modules/CMakeLists.txt
|
|
===================================================================
|
|
--- llvm-toolchain-snapshot_4.0~svn280802.orig/lldb/scripts/Python/modules/CMakeLists.txt
|
|
+++ llvm-toolchain-snapshot_4.0~svn280802/lldb/scripts/Python/modules/CMakeLists.txt
|
|
@@ -5,7 +5,7 @@ if (CXX_SUPPORTS_NO_MACRO_REDEFINED)
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-macro-redefined")
|
|
endif ()
|
|
|
|
-# build the Python readline suppression module only on Linux
|
|
-if (CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT __ANDROID_NDK__)
|
|
+# build the Python readline suppression module only on Linux or GNU systems
|
|
+if ((CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "GNU" OR CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD") AND NOT __ANDROID_NDK__)
|
|
add_subdirectory(readline)
|
|
endif()
|