Module Name:    src
Committed By:   rin
Date:           Mon May 31 21:31:34 UTC 2021

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

Log Message:
PR toolchain/55837

Stop using enum for flags, as per request from joerg.

#define constants and #undef after use.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 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/Registers.hpp
diff -u src/sys/lib/libunwind/Registers.hpp:1.27 src/sys/lib/libunwind/Registers.hpp:1.28
--- src/sys/lib/libunwind/Registers.hpp:1.27	Mon May 31 12:12:24 2021
+++ src/sys/lib/libunwind/Registers.hpp	Mon May 31 21:31:33 2021
@@ -332,6 +332,11 @@ enum {
   REGNO_ARM32_S31 = 80,
 };
 
+#define	FLAGS_VFPV2_USED		0x1
+#define	FLAGS_VFPV3_USED		0x2
+#define	FLAGS_LEGACY_VFPV2_REGNO	0x4
+#define	FLAGS_EXTENDED_VFPV2_REGNO	0x8
+
 class Registers_arm32 {
 public:
   enum {
@@ -438,15 +443,13 @@ private:
   uint32_t reg[REGNO_ARM32_SPSR + 1];
   uint32_t flags;
   uint64_t fpreg[32];
-
-  enum {
-    FLAGS_VFPV2_USED = 0x1,
-    FLAGS_VFPV3_USED = 0x2,
-    FLAGS_LEGACY_VFPV2_REGNO = 0x4,
-    FLAGS_EXTENDED_VFPV2_REGNO = 0x8,
-  };
 };
 
+#undef	FLAGS_VFPV2_USED
+#undef	FLAGS_VFPV3_USED
+#undef	FLAGS_LEGACY_VFPV2_REGNO
+#undef	FLAGS_EXTENDED_VFPV2_REGNO
+
 enum {
   DWARF_VAX_R0 = 0,
   DWARF_VAX_R15 = 15,

Reply via email to