Skip to content

Commit e53c99f

Browse files
authored
Add language flags for ProDG (GCC on GC) (#1696)
* Add some specific ProDG flags * Revert extra flags and just add language detection
1 parent 1ba4314 commit e53c99f

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

backend/coreapp/compilers.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from coreapp.flags import (
1111
COMMON_ARMCC_FLAGS,
1212
COMMON_CLANG_FLAGS,
13+
COMMON_GCC_GC_FLAGS,
1314
COMMON_SHC_FLAGS,
1415
COMMON_GCC_FLAGS,
1516
COMMON_GCC_PS1_FLAGS,
@@ -141,6 +142,12 @@ class GCCPS2Compiler(GCCCompiler):
141142
flags: ClassVar[Flags] = COMMON_GCC_PS2_FLAGS
142143

143144

145+
@dataclass(frozen=True)
146+
class GCCGCCompiler(GCCCompiler):
147+
platform: Platform = GC_WII
148+
flags: ClassVar[Flags] = COMMON_GCC_GC_FLAGS
149+
150+
144151
@dataclass(frozen=True)
145152
class GCCSaturnCompiler(GCCCompiler):
146153
platform: Platform = SATURN
@@ -1205,31 +1212,31 @@ def available_platforms() -> List[Platform]:
12051212

12061213
PRODG_NGC_CC = "SN_NGC_PATH=${COMPILER_DIR} ${WINE} ${COMPILER_DIR}/ngccc.exe ${COMPILER_FLAGS} -o ${OUTPUT} ${INPUT}"
12071214

1208-
PRODG_35 = GCCCompiler(
1215+
PRODG_35 = GCCGCCompiler(
12091216
id="prodg_35",
12101217
platform=GC_WII,
12111218
cc=PRODG_NGC_CC,
12121219
)
12131220

1214-
PRODG_35_B140 = GCCCompiler(
1221+
PRODG_35_B140 = GCCGCCompiler(
12151222
id="prodg_35_b140",
12161223
platform=GC_WII,
12171224
cc=PRODG_NGC_CC,
12181225
)
12191226

1220-
PRODG_37 = GCCCompiler(
1227+
PRODG_37 = GCCGCCompiler(
12211228
id="prodg_37",
12221229
platform=GC_WII,
12231230
cc=PRODG_NGC_CC,
12241231
)
12251232

1226-
PRODG_381 = GCCCompiler(
1233+
PRODG_381 = GCCGCCompiler(
12271234
id="prodg_381",
12281235
platform=GC_WII,
12291236
cc=PRODG_NGC_CC,
12301237
)
12311238

1232-
PRODG_393 = GCCCompiler(
1239+
PRODG_393 = GCCGCCompiler(
12331240
id="prodg_393",
12341241
platform=GC_WII,
12351242
cc=PRODG_NGC_CC,

backend/coreapp/flags.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,16 @@ def to_json(self) -> Dict[str, Union[str, List[str]]]:
275275
FlagSet(id="gcc_arch", flags=["-m2"]),
276276
]
277277

278+
COMMON_GCC_GC_FLAGS: Flags = COMMON_GCC_FLAGS + [
279+
LanguageFlagSet(
280+
id="gcc_source_language",
281+
flags={
282+
"-x c": Language.C,
283+
"-x c++": Language.CXX,
284+
},
285+
),
286+
]
287+
278288
COMMON_MSVC_FLAGS: Flags = [
279289
FlagSet(
280290
id="msvc_opt_level", flags=["/Od", "/O1", "/O2", "/Os", "/Ot", "/Og", "/Ox"]

0 commit comments

Comments
 (0)