- use g++ for c++ source files

github0null · web-flow · commit cbcfc9da71b8 · 2024-03-06T15:41:56.000+08:00
- support select gcc linker driver
diff --git a/lang/any.gcc.verify.json b/lang/any.gcc.verify.json
@@ -198,6 +198,7 @@
                     "description.zh-cn": "链接器类型",
                     "enum": [
                         "gcc",
+                        "g++",
                         "ld"
                     ]
                 },
diff --git a/lang/arm.gcc.verify.json b/lang/arm.gcc.verify.json
@@ -286,6 +286,17 @@
             "description.zh-cn": "链接器选项",
             "type": "object",
             "properties": {
+                "linker-driver": {
+                    "type": "string",
+                    "default": "auto",
+                    "description": "Linker Driver",
+                    "description.zh-cn": "链接器驱动程序",
+                    "enum": [
+                        "auto",
+                        "gcc",
+                        "g++"
+                    ]
+                },
                 "output-format": {
                     "type": "string",
                     "default": "elf",
diff --git a/lang/mips.mti.gcc.verify.json b/lang/mips.mti.gcc.verify.json
@@ -301,6 +301,17 @@
             "description.zh-cn": "链接器选项",
             "type": "object",
             "properties": {
+                "linker-driver": {
+                    "type": "string",
+                    "default": "auto",
+                    "description": "Linker Driver",
+                    "description.zh-cn": "链接器驱动程序",
+                    "enum": [
+                        "auto",
+                        "gcc",
+                        "g++"
+                    ]
+                },
                 "output-format": {
                     "type": "string",
                     "default": "elf",
diff --git a/lang/riscv.gcc.verify.json b/lang/riscv.gcc.verify.json
@@ -298,6 +298,17 @@
             "description.zh-cn": "链接器选项",
             "type": "object",
             "properties": {
+                "linker-driver": {
+                    "type": "string",
+                    "default": "auto",
+                    "description": "Linker Driver",
+                    "description.zh-cn": "链接器驱动程序",
+                    "enum": [
+                        "auto",
+                        "gcc",
+                        "g++"
+                    ]
+                },
                 "output-format": {
                     "type": "string",
                     "default": "elf",
diff --git a/res/data/models/unix/any.gcc.model.json b/res/data/models/unix/any.gcc.model.json
@@ -77,7 +77,7 @@
             "$output": "-o ${out} -MMD ${in}"
         },
         "cpp": {
-            "$path": "bin/${toolPrefix}gcc",
+            "$path": "bin/${toolPrefix}g++",
             "$includes": {
                 "body": "-I${value}"
             },
@@ -144,6 +144,45 @@
                 "command": ""
             }
         },
+        "linker-g++": {
+            "$path": "bin/${toolPrefix}g++",
+            "$libs": {
+                "body": "-L${value}"
+            },
+            "$invoke": {
+                "useFile": true,
+                "body": "@${value}"
+            },
+            "$output": "-o ${out} ${in} ${lib_flags}",
+            "$outputSuffix": ".elf",
+            "$linkMap": {
+                "type": "value",
+                "command": "-Wl,-Map=${mapPath}"
+            },
+            "$LIB_FLAGS": {
+                "type": "list",
+                "command": ""
+            },
+            "linker-script": {
+                "type": "list",
+                "command": "-T "
+            },
+            "remove-unused-input-sections": {
+                "type": "selectable",
+                "command": {
+                    "true": "-Wl,--gc-sections",
+                    "false": ""
+                }
+            },
+            "misc-control": {
+                "type": "list",
+                "command": ""
+            },
+            "LD_FLAGS": {
+                "type": "list",
+                "command": ""
+            }
+        },
         "linker-ld": {
             "$path": "bin/${toolPrefix}ld",
             "$libs": {
diff --git a/res/data/models/unix/arm.gcc.model.json b/res/data/models/unix/arm.gcc.model.json
@@ -318,7 +318,7 @@
             }
         },
         "cpp": {
-            "$path": "bin/${toolPrefix}gcc",
+            "$path": "bin/${toolPrefix}g++",
             "$includes": {
                 "body": "-I${value}"
             },
@@ -332,7 +332,6 @@
             "$output": "-o ${out} -MMD ${in}",
             "$default": [
                 "-c",
-                "-xc++",
                 "-mthumb"
             ],
             "$language-cpp": {
@@ -400,7 +399,8 @@
             }
         },
         "linker": {
-            "$path": "bin/${toolPrefix}gcc",
+            "$path": "bin/${toolPrefix}${toolName}",
+            "$defToolName": "gcc",
             "$libs": {
                 "body": "-L${value}"
             },
diff --git a/res/data/models/unix/mips.mti.gcc.model.json b/res/data/models/unix/mips.mti.gcc.model.json
@@ -195,7 +195,7 @@
             }
         },
         "cpp": {
-            "$path": "bin/${toolPrefix}gcc",
+            "$path": "bin/${toolPrefix}g++",
             "$includes": {
                 "body": "-I${value}"
             },
@@ -208,8 +208,7 @@
             },
             "$output": "-o ${out} -MMD ${in}",
             "$default": [
-                "-c",
-                "-xc++"
+                "-c"
             ],
             "$language-cpp": {
                 "type": "keyValue",
@@ -247,7 +246,8 @@
             }
         },
         "linker": {
-            "$path": "bin/${toolPrefix}gcc",
+            "$path": "bin/${toolPrefix}${toolName}",
+            "$defToolName": "gcc",
             "$libs": {
                 "body": "-L${value}"
             },
diff --git a/res/data/models/unix/riscv.gcc.model.json b/res/data/models/unix/riscv.gcc.model.json
@@ -206,7 +206,7 @@
             }
         },
         "cpp": {
-            "$path": "bin/${toolPrefix}gcc",
+            "$path": "bin/${toolPrefix}g++",
             "$includes": {
                 "body": "-I${value}"
             },
@@ -219,8 +219,7 @@
             },
             "$output": "-o ${out} -MMD ${in}",
             "$default": [
-                "-c",
-                "-xc++"
+                "-c"
             ],
             "$language-cpp": {
                 "type": "keyValue",
@@ -258,7 +257,8 @@
             }
         },
         "linker": {
-            "$path": "bin/${toolPrefix}gcc",
+            "$path": "bin/${toolPrefix}${toolName}",
+            "$defToolName": "gcc",
             "$libs": {
                 "body": "-L${value}"
             },
diff --git a/res/data/models/win32/any.gcc.model.json b/res/data/models/win32/any.gcc.model.json
@@ -77,7 +77,7 @@
             "$output": "-o ${out} -MMD ${in}"
         },
         "cpp": {
-            "$path": "bin\\${toolPrefix}gcc.exe",
+            "$path": "bin\\${toolPrefix}g++.exe",
             "$includes": {
                 "body": "-I${value}"
             },
@@ -144,6 +144,45 @@
                 "command": ""
             }
         },
