[clang] 3873d0b - Re-commit "[cmake] Allow std::filesystem tests in CrossWinToARMLinux.cmake"
Author: Sergej Jaskiewicz
Date: 2020-05-25T19:14:54+03:00
New Revision: 3873d0b3d899bb84a5983450dd2d98006c4527e2
URL:
https://github.com/llvm/llvm-project/commit/3873d0b3d899bb84a5983450dd2d98006c4527e2
DIFF:
https://github.com/llvm/llvm-project/commit/3873d0b3d899bb84a5983450dd2d98006c4527e2.diff
LOG: Re-commit "[cmake] Allow std::filesystem tests in CrossWinToARMLinux.cmake"
https://reviews.llvm.org/D78200 has been re-committed, so we can now
enable building std::filesystem and running tests for it.
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index c01c31ae5a72..3d1e961ada8d 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -89,9 +89,6 @@ set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXOFF CACHE BOOL
"")
set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABIOFF CACHE BOOL "")
set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX OFF CACHE BOOL "")
-# FIXME: Remove this when https://reviews.llvm.org/D78200 is merged.
-set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "")
-
set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_TARGET_TRIPLE"${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[libunwind] 649f042 - [libunwind] Support the new libc++ test format
Author: Sergej Jaskiewicz
Date: 2020-04-06T23:26:59+03:00
New Revision: 649f042802d3ed9648da4b1939ac387bc4fe9976
URL:
https://github.com/llvm/llvm-project/commit/649f042802d3ed9648da4b1939ac387bc4fe9976
DIFF:
https://github.com/llvm/llvm-project/commit/649f042802d3ed9648da4b1939ac387bc4fe9976.diff
LOG: [libunwind] Support the new libc++ test format
Reviewers: ldionne, #libunwind, mstorsjo
Reviewed By: ldionne, #libunwind, mstorsjo
Subscribers: mstorsjo, dexonsmith, llvm-commits, libcxx-commits
Tags: #llvm, #libunwind
Differential Revision: https://reviews.llvm.org/D77501
Added:
Modified:
libunwind/test/lit.cfg
Removed:
diff --git a/libunwind/test/lit.cfg b/libunwind/test/lit.cfg
index 1d284bdfd771..4ac749392737 100644
--- a/libunwind/test/lit.cfg
+++ b/libunwind/test/lit.cfg
@@ -67,4 +67,9 @@ config_module = __import__(config_module_name,
fromlist=['Configuration'])
configuration = config_module.Configuration(lit_config, config)
configuration.configure()
configuration.print_config_info()
-config.test_format = configuration.get_test_format()
+if lit_config.params.get('use_new_format', False):
+lit_config.note("Using the experimental libc++ testing format")
+import libcxx.test.newformat
+config.test_format = libcxx.test.newformat.CxxStandardLibraryTest()
+else:
+config.test_format = configuration.get_test_format()
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] c310d0d - [cmake] Invoke ssh.py using Python interpreter, not as executable in CrossWinToARMLinux.cmake
Author: Sergej Jaskiewicz
Date: 2020-06-15T23:59:06+03:00
New Revision: c310d0de3955b005f652d9cfa798deec8e01a0ba
URL:
https://github.com/llvm/llvm-project/commit/c310d0de3955b005f652d9cfa798deec8e01a0ba
DIFF:
https://github.com/llvm/llvm-project/commit/c310d0de3955b005f652d9cfa798deec8e01a0ba.diff
LOG: [cmake] Invoke ssh.py using Python interpreter, not as executable in
CrossWinToARMLinux.cmake
The issue is that Windows doesn't support shebangs. This caused issues
with libc++ tests.
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 41ddb836f60e..9aa0efa8049f 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -100,9 +100,11 @@ set(LIBCXX_CXX_ABI_LIBRARY_PATH
"${CMAKE_BINARY_DIR}/lib/${LIBCXX_TA
set(BUILTINS_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
set(RUNTIMES_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
+find_package(Python3 COMPONENTS Interpreter)
+
# Remote test configuration.
if(DEFINED REMOTE_TEST_HOST)
- set(DEFAULT_TEST_EXECUTOR
"${LLVM_PROJECT_DIR}/libcxx/utils/ssh.py
--host='${REMOTE_TEST_USER}@${REMOTE_TEST_HOST}'")
+ set(DEFAULT_TEST_EXECUTOR "\\\"${Python3_EXECUTABLE}\\\"
\\\"${LLVM_PROJECT_DIR}/libcxx/utils/ssh.py\\\"
--host='${REMOTE_TEST_USER}@${REMOTE_TEST_HOST}'")
set(DEFAULT_TEST_TARGET_INFO
"libcxx.test.target_info.LinuxRemoteTI")
# Allow override with the custom values.
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] 7ce4e65 - [cmake] Temporarily disable building std::filesystem in CrossWinToARMLinux.cmake
Author: Sergej Jaskiewicz
Date: 2020-04-18T00:29:44+03:00
New Revision: 7ce4e652312f776c2cdd1650370c8909f7cf992f
URL:
https://github.com/llvm/llvm-project/commit/7ce4e652312f776c2cdd1650370c8909f7cf992f
DIFF:
https://github.com/llvm/llvm-project/commit/7ce4e652312f776c2cdd1650370c8909f7cf992f.diff
LOG: [cmake] Temporarily disable building std::filesystem in
CrossWinToARMLinux.cmake
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 3d1e961ada8d..c01c31ae5a72 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -89,6 +89,9 @@ set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXOFF CACHE BOOL
"")
set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABIOFF CACHE BOOL "")
set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX OFF CACHE BOOL "")
+# FIXME: Remove this when https://reviews.llvm.org/D78200 is merged.
+set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "")
+
set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_TARGET_TRIPLE"${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] a5bf028 - [TimeProfiler] Emit real process ID and thread names
Author: Sergej Jaskiewicz
Date: 2020-04-23T00:12:51+03:00
New Revision: a5bf02815d8b8d1a76682a63281561f076968dae
URL:
https://github.com/llvm/llvm-project/commit/a5bf02815d8b8d1a76682a63281561f076968dae
DIFF:
https://github.com/llvm/llvm-project/commit/a5bf02815d8b8d1a76682a63281561f076968dae.diff
LOG: [TimeProfiler] Emit real process ID and thread names
Differential Revision: https://reviews.llvm.org/D78027
Added:
Modified:
clang/test/Driver/check-time-trace.cpp
lld/test/ELF/time-trace.s
llvm/lib/Support/TimeProfiler.cpp
Removed:
diff --git a/clang/test/Driver/check-time-trace.cpp
b/clang/test/Driver/check-time-trace.cpp
index bff2c1984daa..1484462b72bb 100644
--- a/clang/test/Driver/check-time-trace.cpp
+++ b/clang/test/Driver/check-time-trace.cpp
@@ -14,6 +14,7 @@
// CHECK-NEXT: "ts":
// CHECK: "name": "clang{{.*}}"
// CHECK: "name": "process_name"
+// CHECK: "name": "thread_name"
template
struct Struct {
diff --git a/lld/test/ELF/time-trace.s b/lld/test/ELF/time-trace.s
index 74311a984110..8085a256649e 100644
--- a/lld/test/ELF/time-trace.s
+++ b/lld/test/ELF/time-trace.s
@@ -34,6 +34,7 @@
# Check process_name entry field
# CHECK: "name": "ld.lld{{(.exe)?}}"
# CHECK: "name": "process_name"
+# CHECK: "name": "thread_name"
.globl _start
_start:
diff --git a/llvm/lib/Support/TimeProfiler.cpp
b/llvm/lib/Support/TimeProfiler.cpp
index 510f763b8fe3..c907c1aaf983 100644
--- a/llvm/lib/Support/TimeProfiler.cpp
+++ b/llvm/lib/Support/TimeProfiler.cpp
@@ -16,6 +16,7 @@
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/JSON.h"
#include "llvm/Support/Path.h"
+#include "llvm/Support/Process.h"
#include "llvm/Support/Threading.h"
#include
#include
@@ -75,7 +76,10 @@ struct Entry {
struct llvm::TimeTraceProfiler {
TimeTraceProfiler(unsigned TimeTraceGranularity = 0, StringRef ProcName = "")
: StartTime(steady_clock::now()), ProcName(ProcName),
-Tid(llvm::get_threadid()), TimeTraceGranularity(TimeTraceGranularity)
{}
+Pid(sys::Process::getProcessId()), Tid(llvm::get_threadid()),
+TimeTraceGranularity(TimeTraceGranularity) {
+llvm::get_thread_name(ThreadName);
+ }
void begin(std::string Name, llvm::function_ref Detail) {
Stack.emplace_back(steady_clock::now(), TimePointType(), std::move(Name),
@@ -138,8 +142,8 @@ struct llvm::TimeTraceProfiler {
auto StartUs = E.getFlameGraphStartUs(StartTime);
auto DurUs = E.getFlameGraphDurUs();
- J.object([&]{
-J.attribute("pid", 1);
+ J.object([&] {
+J.attribute("pid", Pid);
J.attribute("tid", int64_t(Tid));
J.attribute("ph", "X");
J.attribute("ts", StartUs);
@@ -194,8 +198,8 @@ struct llvm::TimeTraceProfiler {
auto DurUs = duration_cast(Total.second.second).count();
auto Count = AllCountAndTotalPerName[Total.first].first;
- J.object([&]{
-J.attribute("pid", 1);
+ J.object([&] {
+J.attribute("pid", Pid);
J.attribute("tid", int64_t(TotalTid));
J.attribute("ph", "X");
J.attribute("ts", 0);
@@ -210,16 +214,23 @@ struct llvm::TimeTraceProfiler {
++TotalTid;
}
-// Emit metadata event with process name.
-J.object([&] {
- J.attribute("cat", "");
- J.attribute("pid", 1);
- J.attribute("tid", 0);
- J.attribute("ts", 0);
- J.attribute("ph", "M");
- J.attribute("name", "process_name");
- J.attributeObject("args", [&] { J.attribute("name", ProcName); });
-});
+auto writeMetadataEvent = [&](const char *Name, uint64_t Tid,
+ StringRef arg) {
+ J.object([&] {
+J.attribute("cat", "");
+J.attribute("pid", Pid);
+J.attribute("tid", int64_t(Tid));
+J.attribute("ts", 0);
+J.attribute("ph", "M");
+J.attribute("name", Name);
+J.attributeObject("args", [&] { J.attribute("name", arg); });
+ });
+};
+
+writeMetadataEvent("process_name", Tid, ProcName);
+writeMetadataEvent("thread_name", Tid, ThreadName);
+for (const TimeTraceProfiler *TTP : ThreadTimeTraceProfilerInstances)
+ writeMetadataEvent("thread_name", TTP->Tid, TTP->ThreadName);
J.arrayEnd();
J.attributeEnd();
@@ -231,6 +242,8 @@ struct llvm::TimeTraceProfiler {
StringMap CountAndTotalPerName;
const TimePointType StartTime;
const std::string ProcName;
+ const sys::Process::Pid Pid;
+ SmallString<0> ThreadName;
const uint64_t Tid;
// Minimum time granularity (in microseconds)
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] 2899103 - [TimeProfiler] Emit clock synchronization point
Author: Sergej Jaskiewicz
Date: 2020-04-23T01:09:31+03:00
New Revision: 2899103108d38215af8aae377cd0e54794278209
URL:
https://github.com/llvm/llvm-project/commit/2899103108d38215af8aae377cd0e54794278209
DIFF:
https://github.com/llvm/llvm-project/commit/2899103108d38215af8aae377cd0e54794278209.diff
LOG: [TimeProfiler] Emit clock synchronization point
Time profiler emits relative timestamps for events (the number of
microseconds passed since the start of the current process).
This patch allows combining events from different processes while
preserving their relative timing by emitting a new attribute
"beginningOfTime". This attribute contains the system time that
corresponds to the zero timestamp of the time profiler.
This has at least two use cases:
- Build systems can use this to merge time traces from multiple compiler
invocations and generate statistics for the whole build. Tools like
ClangBuildAnalyzer could also leverage this feature.
- Compilers that use LLVM as their backend by invoking llc/opt in
a child process. If such a compiler supports generating time traces
of its own events, it could merge those events with LLVM-specific
events received from llc/opt, and produce a more complete time trace.
A proof-of-concept script that merges multiple logs that
contain a synchronization point into one log:
https://github.com/broadwaylamb/merge_trace_events
Differential Revision: https://reviews.llvm.org/D78030
Added:
Modified:
clang/test/Driver/check-time-trace-sections.py
clang/test/Driver/check-time-trace.cpp
lld/test/ELF/time-trace.s
llvm/lib/Support/TimeProfiler.cpp
Removed:
diff --git a/clang/test/Driver/check-time-trace-sections.py
b/clang/test/Driver/check-time-trace-sections.py
index 7b598537a5b0..7551e5c19be5 100644
--- a/clang/test/Driver/check-time-trace-sections.py
+++ b/clang/test/Driver/check-time-trace-sections.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import json, sys
+import json, sys, time
def is_inside(range1, range2):
a = range1["ts"]; b = a + range1["dur"]
@@ -11,11 +11,22 @@ def is_before(range1, range2):
b = range1["ts"] + range1["dur"]; c = range2["ts"]
return b <= c
-events = json.loads(sys.stdin.read())["traceEvents"]
+log_contents = json.loads(sys.stdin.read())
+events = log_contents["traceEvents"]
codegens = [event for event in events if event["name"] == "CodeGen Function"]
frontends = [event for event in events if event["name"] == "Frontend"]
backends = [event for event in events if event["name"] == "Backend"]
+beginning_of_time = log_contents["beginningOfTime"] / 100
+seconds_since_epoch = time.time()
+
+# Make sure that the 'beginningOfTime' is not earlier than 10 seconds ago
+# and not later than now.
+if beginning_of_time > seconds_since_epoch or \
+seconds_since_epoch - beginning_of_time > 10:
+sys.exit("'beginningOfTime' should represent the absolute time when the "
+ "process has started")
+
if not all([any([is_inside(codegen, frontend) for frontend in frontends])
for codegen in codegens]):
sys.exit("Not all CodeGen sections are inside any Frontend section!")
diff --git a/clang/test/Driver/check-time-trace.cpp
b/clang/test/Driver/check-time-trace.cpp
index 1484462b72bb..1d80748a5233 100644
--- a/clang/test/Driver/check-time-trace.cpp
+++ b/clang/test/Driver/check-time-trace.cpp
@@ -3,18 +3,19 @@
// RUN: | %python -c 'import json, sys;
json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
// RUN: | FileCheck %s
-// CHECK: "traceEvents": [
-// CHECK: "args":
-// CHECK: "detail":
-// CHECK: "dur":
-// CHECK: "name":
+// CHECK: "beginningOfTime": {{[0-9]{16},}}
+// CHECK-NEXT: "traceEvents": [
+// CHECK: "args":
+// CHECK: "detail":
+// CHECK: "dur":
+// CHECK: "name":
// CHECK-NEXT: "ph":
// CHECK-NEXT: "pid":
// CHECK-NEXT: "tid":
// CHECK-NEXT: "ts":
-// CHECK: "name": "clang{{.*}}"
-// CHECK: "name": "process_name"
-// CHECK: "name": "thread_name"
+// CHECK: "name": "clang{{.*}}"
+// CHECK: "name": "process_name"
+// CHECK: "name": "thread_name"
template
struct Struct {
diff --git a/lld/test/ELF/time-trace.s b/lld/test/ELF/time-trace.s
index 8085a256649e..e1da4c476f40 100644
--- a/lld/test/ELF/time-trace.s
+++ b/lld/test/ELF/time-trace.s
@@ -18,7 +18,8 @@
# RUN: | %python -c 'import json, sys;
json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
# RUN: | FileCheck %s
-# CHECK: "traceEvents": [
+# CHECK: "beginningOfTime": {{[0-9]{16},}}
+# CHECK-NEXT: "traceEvents": [
# Check one event has correct fields
# CHECK: "dur":
diff --git a/llvm/lib/Support/TimeProfiler.cpp
b/llvm/lib/Support/TimeProfiler.cpp
index c907c1aaf983..93bf6f57e348 100644
--- a/llvm/lib/Support/TimeProfiler.cpp
+++ b/llvm/lib/Support/TimePro
[clang] 67175d8 - [cmake] Allow std::filesystem tests in CrossWinToARMLinux.cmake
Author: Sergej Jaskiewicz
Date: 2020-05-06T01:31:32+03:00
New Revision: 67175d8dc53b580bad439f85fda12623fa6993fa
URL:
https://github.com/llvm/llvm-project/commit/67175d8dc53b580bad439f85fda12623fa6993fa
DIFF:
https://github.com/llvm/llvm-project/commit/67175d8dc53b580bad439f85fda12623fa6993fa.diff
LOG: [cmake] Allow std::filesystem tests in CrossWinToARMLinux.cmake
Now that https://reviews.llvm.org/D78200 has landed, there should be
no problem with those tests. If there is, it is OK to revert this.
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index c01c31ae5a72..3d1e961ada8d 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -89,9 +89,6 @@ set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXOFF CACHE BOOL
"")
set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABIOFF CACHE BOOL "")
set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX OFF CACHE BOOL "")
-# FIXME: Remove this when https://reviews.llvm.org/D78200 is merged.
-set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "")
-
set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_TARGET_TRIPLE"${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] ddfe588 - Revert "[cmake] Allow std::filesystem tests in CrossWinToARMLinux.cmake"
Author: Sergej Jaskiewicz
Date: 2020-05-07T15:01:39+03:00
New Revision: ddfe58822eca2ea9b279a01a512d49f736789fca
URL:
https://github.com/llvm/llvm-project/commit/ddfe58822eca2ea9b279a01a512d49f736789fca
DIFF:
https://github.com/llvm/llvm-project/commit/ddfe58822eca2ea9b279a01a512d49f736789fca.diff
LOG: Revert "[cmake] Allow std::filesystem tests in CrossWinToARMLinux.cmake"
This reverts commit 67175d8dc53b580bad439f85fda12623fa6993fa.
https://reviews.llvm.org/D78200 has been reverted, so our bot is red.
Make it green by turning off std::filesystem.
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 3d1e961ada8d..c01c31ae5a72 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -89,6 +89,9 @@ set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXOFF CACHE BOOL
"")
set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABIOFF CACHE BOOL "")
set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX OFF CACHE BOOL "")
+# FIXME: Remove this when https://reviews.llvm.org/D78200 is merged.
+set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "")
+
set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_TARGET_TRIPLE"${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] e44dedd - [CMake] Support running libc++abi tests in CrossWinToARMLinux cache file
Author: Sergej Jaskiewicz
Date: 2020-01-10T12:59:05+03:00
New Revision: e44dedd3631c20bc4a1e62b68919a11168d39354
URL:
https://github.com/llvm/llvm-project/commit/e44dedd3631c20bc4a1e62b68919a11168d39354
DIFF:
https://github.com/llvm/llvm-project/commit/e44dedd3631c20bc4a1e62b68919a11168d39354.diff
LOG: [CMake] Support running libc++abi tests in CrossWinToARMLinux cache file
Summary:
Now that D71894 has landed, we're able to run libc++abi tests remotely.
For that we can use the same CMake command as before. The tests can be run
using `ninja check-cxxabi`.
Reviewers: andreil99, vvereschaka, aorlov
Reviewed By: vvereschaka, aorlov
Subscribers: mgorny, kristof.beyls, ldionne, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D72459
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 9fbf090767e9..d08e09a291f7 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -76,10 +76,13 @@ set(LIBCXXABI_USE_COMPILER_RT ON CACHE BOOL
"")
set(LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS OFF CACHE BOOL "")
set(LIBCXXABI_TARGET_TRIPLE "${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LIBCXXABI_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
+set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "")
+set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXOFF CACHE BOOL "")
set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_TARGET_TRIPLE"${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
+set(LIBCXX_ENABLE_SHAREDOFF CACHE BOOL "")
set(BUILTINS_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
set(RUNTIMES_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] 9a6a696 - [cmake] Link libc++ tests against static libc++/libc++abi in CrossWinToARMLinux.cmake
Author: Sergej Jaskiewicz
Date: 2020-03-31T23:36:36+03:00
New Revision: 9a6a696817bd6322d62db21aa17fe395af41f8ae
URL:
https://github.com/llvm/llvm-project/commit/9a6a696817bd6322d62db21aa17fe395af41f8ae
DIFF:
https://github.com/llvm/llvm-project/commit/9a6a696817bd6322d62db21aa17fe395af41f8ae.diff
LOG: [cmake] Link libc++ tests against static libc++/libc++abi in
CrossWinToARMLinux.cmake
Summary: Now that D72687 has landed, we can enable this setting in our cache
file.
Reviewers: vvereschaka
Reviewed By: vvereschaka
Subscribers: mgorny, kristof.beyls, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D76774
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 0d359a1609a5..3d1e961ada8d 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -86,6 +86,8 @@ set(LIBCXXABI_TARGET_TRIPLE
"${CMAKE_C_COMPILER_TARGET}" CACHE S
set(LIBCXXABI_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXABI OFF CACHE BOOL "")
set(LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXOFF CACHE BOOL "")
+set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABIOFF CACHE BOOL "")
+set(LIBCXX_LINK_TESTS_WITH_SHARED_LIBCXX OFF CACHE BOOL "")
set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_TARGET_TRIPLE"${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[libunwind] b3fdf33 - Enable `-funwind-tables` flag when building libunwind
Author: Sergej Jaskiewicz Date: 2019-12-04T00:52:19+03:00 New Revision: b3fdf33ba6aa7ef80621696f74aaf2f6f8e1d1de URL: https://github.com/llvm/llvm-project/commit/b3fdf33ba6aa7ef80621696f74aaf2f6f8e1d1de DIFF: https://github.com/llvm/llvm-project/commit/b3fdf33ba6aa7ef80621696f74aaf2f6f8e1d1de.diff LOG: Enable `-funwind-tables` flag when building libunwind Summary: Or, rather, don't accidentally forget to pass it. This is aimed to solve the problem discussed in [this thread](http://lists.llvm.org/pipermail/llvm-dev/2019-November/136890.html), and to fix [a year-old bug](https://bugs.llvm.org/show_bug.cgi?id=38468). TL;DR: when building libunwind for ARM Linux, we **need** libunwind to be built with the `-funwind-tables` flag, because, well ARM EHABI needs unwind info produced by this flag. Without the flag all the procedures in libunwind are marked `.cantunwind`, which causes all sorts of bad things. From `_Unwind_Backtrace` not working, to C++ exceptions not being caught (which is the aforementioned bug is about). Previously, this flag was not added because the CMake check `add_compile_flags_if_supported(-funwind-tables)` produced a false negative. Why? With this flag, the compiler generates calls to the `__aeabi_unwind_cpp_pr0` symbol, which is defined in libunwind itself and obviously is not available at configure time, before libunwind is built. This led to failure at link time during the CMake check. We handle this by disabling the linker for CMake checks in linbunwind. Also, this patch introduces a lit feature `libunwind-arm-ehabi`, which is used to mark the `signal_frame.pass.cpp` test as unsupported (as was advised by @miyuki in D70397). Reviewers: peter.smith, phosek, EricWF, compnerd, jroelofs, saugustine, miyuki, jfb Subscribers: mgorny, kristof.beyls, christof, libcxx-commits, miyuki Tags: #libc Differential Revision: https://reviews.llvm.org/D70815 Added: Modified: libunwind/CMakeLists.txt libunwind/cmake/config-ix.cmake libunwind/test/CMakeLists.txt libunwind/test/libunwind/test/config.py libunwind/test/lit.site.cfg.in libunwind/test/signal_frame.pass.cpp Removed: diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 08095d1333a5..7aa1c782ac74 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -220,6 +220,21 @@ include(HandleLibunwindFlags) # Setup Compiler Flags #=== +# Don't run the linker in CMake checks. +# +# The reason why this was added is that when building libunwind for +# ARM Linux, we need to pass the -funwind-tables flag in order for it to +# work properly with ARM EHABI. +# +# However, when performing CMake checks, adding this flag causes the check +# to produce a false negative, because the compiler generates calls +# to __aeabi_unwind_cpp_pr0, which is defined in libunwind itself, +# which isn't built yet, so the linker complains about undefined symbols. +# +# This leads to libunwind not being built with this flag, which makes +# libunwind quite useless in this setup. +set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) + # Get required flags. add_target_flags_if(LIBUNWIND_BUILD_32_BITS "-m32") @@ -292,6 +307,12 @@ add_cxx_compile_flags_if_supported(-fstrict-aliasing) add_cxx_compile_flags_if_supported(-EHsc) add_compile_flags_if_supported(-funwind-tables) + +if (LIBUNWIND_USES_ARM_EHABI AND NOT LIBUNWIND_SUPPORTS_FUNWIND_TABLES_FLAG) + message(SEND_ERROR "The -funwind-tables flag must be supported " + "because this target uses ARM Exception Handling ABI") +endif() + add_cxx_compile_flags_if_supported(-fno-exceptions) add_cxx_compile_flags_if_supported(-fno-rtti) diff --git a/libunwind/cmake/config-ix.cmake b/libunwind/cmake/config-ix.cmake index 02d2f13f2e28..0d833e996ca1 100644 --- a/libunwind/cmake/config-ix.cmake +++ b/libunwind/cmake/config-ix.cmake @@ -2,6 +2,7 @@ include(CMakePushCheckState) include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) include(CheckLibraryExists) +include(CheckSymbolExists) include(CheckCSourceCompiles) check_library_exists(c fopen "" LIBUNWIND_HAS_C_LIB) @@ -73,3 +74,13 @@ check_cxx_compiler_flag(-nostdinc++ LIBUNWIND_HAS_NOSTDINCXX_FLAG) # Check libraries check_library_exists(dl dladdr "" LIBUNWIND_HAS_DL_LIB) check_library_exists(pthread pthread_once "" LIBUNWIND_HAS_PTHREAD_LIB) + +# Check symbols +check_symbol_exists(__arm__ "" LIBUNWIND_TARGET_ARM) +check_symbol_exists(__USING_SJLJ_EXCEPTIONS__ "" LIBUNWIND_USES_SJLJ_EXCEPTIONS) +check_symbol_exists(__ARM_DWARF_EH__ "" LIBUNWIND_USES_DWARF_EH) + +if(LIBUNWIND_TARGET_ARM AND NOT LIBUNWIND_USES_SJLJ_EXCEPTIONS AND NOT LIBUNWIND_USES_DWARF_EH) + # This condition is copied from __libunwind_config.h + set(LIBUNWIND_USES_ARM_EHABI ON) +endif() diff --git a/libunwind/test/CMak
[libunwind] 57fc8ec - Reland "Enable `-funwind-tables` flag when building libunwind"
Author: Sergej Jaskiewicz
Date: 2019-12-11T04:27:04+03:00
New Revision: 57fc8ecdbaa7fbb1a13907ca3f7a3cb9f9459d27
URL:
https://github.com/llvm/llvm-project/commit/57fc8ecdbaa7fbb1a13907ca3f7a3cb9f9459d27
DIFF:
https://github.com/llvm/llvm-project/commit/57fc8ecdbaa7fbb1a13907ca3f7a3cb9f9459d27.diff
LOG: Reland "Enable `-funwind-tables` flag when building libunwind"
Summary:
Relands https://reviews.llvm.org/D70815.
The original commit set `CMAKE_TRY_COMPILE_TARGET_TYPE` to
`STATIC_LIBRARY` globally in libunwind/CMakeLists.txt, which effectively
disabled the linking step in CMake checks.
This broke some builds (see 938c70b86c7d2165f8c28d5700e9c1ac1263307e).
Here we set CMAKE_TRY_COMPILE_TARGET_TYPE to
STATIC_LIBRARY only when checking for presence of the `-funwind-tables`
flag, and then set it back to the original value so it doesn't affect
other checks.
Reviewers: mstorsjo, jfb
Subscribers: mgorny, christof, libcxx-commits
Tags: #libc
Differential Revision: https://reviews.llvm.org/D71117
Added:
Modified:
libunwind/CMakeLists.txt
libunwind/cmake/config-ix.cmake
libunwind/test/CMakeLists.txt
libunwind/test/libunwind/test/config.py
libunwind/test/lit.site.cfg.in
libunwind/test/signal_frame.pass.cpp
Removed:
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt
index 08095d1333a5..6dd0a15405b5 100644
--- a/libunwind/CMakeLists.txt
+++ b/libunwind/CMakeLists.txt
@@ -291,7 +291,29 @@ endif()
add_cxx_compile_flags_if_supported(-fstrict-aliasing)
add_cxx_compile_flags_if_supported(-EHsc)
+# Don't run the linker in this CMake check.
+#
+# The reason why this was added is that when building libunwind for
+# ARM Linux, we need to pass the -funwind-tables flag in order for it to
+# work properly with ARM EHABI.
+#
+# However, when performing CMake checks, adding this flag causes the check
+# to produce a false negative, because the compiler generates calls
+# to __aeabi_unwind_cpp_pr0, which is defined in libunwind itself,
+# which isn't built yet, so the linker complains about undefined symbols.
+#
+# This leads to libunwind not being built with this flag, which makes
+# libunwind quite useless in this setup.
+set(_previous_CMAKE_TRY_COMPILE_TARGET_TYPE ${CMAKE_TRY_COMPILE_TARGET_TYPE})
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
add_compile_flags_if_supported(-funwind-tables)
+set(CMAKE_TRY_COMPILE_TARGET_TYPE ${_previous_CMAKE_TRY_COMPILE_TARGET_TYPE})
+
+if (LIBUNWIND_USES_ARM_EHABI AND NOT LIBUNWIND_SUPPORTS_FUNWIND_TABLES_FLAG)
+ message(SEND_ERROR "The -funwind-tables flag must be supported "
+ "because this target uses ARM Exception Handling ABI")
+endif()
+
add_cxx_compile_flags_if_supported(-fno-exceptions)
add_cxx_compile_flags_if_supported(-fno-rtti)
diff --git a/libunwind/cmake/config-ix.cmake b/libunwind/cmake/config-ix.cmake
index 02d2f13f2e28..0d833e996ca1 100644
--- a/libunwind/cmake/config-ix.cmake
+++ b/libunwind/cmake/config-ix.cmake
@@ -2,6 +2,7 @@ include(CMakePushCheckState)
include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
include(CheckLibraryExists)
+include(CheckSymbolExists)
include(CheckCSourceCompiles)
check_library_exists(c fopen "" LIBUNWIND_HAS_C_LIB)
@@ -73,3 +74,13 @@ check_cxx_compiler_flag(-nostdinc++
LIBUNWIND_HAS_NOSTDINCXX_FLAG)
# Check libraries
check_library_exists(dl dladdr "" LIBUNWIND_HAS_DL_LIB)
check_library_exists(pthread pthread_once "" LIBUNWIND_HAS_PTHREAD_LIB)
+
+# Check symbols
+check_symbol_exists(__arm__ "" LIBUNWIND_TARGET_ARM)
+check_symbol_exists(__USING_SJLJ_EXCEPTIONS__ ""
LIBUNWIND_USES_SJLJ_EXCEPTIONS)
+check_symbol_exists(__ARM_DWARF_EH__ "" LIBUNWIND_USES_DWARF_EH)
+
+if(LIBUNWIND_TARGET_ARM AND NOT LIBUNWIND_USES_SJLJ_EXCEPTIONS AND NOT
LIBUNWIND_USES_DWARF_EH)
+ # This condition is copied from __libunwind_config.h
+ set(LIBUNWIND_USES_ARM_EHABI ON)
+endif()
diff --git a/libunwind/test/CMakeLists.txt b/libunwind/test/CMakeLists.txt
index d902e3e82941..40d4acd4e8c2 100644
--- a/libunwind/test/CMakeLists.txt
+++ b/libunwind/test/CMakeLists.txt
@@ -16,6 +16,7 @@ pythonize_bool(LIBCXX_ENABLE_SHARED)
pythonize_bool(LIBUNWIND_ENABLE_SHARED)
pythonize_bool(LIBUNWIND_ENABLE_THREADS)
pythonize_bool(LIBUNWIND_ENABLE_EXCEPTIONS)
+pythonize_bool(LIBUNWIND_USES_ARM_EHABI)
pythonize_bool(LIBUNWIND_USE_COMPILER_RT)
pythonize_bool(LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY)
set(LIBUNWIND_TARGET_INFO "libcxx.test.target_info.LocalTI" CACHE STRING
diff --git a/libunwind/test/libunwind/test/config.py
b/libunwind/test/libunwind/test/config.py
index 05e3f3cc21f3..41ca3f9b4a44 100644
--- a/libunwind/test/libunwind/test/config.py
+++ b/libunwind/test/libunwind/test/config.py
@@ -37,6 +37,8 @@ def configure_features(self):
super(Configuration, self).configure_features()
if not self.get_lit_bool('enable_exceptions', True):
self.config.a
[clang] 0197eac - Temporarily re-apply https://reviews.llvm.org/D74347
Author: Sergej Jaskiewicz
Date: 2020-03-11T21:35:14+03:00
New Revision: 0197eac3330c04a49519f3e4dac38c4de605c654
URL:
https://github.com/llvm/llvm-project/commit/0197eac3330c04a49519f3e4dac38c4de605c654
DIFF:
https://github.com/llvm/llvm-project/commit/0197eac3330c04a49519f3e4dac38c4de605c654.diff
LOG: Temporarily re-apply https://reviews.llvm.org/D74347
It was reverted in 35367e06b84618e21945674aa22e7cfda1957ea4
because it broke the buildbot due to missing libc++abi headers.
https://reviews.llvm.org/D75991 improves the diagnostics, so I hope
the build log will be more informative.
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 50957b153328..7a6af734f0de 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -83,6 +83,9 @@ set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_TARGET_TRIPLE"${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
set(LIBCXX_ENABLE_SHAREDOFF CACHE BOOL "")
+set(LIBCXX_CXX_ABI "libcxxabi" CACHE STRING "")
+set(LIBCXX_CXX_ABI_INCLUDE_PATHS
"${CMAKE_SOURCE_DIR}/../libcxxabi/include" CACHE PATH "")
+set(LIBCXX_CXX_ABI_LIBRARY_PATH
"${CMAKE_BINARY_DIR}/lib/${CMAKE_C_COMPILER_TARGET}/c++" CACHE PATH "")
set(BUILTINS_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
set(RUNTIMES_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] 03993f3 - [CMake] Explicitly specify paths to libc++abi in CrossWinToARMLinux.cmake
Author: Sergej Jaskiewicz
Date: 2020-03-13T17:58:02+03:00
New Revision: 03993f3b6f46ae533575ec057bb84c80d8218641
URL:
https://github.com/llvm/llvm-project/commit/03993f3b6f46ae533575ec057bb84c80d8218641
DIFF:
https://github.com/llvm/llvm-project/commit/03993f3b6f46ae533575ec057bb84c80d8218641.diff
LOG: [CMake] Explicitly specify paths to libc++abi in CrossWinToARMLinux.cmake
Summary:
D69169, which was necessary for running libc++ tests on remote host, got
reverted. I couldn't think of a less invasive way to achieve this behavior but
specify libc++abi paths in our cache file.
Reviewers: vvereschaka, aorlov, andreil99, EricWF
Reviewed By: vvereschaka
Subscribers: mgorny, kristof.beyls, ldionne, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D74347
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 50957b153328..0d359a1609a5 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -25,6 +25,14 @@
# cmake --build . --target check-clang
# cmake --build . --target check-lld
+# LLVM_PROJECT_DIR is the path to the llvm-project directory.
+# The right way to compute it would probably be to use
"${CMAKE_SOURCE_DIR}/../",
+# but CMAKE_SOURCE_DIR is set to the wrong value on earlier CMake versions
+# that we still need to support (for instance, 3.10.2).
+get_filename_component(LLVM_PROJECT_DIR
+ "${CMAKE_CURRENT_LIST_DIR}/../../../"
+ ABSOLUTE)
+
if (NOT DEFINED DEFAULT_SYSROOT)
message(WARNING "DEFAULT_SYSROOT must be specified for the cross toolchain
build.")
endif()
@@ -83,6 +91,9 @@ set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_TARGET_TRIPLE"${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
set(LIBCXX_ENABLE_SHAREDOFF CACHE BOOL "")
+set(LIBCXX_CXX_ABI "libcxxabi" CACHE STRING "")
+set(LIBCXX_CXX_ABI_INCLUDE_PATHS
"${LLVM_PROJECT_DIR}/libcxxabi/include" CACHE PATH "")
+set(LIBCXX_CXX_ABI_LIBRARY_PATH
"${CMAKE_BINARY_DIR}/lib/${LIBCXX_TARGET_TRIPLE}/c++" CACHE PATH "")
set(BUILTINS_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
set(RUNTIMES_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] 801627e - [CMake] Explicitly specify paths to libc++abi in CrossWinToARMLinux.cmake
Author: Sergej Jaskiewicz
Date: 2020-02-17T15:24:04+03:00
New Revision: 801627ee490e1106380184256503dbd520c5f802
URL:
https://github.com/llvm/llvm-project/commit/801627ee490e1106380184256503dbd520c5f802
DIFF:
https://github.com/llvm/llvm-project/commit/801627ee490e1106380184256503dbd520c5f802.diff
LOG: [CMake] Explicitly specify paths to libc++abi in CrossWinToARMLinux.cmake
Summary:
D69169, which was necessary for running libc++ tests on remote host, got
reverted. I couldn't think of a less invasive way to achieve this behavior but
specify libc++abi paths in our cache file.
Reviewers: vvereschaka, aorlov, andreil99, EricWF
Reviewed By: vvereschaka
Subscribers: mgorny, kristof.beyls, ldionne, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D74347
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 50957b153328..7a6af734f0de 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -83,6 +83,9 @@ set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_TARGET_TRIPLE"${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
set(LIBCXX_ENABLE_SHAREDOFF CACHE BOOL "")
+set(LIBCXX_CXX_ABI "libcxxabi" CACHE STRING "")
+set(LIBCXX_CXX_ABI_INCLUDE_PATHS
"${CMAKE_SOURCE_DIR}/../libcxxabi/include" CACHE PATH "")
+set(LIBCXX_CXX_ABI_LIBRARY_PATH
"${CMAKE_BINARY_DIR}/lib/${CMAKE_C_COMPILER_TARGET}/c++" CACHE PATH "")
set(BUILTINS_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
set(RUNTIMES_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] 35367e0 - Revert "[CMake] Explicitly specify paths to libc++abi in CrossWinToARMLinux.cmake"
Author: Sergej Jaskiewicz
Date: 2020-02-17T16:06:30+03:00
New Revision: 35367e06b84618e21945674aa22e7cfda1957ea4
URL:
https://github.com/llvm/llvm-project/commit/35367e06b84618e21945674aa22e7cfda1957ea4
DIFF:
https://github.com/llvm/llvm-project/commit/35367e06b84618e21945674aa22e7cfda1957ea4.diff
LOG: Revert "[CMake] Explicitly specify paths to libc++abi in
CrossWinToARMLinux.cmake"
This reverts commit 801627ee490e1106380184256503dbd520c5f802.
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index 7a6af734f0de..50957b153328 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -83,9 +83,6 @@ set(LIBCXX_USE_COMPILER_RT ON CACHE BOOL "")
set(LIBCXX_TARGET_TRIPLE"${CMAKE_C_COMPILER_TARGET}" CACHE
STRING "")
set(LIBCXX_SYSROOT "${DEFAULT_SYSROOT}" CACHE STRING
"")
set(LIBCXX_ENABLE_SHAREDOFF CACHE BOOL "")
-set(LIBCXX_CXX_ABI "libcxxabi" CACHE STRING "")
-set(LIBCXX_CXX_ABI_INCLUDE_PATHS
"${CMAKE_SOURCE_DIR}/../libcxxabi/include" CACHE PATH "")
-set(LIBCXX_CXX_ABI_LIBRARY_PATH
"${CMAKE_BINARY_DIR}/lib/${CMAKE_C_COMPILER_TARGET}/c++" CACHE PATH "")
set(BUILTINS_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
set(RUNTIMES_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_AR=${CMAKE_AR}" CACHE STRING "")
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] 383ff4e - [CMake] Use LinuxRemoteTI instead of LinuxLocalTI in CrossWinToARMLinux cmake cache
Author: Sergej Jaskiewicz
Date: 2020-01-18T01:29:09+03:00
New Revision: 383ff4eac1db8313ec522ba3ac0903aaeda7ff63
URL:
https://github.com/llvm/llvm-project/commit/383ff4eac1db8313ec522ba3ac0903aaeda7ff63
DIFF:
https://github.com/llvm/llvm-project/commit/383ff4eac1db8313ec522ba3ac0903aaeda7ff63.diff
LOG: [CMake] Use LinuxRemoteTI instead of LinuxLocalTI in CrossWinToARMLinux
cmake cache
Summary: Depends on D72847
Reviewers: vvereschaka, aorlov, andreil99
Reviewed By: vvereschaka
Subscribers: mgorny, kristof.beyls, cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D72850
Added:
Modified:
clang/cmake/caches/CrossWinToARMLinux.cmake
Removed:
diff --git a/clang/cmake/caches/CrossWinToARMLinux.cmake
b/clang/cmake/caches/CrossWinToARMLinux.cmake
index d08e09a291f7..50957b153328 100644
--- a/clang/cmake/caches/CrossWinToARMLinux.cmake
+++ b/clang/cmake/caches/CrossWinToARMLinux.cmake
@@ -90,7 +90,7 @@ set(RUNTIMES_CMAKE_ARGS
"-DCMAKE_SYSTEM_NAME=Linux;-DCMAKE_A
# Remote test configuration.
if(DEFINED REMOTE_TEST_HOST)
set(DEFAULT_TEST_EXECUTOR
"SSHExecutor('${REMOTE_TEST_HOST}', '${REMOTE_TEST_USER}')")
- set(DEFAULT_TEST_TARGET_INFO
"libcxx.test.target_info.LinuxLocalTI")
+ set(DEFAULT_TEST_TARGET_INFO
"libcxx.test.target_info.LinuxRemoteTI")
# Allow override with the custom values.
if(NOT DEFINED LIBUNWIND_TARGET_INFO)
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
