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",