diff --git a/cpu/microarchitectures.json b/cpu/microarchitectures.json
index 51411d4..1053ce4 100644
--- a/cpu/microarchitectures.json
+++ b/cpu/microarchitectures.json
@@ -1174,6 +1174,18 @@
             "versions": "5:",
             "flags": "-mcpu=thunderx2t99"
           }
+        ],
+        "fj": [
+          {
+            "version": ":4.0.0",
+            "default": "-Knolargepage -Nclang",
+            "fortran": "-Knolargepage -KGENERIC_CPU -KNOSVE"
+          },
+          {
+            "version": "4.1.0:",
+            "default": "-Knolargepage -Nclang -mcpu=thunderx2t99",
+            "fortran": "-Knolargepage -KGENERIC_CPU -KNOSVE"
+          }
         ]
       }
     },
@@ -1230,7 +1242,12 @@
             "versions": "5:",
             "flags": "-march=armv8.2-a+crc+crypto+fp16+sve"
           }
-        ]
+        ],
+        "fj": {
+          "version": ":",
+          "default": "-Nclang",
+          "fortran": ""
+        }
       }
     },
     "arm": {
diff --git a/cpu/microarchitectures_schema.json b/cpu/microarchitectures_schema.json
index d662757..c0b5b79 100644
--- a/cpu/microarchitectures_schema.json
+++ b/cpu/microarchitectures_schema.json
@@ -55,6 +55,15 @@
                         },
                         "flags": {
                           "type": "string"
+                        },
+                        "cflags": {
+                          "type": "string"
+                        },
+                        "cxxflags": {
+                          "type": "string"
+                        },
+                        "fflags": {
+                          "type": "string"
                         }
                       },
                       "required": [
@@ -76,6 +85,15 @@
                           },
                           "flags": {
                             "type": "string"
+                          },
+                          "cflags": {
+                            "type": "string"
+                          },
+                          "cxxflags": {
+                            "type": "string"
+                          },
+                          "fflags": {
+                            "type": "string"
                           }
                         },
                         "required": [