Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/lib/libunwind Gah, fix two typos.



details:   https://anonhg.NetBSD.org/src/rev/05a65aa27b78
branches:  trunk
changeset: 1026410:05a65aa27b78
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon Nov 22 16:41:00 2021 +0000

description:
Gah, fix two typos.

diffstat:

 sys/lib/libunwind/Makefile.inc  |  10 +++++-----
 sys/lib/libunwind/Registers.hpp |   4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 512bd280d5f2 -r 05a65aa27b78 sys/lib/libunwind/Makefile.inc
--- a/sys/lib/libunwind/Makefile.inc    Mon Nov 22 16:40:01 2021 +0000
+++ b/sys/lib/libunwind/Makefile.inc    Mon Nov 22 16:41:00 2021 +0000
@@ -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+=  -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 -r 512bd280d5f2 -r 05a65aa27b78 sys/lib/libunwind/Registers.hpp
--- a/sys/lib/libunwind/Registers.hpp   Mon Nov 22 16:40:01 2021 +0000
+++ b/sys/lib/libunwind/Registers.hpp   Mon Nov 22 16:41:00 2021 +0000
@@ -324,14 +324,14 @@
 
   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;



Home | Main Index | Thread Index | Old Index