212212 "-i src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include" ,
213213 "-i src/PowerPC_EABI_Support/Runtime/Inc" ,
214214 "-i src/PowerPC_EABI_Support/MetroTRK" ,
215- "-Iinclude /dolphin" ,
215+ "-i include /dolphin" ,
216216 f"-DVERSION={ version_num } " ,
217217 "-D__GEKKO__" ,
218218]
245245 * cflags_base ,
246246 "-use_lmw_stmw on" ,
247247 "-str reuse,pool,readonly" ,
248- "-gccinc" ,
249248 "-common off" ,
250249 "-char signed" ,
251250]
291290 "-i src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include" ,
292291 "-i src/PowerPC_EABI_Support/Runtime/Inc" ,
293292 "-i src/PowerPC_EABI_Support/MetroTRK" ,
294- "-Iinclude /dolphin" ,
293+ "-i include /dolphin" ,
295294 f"-DVERSION={ version_num } " ,
296295 "-D__GEKKO__" ,
297296 "-DSDK_REVISION=2" ,
@@ -484,6 +483,7 @@ def MatchingFor(*versions):
484483 Object (MatchingFor ("GZ2E01" ), "f_pc/f_pc_draw.cpp" ),
485484 Object (MatchingFor ("GZ2E01" ), "f_pc/f_pc_fstcreate_req.cpp" ),
486485 Object (MatchingFor ("GZ2E01" ), "f_pc/f_pc_stdcreate_req.cpp" ),
486+ Object (NonMatching , "f_pc/f_pc_debug_sv.cpp" ),
487487 ],
488488 },
489489 {
@@ -1276,10 +1276,10 @@ def MatchingFor(*versions):
12761276 Object (MatchingFor ("GZ2E01" ), "PowerPC_EABI_Support/Runtime/Src/__va_arg.c" ),
12771277 Object (MatchingFor ("GZ2E01" ), "PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c" ),
12781278 Object (MatchingFor ("GZ2E01" ), "PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp" ),
1279- Object (NonMatching , "PowerPC_EABI_Support/Runtime/Src/NMWException.cp" ),
1279+ Object (MatchingFor ( "GZ2E01" ) , "PowerPC_EABI_Support/Runtime/Src/NMWException.cp" , extra_cflags = [ "-Cpp_exceptions on" ] ),
12801280 Object (MatchingFor ("GZ2E01" ), "PowerPC_EABI_Support/Runtime/Src/ptmf.c" ),
12811281 Object (MatchingFor ("GZ2E01" ), "PowerPC_EABI_Support/Runtime/Src/runtime.c" ),
1282- Object (NonMatching , "PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp" ),
1282+ Object (MatchingFor ( "GZ2E01" ) , "PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp" ),
12831283 Object (MatchingFor ("GZ2E01" ), "PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp" ),
12841284 Object (MatchingFor ("GZ2E01" ), "PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c" , extra_cflags = ["-str reuse,nopool,readonly" ]),
12851285 ],
@@ -1370,11 +1370,12 @@ def MatchingFor(*versions):
13701370 Object (MatchingFor ("GZ2E01" ), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c" ),
13711371 Object (MatchingFor ("GZ2E01" ), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c" ),
13721372 Object (MatchingFor ("GZ2E01" ), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c" ),
1373- Object (NonMatching , "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c" ),
1373+ Object (MatchingFor ( "GZ2E01" ) , "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c" ),
13741374 Object (MatchingFor ("GZ2E01" ), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c" ),
1375- Object (NonMatching , "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.c" , extra_cflags = [ "-func_align 32" ] ),
1375+ Object (MatchingFor ( "GZ2E01" ) , "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s" ),
13761376 Object (MatchingFor ("GZ2E01" ), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c" ),
1377- Object (NonMatching , "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c" ),
1377+ Object (MatchingFor ("GZ2E01" ), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s" ),
1378+ Object (MatchingFor ("GZ2E01" ), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c" ),
13781379 Object (MatchingFor ("GZ2E01" ), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c" ),
13791380 Object (MatchingFor ("GZ2E01" ), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c" ),
13801381 Object (MatchingFor ("GZ2E01" ), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c" ),
@@ -1402,12 +1403,12 @@ def MatchingFor(*versions):
14021403 },
14031404 {
14041405 "lib" : "odemuexi2" ,
1405- "mw_version" : MWVersion ( config . version ) ,
1406+ "mw_version" : "GC/1.2.5n" ,
14061407 "cflags" : cflags_runtime ,
14071408 "progress_category" : "sdk" ,
14081409 "host" : False ,
14091410 "objects" : [
1410- Object (NonMatching , "odemuexi2/DebuggerDriver.c" ),
1411+ Object (MatchingFor ( "GZ2E01" ) , "odemuexi2/DebuggerDriver.c" ),
14111412 ],
14121413 },
14131414 {
@@ -1431,7 +1432,7 @@ def MatchingFor(*versions):
14311432 "objects" : [
14321433 Object (MatchingFor ("GZ2E01" ), "REL/executor.c" ),
14331434 Object (
1434- NonMatching ,
1435+ MatchingFor ( "GZ2E01" ) ,
14351436 "REL/global_destructor_chain.c" ,
14361437 source = "PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c" ,
14371438 ),
@@ -1658,7 +1659,7 @@ def MatchingFor(*versions):
16581659 ActorRel (MatchingFor ("GZ2E01" ), "d_a_e_ph" ),
16591660 ActorRel (NonMatching , "d_a_e_pm" ),
16601661 ActorRel (NonMatching , "d_a_e_po" ),
1661- ActorRel (NonMatching , "d_a_e_pz" ),
1662+ ActorRel (Equivalent , "d_a_e_pz" , extra_cflags = [ '-pragma "nosyminline off"' ]), # weak func order, inline issue
16621663 ActorRel (NonMatching , "d_a_e_rb" ),
16631664 ActorRel (NonMatching , "d_a_e_rdb" ),
16641665 ActorRel (NonMatching , "d_a_e_rdy" ),
0 commit comments