CVS commit: src/sys/lib/libunwind

[Jason R Thorpe]

Module Name:    src
Committed By:   thorpej
Date:           Mon Nov 22 16:41:00 UTC 2021

Modified Files:
        src/sys/lib/libunwind: Makefile.inc Registers.hpp

Log Message:
Gah, fix two typos.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/lib/libunwind/Makefile.inc
cvs rdiff -u -r1.35 -r1.36 src/sys/lib/libunwind/Registers.hpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/lib/libunwind/Makefile.inc
diff -u src/sys/lib/libunwind/Makefile.inc:1.12 src/sys/lib/libunwind/Makefile.inc:1.13
--- src/sys/lib/libunwind/Makefile.inc:1.12	Sun Nov 17 22:53:33 2019
+++ src/sys/lib/libunwind/Makefile.inc	Mon Nov 22 16:41:00 2021
@@ -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 -f
 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

Index: src/sys/lib/libunwind/Registers.hpp
diff -u src/sys/lib/libunwind/Registers.hpp:1.35 src/sys/lib/libunwind/Registers.hpp:1.36
--- src/sys/lib/libunwind/Registers.hpp:1.35	Mon Nov 22 16:40:01 2021
+++ src/sys/lib/libunwind/Registers.hpp	Mon Nov 22 16:41:00 2021
@@ -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;