+        "linker-g++": {
+            "$path": "bin\\${toolPrefix}g++.exe",
+            "$libs": {
+                "body": "-L${value}"
+            },
+            "$invoke": {
+                "useFile": true,
+                "body": "@${value}"
+            },
+            "$output": "-o ${out} ${in} ${lib_flags}",
+            "$outputSuffix": ".elf",
+            "$linkMap": {
+                "type": "value",
+                "command": "-Wl,-Map=${mapPath}"
+            },
+            "$LIB_FLAGS": {
+                "type": "list",
+                "command": ""
+            },
+            "remove-unused-input-sections": {
+                "type": "selectable",
+                "command": {
+                    "true": "-Wl,--gc-sections",
+                    "false": ""
+                }
+            },
+            "linker-script": {
+                "type": "list",
+                "command": "-T "
+            },
+            "misc-control": {
+                "type": "list",
+                "command": ""
+            },
+            "LD_FLAGS": {
+                "type": "list",
+                "command": ""
+            }
+        },
         "linker-ld": {
             "$path": "bin\\${toolPrefix}ld.exe",
             "$libs": {
diff --git a/res/data/models/win32/arm.gcc.model.json b/res/data/models/win32/arm.gcc.model.json
@@ -318,7 +318,7 @@
             }
         },
         "cpp": {
-            "$path": "bin\\${toolPrefix}gcc.exe",
+            "$path": "bin\\${toolPrefix}g++.exe",
             "$includes": {
                 "body": "-I${value}"
             },
@@ -332,7 +332,6 @@
             "$output": "-o ${out} -MMD ${in}",
             "$default": [
                 "-c",
-                "-xc++",
                 "-mthumb"
             ],
             "$language-cpp": {
@@ -400,7 +399,8 @@
             }
         },
         "linker": {
-            "$path": "bin\\${toolPrefix}gcc.exe",
+            "$path": "bin\\${toolPrefix}${toolName}.exe",
+            "$defToolName": "gcc",
             "$libs": {
                 "body": "-L${value}"
             },
diff --git a/res/data/models/win32/mips.mti.gcc.model.json b/res/data/models/win32/mips.mti.gcc.model.json
@@ -195,7 +195,7 @@
             }
         },
         "cpp": {
-            "$path": "bin\\${toolPrefix}gcc.exe",
+            "$path": "bin\\${toolPrefix}g++.exe",
             "$includes": {
                 "body": "-I${value}"
             },
@@ -208,8 +208,7 @@
             },
             "$output": "-o ${out} -MMD ${in}",
             "$default": [
-                "-c",
-                "-xc++"
+                "-c"
             ],
             "$language-cpp": {
                 "type": "keyValue",
@@ -247,7 +246,8 @@
             }
         },
         "linker": {
-            "$path": "bin\\${toolPrefix}gcc.exe",
+            "$path": "bin\\${toolPrefix}${toolName}.exe",
+            "$defToolName": "gcc",
             "$libs": {
                 "body": "-L${value}"
             },
diff --git a/res/data/models/win32/riscv.gcc.model.json b/res/data/models/win32/riscv.gcc.model.json
@@ -206,7 +206,7 @@
             }
         },
         "cpp": {
-            "$path": "bin\\${toolPrefix}gcc.exe",
+            "$path": "bin\\${toolPrefix}g++.exe",
             "$includes": {
                 "body": "-I${value}"
             },
@@ -219,8 +219,7 @@
             },
             "$output": "-o ${out} -MMD ${in}",
             "$default": [
-                "-c",
-                "-xc++"
+                "-c"
             ],
             "$language-cpp": {
                 "type": "keyValue",
@@ -258,7 +257,8 @@
             }
         },
         "linker": {
-            "$path": "bin\\${toolPrefix}gcc.exe",
+            "$path": "bin\\${toolPrefix}${toolName}.exe",
+            "$defToolName": "gcc",
             "$libs": {
                 "body": "-L${value}"
             },
diff --git a/src/CodeBuilder.ts b/src/CodeBuilder.ts
@@ -456,6 +456,20 @@ export abstract class CodeBuilder {
                 builderOptions.rom = undefined;
         }
 
+        // select linker driver for gcc family toolchain
+        if (toolchain.categoryName.toLowerCase() == 'gcc' && 
+            toolchain.name != 'ANY_GCC') {
+            let tool = builderOptions.options?.linker['linker-driver'];
+            // we need to detect source files type ?
+            if (tool == 'auto' || tool == undefined || tool == null) {
+                let hascpp = builderOptions.sourceList
+                    .some((path) => /\.(?:cpp|c\+\+|cc|cxx)$/i.test(path));
+                tool = hascpp ? 'g++' : 'gcc';
+            }
+            // setup tool name
+            builderOptions.options.linker['$toolName'] = tool;
+        }
+
         // handle options by toolchain
         toolchain.preHandleOptions({
             targetName: config.name,
@@ -472,7 +486,7 @@ export abstract class CodeBuilder {
         if (mk_txt) {
             try {
                 mkfile.Write(mk_txt);
-                let command: any =  {
+                let command: any = {
                     name: 'make libs',
                     command: `make --directory=./${outDir} --makefile=./${mkfile.name} all`
                 };
diff --git a/src/ToolchainManager.ts b/src/ToolchainManager.ts
@@ -2941,9 +2941,20 @@ class AnyGcc implements IToolchian {
 
         // convert output lib commmand
         if (options['linker']) {
-            if (options['linker']['linker-type'] == "ld") {
-                options['linker']['$use'] = 'linker-ld';
+            // driver type
+            switch (options['linker']['linker-type']) {
+                case 'ld':
+                    options['linker']['$use'] = 'linker-ld';
+                    break;
+                case 'g++':
+                    options['linker']['$use'] = 'linker-g++';
+                    break;
+                // gcc is default
+                case 'gcc':
+                default:
+                    break;
             }
+            // out format
             if (options['linker']['output-format'] == 'lib') {
                 options['linker']['$use'] = 'linker-lib';
             }

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,7 @@`
`198`	`198`	`"description.zh-cn": "链接器类型",`
`199`	`199`	`"enum": [`
`200`	`200`	`"gcc",`
	`201`	`+ "g++",`
`201`	`202`	`"ld"`
`202`	`203`	`]`
`203`	`204`	`},`