forked from Lainports/freebsd-ports
de16aa64b8
Flang is now installed as $PREFIX/bin/flang-devel. I've done no testing and work is in progress upstream on improving cross building the runtime. Apply a fix for LLDB builds on aarch64.
46 lines
2 KiB
Text
46 lines
2 KiB
Text
--- lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_arm64.cpp.orig
|
|
+++ lldb/source/Plugins/Process/FreeBSD/NativeRegisterContextFreeBSD_arm64.cpp
|
|
@@ -119,17 +119,16 @@
|
|
RegisterValue ®_value) {
|
|
Status error;
|
|
|
|
- if (!reg_info) {
|
|
- error = Status::FromErrorString("reg_info NULL");
|
|
- return error;
|
|
- }
|
|
+ if (!reg_info)
|
|
+ return Status::FromErrorString("reg_info NULL");
|
|
|
|
const uint32_t reg = reg_info->kinds[lldb::eRegisterKindLLDB];
|
|
|
|
if (reg == LLDB_INVALID_REGNUM)
|
|
- return Status("no lldb regnum for %s", reg_info && reg_info->name
|
|
- ? reg_info->name
|
|
- : "<unknown register>");
|
|
+ return Status::FromErrorStringWithFormat("no lldb regnum for %s",
|
|
+ reg_info && reg_info->name ?
|
|
+ reg_info->name :
|
|
+ "<unknown register>");
|
|
|
|
uint32_t set = GetRegisterInfo().GetRegisterSetFromRegisterIndex(reg);
|
|
error = ReadRegisterSet(set);
|
|
@@ -147,14 +146,15 @@
|
|
Status error;
|
|
|
|
if (!reg_info)
|
|
- return Status("reg_info NULL");
|
|
+ return Status::FromErrorString("reg_info NULL");
|
|
|
|
const uint32_t reg = reg_info->kinds[lldb::eRegisterKindLLDB];
|
|
|
|
if (reg == LLDB_INVALID_REGNUM)
|
|
- return Status("no lldb regnum for %s", reg_info && reg_info->name
|
|
- ? reg_info->name
|
|
- : "<unknown register>");
|
|
+ return Status::FromErrorStringWithFormat("no lldb regnum for %s",
|
|
+ reg_info && reg_info->name ?
|
|
+ reg_info->name :
|
|
+ "<unknown register>");
|
|
|
|
uint32_t set = GetRegisterInfo().GetRegisterSetFromRegisterIndex(reg);
|
|
error = ReadRegisterSet(set);
|