corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1776529 - Remove compiler-rt-cross-compile.patch. r=firefox-build-system-reviewers,andi

Browse Source 
The patch doesn't apply cleanly anymore on clang trunk, but it turns out
we don't need it anymore (presumably since bug 1690757 or some other
related bug)

Also adjust revert-llvmorg-15-init-13446-g7524fe962e47.patch to upstream
changes.

Differential Revision: https://phabricator.services.mozilla.com/D150429
This commit is contained in:
Mike Hommey
2022-06-27 22:46:40 +00:00
parent dc50b68247
commit ece12b2865
4 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/build-clang/clang-14.json
View File

@@ -1,6 +1,5 @@
{ {
"patches": [ "patches": [
"compiler-rt-cross-compile.patch",
"find_symbolizer_linux_clang_10.patch", "find_symbolizer_linux_clang_10.patch",
"android-mangling-error_clang_12.patch", "android-mangling-error_clang_12.patch",
"unpoison-thread-stacks_clang_10.patch", "unpoison-thread-stacks_clang_10.patch",

1
build/build-clang/clang-trunk.json
View File

@@ -1,6 +1,5 @@
{ {
"patches": [ "patches": [
"compiler-rt-cross-compile.patch",
"find_symbolizer_linux_clang_15.patch", "find_symbolizer_linux_clang_15.patch",
"android-mangling-error_clang_12.patch", "android-mangling-error_clang_12.patch",
"unpoison-thread-stacks_clang_10.patch", "unpoison-thread-stacks_clang_10.patch",

15
build/build-clang/compiler-rt-cross-compile.patch
View File

@@ -1,15 +0,0 @@
Add `-target x86_64-apple-darwin' to the compiler-rt overridden CFLAGS
diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
index 28d398672..aac68bf36 100644
--- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
+++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
@@ -265,7 +265,7 @@ endfunction()
macro(darwin_add_builtin_libraries)
set(DARWIN_EXCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Darwin-excludes)
- set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer")
+ set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer -target ${LLVM_DEFAULT_TARGET_TRIPLE} -isysroot ${CMAKE_OSX_SYSROOT} -I${CMAKE_OSX_SYSROOT}/usr/include")
set(CMAKE_C_FLAGS "")
set(CMAKE_CXX_FLAGS "")
set(CMAKE_ASM_FLAGS "")

2
build/build-clang/revert-llvmorg-15-init-13446-g7524fe962e47.patch
View File

@@ -20,7 +20,7 @@ index 856cd732d517..d51de53f5acc 100644
- get_target_flags_for_arch(${arch} target_cflags) - get_target_flags_for_arch(${arch} target_cflags)
- if(CMAKE_CXX_COMPILER_ID MATCHES Clang) - if(CMAKE_CXX_COMPILER_ID MATCHES Clang)
- get_compiler_rt_target(${arch} target) - get_compiler_rt_target(${arch} target)
- set(target_cflags "--target=${target} ${target_cflags}") - set(target_cflags --target=${target} ${target_cflags})
+ if(${arch} MATCHES "i386") + if(${arch} MATCHES "i386")
+ set(EMULATION_ARGUMENT "-m" "elf_i386") + set(EMULATION_ARGUMENT "-m" "elf_i386")
+ else() + else()