Skip to content

Commit 89f633a

Browse files
committed
Revert "Work around outdated system header files on Amazon Linux"
This reverts commit c5e626c.
1 parent e2e6bee commit 89f633a

File tree

3 files changed

+0
-41
lines changed

3 files changed

+0
-41
lines changed

lldb/cmake/modules/LLDBConfig.cmake

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -345,19 +345,4 @@ if ((CMAKE_SYSTEM_NAME MATCHES "Android") AND LLVM_BUILD_STATIC AND
345345
add_definitions(-DANDROID_USE_ACCEPT_WORKAROUND)
346346
endif()
347347

348-
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
349-
check_cxx_source_compiles(
350-
"#include <asm/ptrace.h>
351-
struct user_sve_header hdr;
352-
int main(void){return 0;}
353-
"
354-
user_sve_header_available)
355-
if(user_sve_header_available)
356-
set(LLDB_HAVE_USER_SVE_HEADER ON)
357-
message(STATUS "AArch64 SVE support enabled.")
358-
else()
359-
message(STATUS "AArch64 SVE support disabled.")
360-
endif()
361-
endif()
362-
363348
include(LLDBGenerateConfig)

lldb/include/lldb/Host/Config.h.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747

4848
#cmakedefine01 LLDB_EMBED_PYTHON_HOME
4949

50-
#cmakedefine01 LLDB_HAVE_USER_SVE_HEADER
51-
5250
#cmakedefine LLDB_PYTHON_HOME R"(${LLDB_PYTHON_HOME})"
5351

5452
#define LLDB_LIBDIR_SUFFIX "${LLVM_LIBDIR_SUFFIX}"

lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_arm64.cpp

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ NativeRegisterContextLinux::CreateHostNativeRegisterContextLinux(
6060
case llvm::Triple::aarch64: {
6161
// Configure register sets supported by this AArch64 target.
6262
// Read SVE header to check for SVE support.
63-
#if LLDB_HAVE_USER_SVE_HEADER
6463
struct user_sve_header sve_header;
65-
#else
66-
struct user_sve_header sve_header {};
67-
#endif
6864
struct iovec ioVec;
6965
ioVec.iov_base = &sve_header;
7066
ioVec.iov_len = sizeof(sve_header);
@@ -209,21 +205,13 @@ NativeRegisterContextLinux_arm64::ReadRegister(const RegisterInfo *reg_info,
209205
if (reg == GetRegisterInfo().GetRegNumFPSR()) {
210206
sve_reg_num = reg;
211207
if (m_sve_state == SVEState::Full)
212-
#if LLDB_HAVE_USER_SVE_HEADER
213208
offset = sve::PTraceFPSROffset(sve::vq_from_vl(m_sve_header.vl));
214-
#else
215-
offset = 0;
216-
#endif
217209
else if (m_sve_state == SVEState::FPSIMD)
218210
offset = sve::ptrace_fpsimd_offset + (32 * 16);
219211
} else if (reg == GetRegisterInfo().GetRegNumFPCR()) {
220212
sve_reg_num = reg;
221213
if (m_sve_state == SVEState::Full)
222-
#if LLDB_HAVE_USER_SVE_HEADER
223214
offset = sve::PTraceFPCROffset(sve::vq_from_vl(m_sve_header.vl));
224-
#else
225-
offset = 0;
226-
#endif
227215
else if (m_sve_state == SVEState::FPSIMD)
228216
offset = sve::ptrace_fpsimd_offset + (32 * 16) + 4;
229217
} else {
@@ -351,21 +339,13 @@ Status NativeRegisterContextLinux_arm64::WriteRegister(
351339
if (reg == GetRegisterInfo().GetRegNumFPSR()) {
352340
sve_reg_num = reg;
353341
if (m_sve_state == SVEState::Full)
354-
#if LLDB_HAVE_USER_SVE_HEADER
355342
offset = sve::PTraceFPSROffset(sve::vq_from_vl(m_sve_header.vl));
356-
#else
357-
offset = 0;
358-
#endif
359343
else if (m_sve_state == SVEState::FPSIMD)
360344
offset = sve::ptrace_fpsimd_offset + (32 * 16);
361345
} else if (reg == GetRegisterInfo().GetRegNumFPCR()) {
362346
sve_reg_num = reg;
363347
if (m_sve_state == SVEState::Full)
364-
#if LLDB_HAVE_USER_SVE_HEADER
365348
offset = sve::PTraceFPCROffset(sve::vq_from_vl(m_sve_header.vl));
366-
#else
367-
offset = 0;
368-
#endif
369349
else if (m_sve_state == SVEState::FPSIMD)
370350
offset = sve::ptrace_fpsimd_offset + (32 * 16) + 4;
371351
} else {
@@ -937,22 +917,18 @@ void NativeRegisterContextLinux_arm64::ConfigureRegisterContext() {
937917
if (error.Success()) {
938918
// If SVE is enabled thread can switch between SVEState::FPSIMD and
939919
// SVEState::Full on every stop.
940-
#if LLDB_HAVE_USER_SVE_HEADER
941920
if ((m_sve_header.flags & sve::ptrace_regs_mask) ==
942921
sve::ptrace_regs_fpsimd)
943922
m_sve_state = SVEState::FPSIMD;
944923
else if ((m_sve_header.flags & sve::ptrace_regs_mask) ==
945924
sve::ptrace_regs_sve)
946925
m_sve_state = SVEState::Full;
947-
#endif
948926

949927
// On every stop we configure SVE vector length by calling
950928
// ConfigureVectorLength regardless of current SVEState of this thread.
951929
uint32_t vq = RegisterInfoPOSIX_arm64::eVectorQuadwordAArch64SVE;
952-
#if LLDB_HAVE_USER_SVE_HEADER
953930
if (sve_vl_valid(m_sve_header.vl))
954931
vq = sve::vq_from_vl(m_sve_header.vl);
955-
#endif
956932

957933
GetRegisterInfo().ConfigureVectorLength(vq);
958934
m_sve_ptrace_payload.resize(sve::PTraceSize(vq, sve::ptrace_regs_sve));

0 commit comments

Comments
 (0)