[machdep] more robust regex for equivalent type identification

share/machdeps/make_machdep/make_machdep.py

@@ -191,7 +191,7 @@ def find_value(name, typ, output):
             return int(x)
 
     elif typ == "type":
-        expected = "([a-zA-Z_]+)"
+        expected = "'([^']+)'"
 
         def conversion(x):
             return x

share/machdeps/make_machdep/make_machdep_common.h

@@ -39,6 +39,6 @@
 #define mkstr(s) #s
 
 #define TEST_TYPE_COMPATIBLE(T1, T2)                                           \
-  _Static_assert(!COMPATIBLE(T1, T2), "" mkstr(T2) " is " #T1);
+  _Static_assert(!COMPATIBLE(T1, T2), "" mkstr(T2) " is '" #T1 "'");
 
 #define TEST_TYPE_IS(type) TEST_TYPE_COMPATIBLE(type, TEST_TYPE)

share/machdeps/make_machdep/size_t.c

@@ -23,5 +23,8 @@
 #include "make_machdep_common.h"
 #include <stddef.h>
 
-_Static_assert(!COMPATIBLE(unsigned int, size_t), "size_t is unsigned int");
-_Static_assert(!COMPATIBLE(unsigned long, size_t), "size_t is unsigned long");
+#define TEST_TYPE size_t
+
+TEST_TYPE_IS(unsigned int)
+TEST_TYPE_IS(unsigned long)
+TEST_TYPE_IS(unsigned long long)