http://lists.llvm.org/pipermail/release-testers/2020-July/001305.html TODO: Enable Polly. Co-authored-by: conferno <conferno@camfex.cz>wip/yesman
Gabor Greif
4 years ago
committed by
Michael Weiss
parent
28f2797a81
commit
0a8334d5a0
@ -1,53 +0,0 @@ |
||||
Index: lib/Driver/ToolChains/BareMetal.cpp
|
||||
===================================================================
|
||||
--- a/lib/Driver/ToolChains/BareMetal.cpp
|
||||
+++ b/lib/Driver/ToolChains/BareMetal.cpp
|
||||
@@ -157,7 +157,7 @@
|
||||
void BareMetal::AddLinkRuntimeLib(const ArgList &Args,
|
||||
ArgStringList &CmdArgs) const {
|
||||
CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" +
|
||||
- getTriple().getArchName() + ".a"));
|
||||
+ getTriple().getArchName()));
|
||||
}
|
||||
|
||||
void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,
|
||||
Index: test/Driver/baremetal.cpp
|
||||
===================================================================
|
||||
--- a/test/Driver/baremetal.cpp
|
||||
+++ b/test/Driver/baremetal.cpp
|
||||
@@ -13,7 +13,7 @@
|
||||
// CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
|
||||
// CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal"
|
||||
// CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for"
|
||||
-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
|
||||
+// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
|
||||
// CHECK-V6M-C-SAME: "-o" "{{.*}}.o"
|
||||
|
||||
// RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
|
||||
@@ -35,7 +35,7 @@
|
||||
// CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
|
||||
// CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
|
||||
// CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
|
||||
-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
|
||||
+// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
|
||||
// CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o"
|
||||
|
||||
// RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
|
||||
@@ -48,7 +48,7 @@
|
||||
// CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
|
||||
// CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
|
||||
// CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind"
|
||||
-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
|
||||
+// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
|
||||
// CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o"
|
||||
|
||||
// RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
|
||||
@@ -61,7 +61,7 @@
|
||||
// CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"
|
||||
// CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"
|
||||
// CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind"
|
||||
-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"
|
||||
+// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"
|
||||
// CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o"
|
||||
|
||||
// RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \
|
||||
@ -1,62 +0,0 @@ |
||||
--- a/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-01-25 23:13:55.000000000 +0100
|
||||
+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake 2020-01-25 23:19:37.000000000 +0100
|
||||
@@ -43,41 +43,6 @@
|
||||
set(DARWIN_${sdk_name}_CACHED_SYSROOT ${var_internal} CACHE STRING "Darwin SDK path for SDK ${sdk_name}." FORCE)
|
||||
endfunction()
|
||||
|
||||
-function(find_darwin_sdk_version var sdk_name)
|
||||
- # We deliberately don't cache the result here because
|
||||
- # CMake's caching causes too many problems.
|
||||
- set(result_process 1)
|
||||
- if(NOT DARWIN_PREFER_PUBLIC_SDK)
|
||||
- # Let's first try the internal SDK, otherwise use the public SDK.
|
||||
- execute_process(
|
||||
- COMMAND xcrun --sdk ${sdk_name}.internal --show-sdk-version
|
||||
- RESULT_VARIABLE result_process
|
||||
- OUTPUT_VARIABLE var_internal
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
- ERROR_FILE /dev/null
|
||||
- )
|
||||
- endif()
|
||||
- if((NOT ${result_process} EQUAL 0) OR "" STREQUAL "${var_internal}")
|
||||
- execute_process(
|
||||
- COMMAND xcrun --sdk ${sdk_name} --show-sdk-version
|
||||
- RESULT_VARIABLE result_process
|
||||
- OUTPUT_VARIABLE var_internal
|
||||
- OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
- ERROR_FILE /dev/null
|
||||
- )
|
||||
- endif()
|
||||
- if(NOT result_process EQUAL 0)
|
||||
- message(FATAL_ERROR
|
||||
- "Failed to determine SDK version for \"${sdk_name}\" SDK")
|
||||
- endif()
|
||||
- # Check reported version looks sane.
|
||||
- if (NOT "${var_internal}" MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+)?$")
|
||||
- message(FATAL_ERROR
|
||||
- "Reported SDK version \"${var_internal}\" does not look like a version")
|
||||
- endif()
|
||||
- set(${var} ${var_internal} PARENT_SCOPE)
|
||||
-endfunction()
|
||||
-
|
||||
# There isn't a clear mapping of what architectures are supported with a given
|
||||
# target platform, but ld's version output does list the architectures it can
|
||||
# link for.
|
||||
@@ -119,17 +84,6 @@
|
||||
foreach(flag ${DARWIN_${os}_LINK_FLAGS})
|
||||
set(os_linker_flags "${os_linker_flags} ${flag}")
|
||||
endforeach()
|
||||
-
|
||||
- # Disable building for i386 for macOS SDK >= 10.15. The SDK doesn't support
|
||||
- # linking for i386 and the corresponding OS doesn't allow running macOS i386
|
||||
- # binaries.
|
||||
- if ("${os}" STREQUAL "osx")
|
||||
- find_darwin_sdk_version(macosx_sdk_version "macosx")
|
||||
- if ("${macosx_sdk_version}" VERSION_GREATER 10.15 OR "${macosx_sdk_version}" VERSION_EQUAL 10.15)
|
||||
- message(STATUS "Disabling i386 slice for ${valid_archs}")
|
||||
- list(REMOVE_ITEM archs "i386")
|
||||
- endif()
|
||||
- endif()
|
||||
endif()
|
||||
|
||||
# The simple program will build for x86_64h on the simulator because it is
|
||||
Loading…
Reference in new issue