X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=boot%2Ffreeldr%2Ffreeldr%2Ffreeldr.rbuild;h=8e70ac92fd869a0a8b4e3905c11371bab00fd7e6;hp=70974fda396af2fdaa9e8f28503e85963e2ab1c3;hb=82822656c3b240860ac8d5db139c56285634e8a5;hpb=251d21958c0cf60b190bfac974ae8db66309abb8

diff --git a/boot/freeldr/freeldr/freeldr.rbuild b/boot/freeldr/freeldr/freeldr.rbuild
index 70974fda396..8e70ac92fd8 100644
--- a/boot/freeldr/freeldr/freeldr.rbuild
+++ b/boot/freeldr/freeldr/freeldr.rbuild
@@ -1,86 +1,36 @@
 <?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 
-<if property="ARCH" value="i386">
-	<property name="BASEADDRESS_FREELDR" value="0x8000" />
-<endif>
+<if property="ARCH" value="powerpc">
+	<module name="ofwldr" type="elfexecutable" buildtype="OFWLDR">
+		<library>freeldr_startup</library>
+		<library>freeldr_base64k</library>
+		<library>freeldr_base</library>
+		<library>freeldr_arch</library>
+		<library>freeldr_main</library>
+		<library>rossym</library>
+		<library>cmlib</library>
+		<library>rtl</library>
+		<library>libcntpr</library>
+		<library>ppcmmu</library>
+	</module>
+</if>
 
-<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
-<group>
-	<if property="ARCH" value="i386">
-		<module name="freeldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)">
-			<linkerscript>freeldr_$(ARCH).lnk</linkerscript>
-			<bootstrap installbase="loader" />
-			<library>freeldr_startup</library>
-			<library>freeldr_base64k</library>
-			<library>freeldr_base</library>
+<ifnot property="ARCH" value="powerpc">
+	<module name="freeldr" type="bootloader" baseaddress="$(BASEADDRESS_FREELDR)">
+		<linkerscript>freeldr_$(ARCH).lnk</linkerscript>
+		<bootstrap installbase="loader" />
+		<library>freeldr_startup</library>
+		<library>freeldr_base64k</library>
+		<library>freeldr_base</library>
+		<if property="ARCH" value="i386">
 			<library>mini_hal</library>
-			<library>freeldr_arch</library>
-			<library>freeldr_main</library>
-			<library>rossym</library>
-			<library>cmlib</library>
-			<library>rtl</library>
-			<library>libcntpr</library>
-			<group linkerset="ld">
-				<!-- linkerflag>-static</linkerflag -->
-				<linkerflag>-nostartfiles</linkerflag>
-
-			</group>
-		</module>
-	</if>
-	<if property="ARCH" value="arm">
-		<module name="freeldr" type="bootloader" installbase=".." installname="freeldr.sys">
-			<bootstrap installbase="loader" />
-			<library>freeldr_arch</library>
-			<library>freeldr_startup</library>
-			<library>freeldr_base64k</library>
-			<library>freeldr_base</library>
-			<library>freeldr_main</library>
-			<library>rossym</library>
-			<library>cmlib</library>
-			<library>rtl</library>
-			<library>libcntpr</library>
-			<group linkerset="ld">
-			    <linkerflag>-static</linkerflag>
-				<linkerflag>-lgcc</linkerflag>
-			    <if property="SARCH" value="omap3">
-			        <linkerflag>-Wl,--image-base=0x80FFF000</linkerflag>
-			    </if>
-                <if property="SARCH" value="versatile">
-			        <linkerflag>-Wl,--image-base=0x0001F000</linkerflag>
-			    </if>				
-			</group>
-		</module>
-	</if>
-	<if property="ARCH" value="powerpc">
-		<module name="ofwldr" type="elfexecutable" buildtype="OFWLDR">
-			<library>freeldr_startup</library>
-			<library>freeldr_base64k</library>
-			<library>freeldr_base</library>
-			<library>freeldr_arch</library>
-			<library>freeldr_main</library>
-			<library>rossym</library>
-			<library>cmlib</library>
-			<library>rtl</library>
-			<library>libcntpr</library>
-			<library>ppcmmu</library>
-		</module>
-	</if>
-	<if property="ARCH" value="amd64">
-		<module name="freeldr" type="bootloader">
-			<bootstrap installbase="loader" />
-			<library>freeldr_startup</library>
-			<library>freeldr_base64k</library>
-			<library>freeldr_base</library>
-			<library>freeldr_arch</library>
-			<library>freeldr_main</library>
-			<library>rossym</library>
-			<library>cmlib</library>
-			<library>rtl</library>
-			<library>libcntpr</library>
-			<group linkerset="ld">
-				<linkerflag>-static</linkerflag>
-				<linkerflag>-lgcc</linkerflag>
-			</group>
-		</module>
-	</if>
-</group>
+		</if>
+		<library>freeldr_arch</library>
+		<library>freeldr_main</library>
+		<library>rossym</library>
+		<library>cmlib</library>
+		<library>rtl</library>
+		<library>libcntpr</library>
+	</module>
+</ifnot>