summaryrefslogtreecommitdiff
path: root/sys/lib
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2021-11-22 16:41:00 +0000
committerthorpej <thorpej@NetBSD.org>2021-11-22 16:41:00 +0000
commit19f7e9f930a17a29ac552f207cc06d6416ba5197 (patch)
tree962a108165ae00b61213faa84285a069097ba89c /sys/lib
parentba371b8432ad8ca8992d7e5220757a248962f4ab (diff)
Gah, fix two typos.
Diffstat (limited to 'sys/lib')
-rw-r--r--sys/lib/libunwind/Makefile.inc10
-rw-r--r--sys/lib/libunwind/Registers.hpp4
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/lib/libunwind/Makefile.inc b/sys/lib/libunwind/Makefile.inc
index f85805d27a5..d164c398ce2 100644
--- a/sys/lib/libunwind/Makefile.inc
+++ b/sys/lib/libunwind/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2019/11/17 22:53:33 christos Exp $
+# $NetBSD: Makefile.inc,v 1.13 2021/11/22 16:41:00 thorpej Exp $
.PATH: ${NETBSDSRCDIR}/sys/lib/libunwind
@@ -13,7 +13,7 @@ COPTS.libunwind.cxx+= -fno-exceptions -fvisibility=hidden
COPTS.libunwind.cxx+= -Wno-old-style-cast
CPPFLAGS.libunwind.cxx+=-I${NETBSDSRCDIR}/sys/lib/libunwind
-.if ${LIBC_MACHINE_CPU} == "arm"
-COPTS.libunwind.cxx+= ${${ACTIVE_CC} == "gcc":? -mfpu=vfp3 :}
-AFLAGS.unwind_registers.S+= ${${ACTIVE_CC} == "clang":? -mfpu=vfp3 :}
-.endif
+#.if ${LIBC_MACHINE_CPU} == "arm"
+#COPTS.libunwind.cxx+= ${${ACTIVE_CC} == "gcc":? -mfpu=vfp3 :}
+#AFLAGS.unwind_registers.S+= ${${ACTIVE_CC} == "clang":? -mfpu=vfp3 :}
+#.endif
diff --git a/sys/lib/libunwind/Registers.hpp b/sys/lib/libunwind/Registers.hpp
index e86a53ae158..5b0fb985ba8 100644
--- a/sys/lib/libunwind/Registers.hpp
+++ b/sys/lib/libunwind/Registers.hpp
@@ -324,14 +324,14 @@ public:
uint64_t getRegister(int num) const {
assert(validRegister(num));
- if (reg == REGNO_AARCH64_SIGRETURN)
+ if (num == REGNO_AARCH64_SIGRETURN)
return sigreturn_reg;
return reg[num];
}
void setRegister(int num, uint64_t value) {
assert(validRegister(num));
- if (reg == REGNO_AARCH64_SIGRETURN)
+ if (num == REGNO_AARCH64_SIGRETURN)
sigreturn_reg = value;
else
reg[num] = value;