From 88618d370f737aae3ceba910dfef199b9c17652d Mon Sep 17 00:00:00 2001 From: Pavel Andrianov Date: Tue, 13 Feb 2024 17:58:32 +0300 Subject: [PATCH 1/2] Use -fPIC for TSAN compilation Change-Id: I2a9a8bbbf7c6ad9c1954e370a5c8eae2b7604352 --- compiler-rt/lib/tsan/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index 23f1bc15207a..29b1925e2b63 100644 --- a/compiler-rt/lib/tsan/CMakeLists.txt +++ b/compiler-rt/lib/tsan/CMakeLists.txt @@ -4,9 +4,9 @@ set(TSAN_CFLAGS ${SANITIZER_COMMON_CFLAGS}) # SANITIZER_COMMON_CFLAGS contains -fPIC, but it's performance-critical for # TSan runtime to be built with -fPIE to reduce the number of register spills. # On FreeBSD however it provokes linkage issue thus we disable it. -if(NOT CMAKE_SYSTEM MATCHES "FreeBSD") - append_list_if(COMPILER_RT_HAS_FPIE_FLAG -fPIE TSAN_CFLAGS) -endif() +# if(NOT CMAKE_SYSTEM MATCHES "FreeBSD") + # append_list_if(COMPILER_RT_HAS_FPIE_FLAG -fPIE TSAN_CFLAGS) +# endif() append_rtti_flag(OFF TSAN_CFLAGS) if(COMPILER_RT_TSAN_DEBUG_OUTPUT) -- Gitee From 96fa55fe7b0ab3da908daf4bc1bf1ecee1b94e39 Mon Sep 17 00:00:00 2001 From: mutilin Date: Wed, 14 Feb 2024 13:14:01 +0300 Subject: [PATCH 2/2] Fix python 2 -> 3 Change-Id: Iba61f859f3208a018a930dd3403a6d5c288fad64 --- llvm-build/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm-build/build.py b/llvm-build/build.py index f35164454c3b..15e265e97fa2 100755 --- a/llvm-build/build.py +++ b/llvm-build/build.py @@ -2271,7 +2271,7 @@ class LlvmPackage(BuildUtils): repo_tool = os.path.join(self.build_config.REPOROOT_DIR, '.repo', 'repo', 'repo') if os.path.isfile(repo_tool): self.logger().info('Generating manifest.') - subprocess.run(['python2.7', repo_tool, 'manifest', '-r', '-o', manifest], shell=False, + subprocess.run(['python', repo_tool, 'manifest', '-r', '-o', manifest], shell=False, stdout=subprocess.PIPE, cwd=self.build_config.REPOROOT_DIR) else: self.logger().error('Cannot generate manifest, repo tool not found.') -- Gitee