- Merge from trunk up to r45543

[reactos.git] / boot / freeldr / freeldr / freeldr.rbuild

diff --git a/boot/freeldr/freeldr/freeldr.rbuild b/boot/freeldr/freeldr/freeldr.rbuild
index 7e84351..dc83aaa 100644 (file)
--- a/boot/freeldr/freeldr/freeldr.rbuild
+++ b/boot/freeldr/freeldr/freeldr.rbuild
@@ -11,27 +11,36 @@
                        <library>freeldr_main</library>
                        <library>rossym</library>
                        <library>cmlib</library>
-                       <library>rtl_kmode</library>
+                       <library>rtl</library>
                        <library>libcntpr</library>
-                       <linkerflag>-static</linkerflag>
-                       <linkerflag>-lgcc</linkerflag>
+                       <group linkerset="ld">
+                               <linkerflag>-static</linkerflag>
+                               <linkerflag>-lgcc</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_arch</library>
                        <library>freeldr_main</library>
                        <library>rossym</library>
                        <library>cmlib</library>
                        <library>rtl</library>
                        <library>libcntpr</library>
-                       <linkerflag>-lgcc</linkerflag>
-                       <linkerflag>-static</linkerflag>
-                       <linkerflag>-Wl,--section-start,pagedata=0x50000</linkerflag>
+                       <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">
@@ -48,4 +57,22 @@
                        <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>