Get GCC to mostly build with Cosmo

tool/emacs/c.lang

@@ -83,7 +83,6 @@ Keywords={
 "__msabi",
 "offsetof",
 "microarchitecture",
-"targetclones",
 "forcealignargpointer",
 "textexit",
 "externinline",
@@ -125,7 +124,7 @@ Keywords={
 "noreturn",
 "initarray",
 "mayalias",
-"noinstrument",
+"dontinstrument",
 "interruptfn",
 "nocallback",
 "textstartup",

tool/emacs/cosmo-c-keywords.el

@@ -29,8 +29,7 @@
            "__funline"
            "function"
            "offsetof"
-           "microarchitecture"
-           "targetclones"
+           "_Microarchitecture"
            "forcealignargpointer"
            "textexit"
            "externinline"
@@ -59,7 +58,8 @@
            "antiquity"
            "memcpyesque"
            "libcesque"
-           "artificial"
+           "unrollloops"
+           "__artificial"
            "returnstwice"
            "returnsaligned"
            "noprune"
@@ -78,7 +78,7 @@
            "nostackprotector"
            "initarray"
            "mayalias"
-           "noinstrument"
+           "dontinstrument"
            "interruptfn"
            "nocallback"
            "textstartup"

tool/emacs/key.py

@@ -347,7 +347,7 @@ cosmo_kws = frozenset([
   "nodebuginfo",
   "dontdiscard",
   "dontinline",
-  "noinstrument",
+  "dontinstrument",
   "nointerpose",
   "dontoptimize",
   "noprune",

tool/plinko/lib/char.h

@@ -27,7 +27,7 @@ static inline pureconst bool IsControl(int c) {
   return (0 <= c && c <= 0x1F) || (0x7F <= c && c <= 0x9F);
 }
 
-static noinstrument pureconst inline int ToUpper(int c) {
+static dontinstrument pureconst inline int ToUpper(int c) {
   return 'a' <= c && c <= 'z' ? 'A' - 'a' + c : c;
 }
 

tool/plinko/lib/read.c

@@ -32,7 +32,7 @@
 static int Read1(int);
 static int Read2(int);
 
-noinstrument int ReadSpaces(int fd) {
+dontinstrument int ReadSpaces(int fd) {
   size_t n;
   ssize_t rc;
   for (;;) {
@@ -64,13 +64,13 @@ noinstrument int ReadSpaces(int fd) {
   }
 }
 
-noinstrument int ReadByte(int fd) {
+dontinstrument int ReadByte(int fd) {
   int c;
   if ((c = g_buffer[fd][bp[fd]++] & 255)) return c;
   return ReadSpaces(fd);
 }
 
-noinstrument int ReadChar(int fd) {
+dontinstrument int ReadChar(int fd) {
   int b, a = dx;
   for (;;) {
     dx = ReadByte(fd);

tool/viz/derasterize.c

@@ -312,8 +312,8 @@ static unsigned combinecolors(unsigned char bf[1u << MC][2],
     return r;                                                     \
   }
 
-ADJUDICATE(adjudicate_avx2, microarchitecture("avx2,fma"))
-ADJUDICATE(adjudicate_avx, microarchitecture("avx"))
+ADJUDICATE(adjudicate_avx2, _Microarchitecture("avx2,fma"))
+ADJUDICATE(adjudicate_avx, _Microarchitecture("avx"))
 ADJUDICATE(adjudicate_default, )
 
 static float (*adjudicate_hook)(unsigned, unsigned, unsigned,