From 76f38c3165c84b55480a8dfde9f9c90d1bf3f66d Mon Sep 17 00:00:00 2001
From: t-karatsu <fj6085ge@fujitsu.com>
Date: Sat, 15 Feb 2020 05:14:26 +0900
Subject: [PATCH 1/2] Extend microarchitectures.json: Add
 cflags/cxxflags/fflags.

---
 cpu/microarchitectures.json        | 23 ++++++++++++++++++++++-
 cpu/microarchitectures_schema.json | 18 ++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/cpu/microarchitectures.json b/cpu/microarchitectures.json
index 51411d4..5cc9a60 100644
--- a/cpu/microarchitectures.json
+++ b/cpu/microarchitectures.json
@@ -1174,6 +1174,22 @@
             "versions": "5:",
             "flags": "-mcpu=thunderx2t99"
           }
+        ],
+        "fj": [
+          {
+            "version": ":4.0.0",
+            "flags": "-Knolargepage",
+            "cflags": "-Nclang",
+            "cxxflags": "-Nclang",
+            "fflags": "-KGENERIC_CPU -KNOSVE"
+          },
+          {
+            "version": "4.1.0:",
+            "flags": "-Knolargepage",
+            "cflags": "-Nclang -mcpu=thunderx2t99",
+            "cxxflags": "-Nclang -mcpu=thunderx2t99",
+            "fflags": "-KGENERIC_CPU -KNOSVE"
+          }
         ]
       }
     },
@@ -1230,7 +1246,12 @@
             "versions": "5:",
             "flags": "-march=armv8.2-a+crc+crypto+fp16+sve"
           }
-        ]
+        ],
+        "fj": {
+          "version": ":",
+          "cflags": "-Nclang",
+          "cxxflags": "-Nclang"
+        }
       }
     },
     "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": [

From 9aa61fba05438a4ed2754d3b3745f0eff8d02b2e Mon Sep 17 00:00:00 2001
From: t-karatsu <fj6085ge@fujitsu.com>
Date: Mon, 16 Mar 2020 14:03:06 +0900
Subject: [PATCH 2/2] FJ's optimization flags were modified.

---
 cpu/microarchitectures.json | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/cpu/microarchitectures.json b/cpu/microarchitectures.json
index 5cc9a60..1053ce4 100644
--- a/cpu/microarchitectures.json
+++ b/cpu/microarchitectures.json
@@ -1178,17 +1178,13 @@
         "fj": [
           {
             "version": ":4.0.0",
-            "flags": "-Knolargepage",
-            "cflags": "-Nclang",
-            "cxxflags": "-Nclang",
-            "fflags": "-KGENERIC_CPU -KNOSVE"
+            "default": "-Knolargepage -Nclang",
+            "fortran": "-Knolargepage -KGENERIC_CPU -KNOSVE"
           },
           {
             "version": "4.1.0:",
-            "flags": "-Knolargepage",
-            "cflags": "-Nclang -mcpu=thunderx2t99",
-            "cxxflags": "-Nclang -mcpu=thunderx2t99",
-            "fflags": "-KGENERIC_CPU -KNOSVE"
+            "default": "-Knolargepage -Nclang -mcpu=thunderx2t99",
+            "fortran": "-Knolargepage -KGENERIC_CPU -KNOSVE"
           }
         ]
       }
@@ -1249,8 +1245,8 @@
         ],
         "fj": {
           "version": ":",
-          "cflags": "-Nclang",
-          "cxxflags": "-Nclang"
+          "default": "-Nclang",
+          "fortran": ""
         }
       }
     },