From 5d95e095c5b02d022f343d583195110ff8370382 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 22 Aug 2008 05:56:51 +0000
Subject: [PATCH] =?UTF-8?q?ARM9=E5=81=B4=E3=81=AE=EF=BC=AC=EF=BC=B4?=
 =?UTF-8?q?=EF=BC=A4=E3=82=BB=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=83=AA=E3=83=B3=E5=8C=96=E3=82=B9=E3=82=AF=E3=83=AA=E3=83=97?=
 =?UTF-8?q?=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2233 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../Launcher/ARM9/ARM9-TS.lcf.template         | 18 +++++++++++++++---
 build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf | 11 +++--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lcf.template b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lcf.template
index bdc95bb6..ab5ad204 100644
--- a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lcf.template
+++ b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lcf.template
@@ -53,8 +53,8 @@ MEMORY
 	<END.LTDOVERLAYS>
 
 	dummy.MAIN_EX.TWL			(RW)  :	ORIGIN = 0x0d000000,	LENGTH = 0x0
-	arena.MAIN.TWL				(RW)  :	ORIGIN = AFTER(<STATIC.NAME><FOREACH.OVERLAYS=MAIN>,<OVERLAY.NAME><END.OVERLAYS>,LTDMAIN<FOREACH.LTDOVERLAYS=MAIN>,<LTDOVERLAY.NAME><END.LTDOVERLAYS>),	LENGTH = 0x0
-	arena.MAIN_EX.TWL			(RW)  :	ORIGIN = AFTER(dummy.MAIN_EX.TWL,<STATIC.NAME><FOREACH.OVERLAYS=MAIN>,<OVERLAY.NAME><END.OVERLAYS>,LTDMAIN<FOREACH.LTDOVERLAYS=MAIN>,<LTDOVERLAY.NAME><END.LTDOVERLAYS>),	LENGTH = 0x0
+	arena.MAIN.TWL				(RW)  :	ORIGIN = AFTER(<STATIC.NAME><FOREACH.OVERLAYS=MAIN>,<OVERLAY.NAME><END.OVERLAYS><FOREACH.LTDOVERLAYS=MAIN>,<LTDOVERLAY.NAME><END.LTDOVERLAYS>),	LENGTH = 0x0
+	arena.MAIN_EX.TWL			(RW)  :	ORIGIN = AFTER(dummy.MAIN_EX.TWL,<STATIC.NAME><FOREACH.OVERLAYS=MAIN>,<OVERLAY.NAME><END.OVERLAYS><FOREACH.LTDOVERLAYS=MAIN>,<LTDOVERLAY.NAME><END.LTDOVERLAYS>),	LENGTH = 0x0
 
 	check.MAIN.TWL				(RW)  :	ORIGIN = 0x02000000,			LENGTH = 0x0f80000	>	main.twl.check
 
@@ -161,6 +161,12 @@ SECTIONS
 				<FOREACH.STATIC.LIBRARIES=.sdata>
 				<STATIC.LIBRARY=.sdata:t>
 				<END.STATIC.LIBRARIES>
+				<FOREACH.STATIC.OBJECTS=.ltdmain>
+				<STATIC.OBJECT=.ltdmain:t>
+				<END.STATIC.OBJECTS>
+				<FOREACH.STATIC.LIBRARIES=.ltdmain>
+				<STATIC.LIBRARY=.ltdmain:t>
+				<END.STATIC.LIBRARIES>
 				<FOREACH.STATIC.OBJECTS=.data>
 				<STATIC.OBJECT=.data:t>
 				<END.STATIC.OBJECTS>
@@ -214,6 +220,12 @@ SECTIONS
 				<FOREACH.STATIC.LIBRARIES=.sbss>
 				<STATIC.LIBRARY=.sbss:t>
 				<END.STATIC.LIBRARIES>
+				<FOREACH.STATIC.OBJECTS=.ltdmain>
+				<STATIC.OBJECT=.ltdmain.bss:t>
+				<END.STATIC.OBJECTS>
+				<FOREACH.STATIC.LIBRARIES=.ltdmain>
+				<STATIC.LIBRARY=.ltdmain.bss:t>
+				<END.STATIC.LIBRARIES>
 				<FOREACH.STATIC.OBJECTS=.bss>
 				<STATIC.OBJECT=.bss:t>
 				<END.STATIC.OBJECTS>
@@ -664,7 +676,7 @@ SECTIONS
 	########################### LTDAUTOLOADS ############################
 	SDK_LTDAUTOLOAD.LTDMAIN.START		= SDK_STATIC_BSS_END;
 	SDK_LTDAUTOLOAD.LTDMAIN.END			= SDK_LTDAUTOLOAD.LTDMAIN.START;
-	SDK_LTDAUTOLOAD.LTDMAIN.BSS_EDN		= SDK_LTDAUTOLOAD.LTDMAIN.START;
+	SDK_LTDAUTOLOAD.LTDMAIN.BSS_END		= SDK_LTDAUTOLOAD.LTDMAIN.START;
 	SDK_LTDAUTOLOAD.LTDMAIN.SIZE		= 0;
 	SDK_LTDAUTOLOAD.LTDMAIN.BSS_SIZE	= 0;
 	SDK_LTDAUTOLOAD_TOP_START			= 0x02400000;
diff --git a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf
index b4de7a96..e45a994c 100644
--- a/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf
+++ b/build/systemMenu_RED/Launcher/ARM9/ARM9-TS.lsf
@@ -23,6 +23,9 @@ Static $(TARGET_NAME)
 	Address		0x02680200
 	Object		$(OBJS_STATIC)
 	Library		$(LLIBS) $(GLIBS) $(CW_LIBS)
+	Object		* (.ltdmain)
+	Object		$(OBJS_LTDAUTOLOAD)
+	Library		$(LLIBS_EX) $(GLIBS_EX)
 }
 
 Autoload ITCM
@@ -43,11 +46,3 @@ Autoload DTCM
 	Object		$(OBJS_AUTOLOAD) (.sbss)
 }
 
-Ltdautoload LTDMAIN
-{
-	# NITRO/TWL 共有のオーバーレイが在る場合は、さらにその後ろに配置する必要があります。
-	After		$(TARGET_NAME)
-	Object		* (.ltdmain)
-	Object		$(OBJS_LTDAUTOLOAD)
-	Library		$(LLIBS_EX) $(GLIBS_EX)
-}