r629 - in trunk/openbios-devel/arch: ppc sparc32 sparc64 unix

Author: laurent
Date: 2009-11-22 10:53:54 +0100 (Sun, 22 Nov 2009)
New Revision: 629

Modified:
   trunk/openbios-devel/arch/ppc/build.xml
   trunk/openbios-devel/arch/sparc32/build.xml
   trunk/openbios-devel/arch/sparc64/build.xml
   trunk/openbios-devel/arch/unix/build.xml
Log:
Change link edition order to move libc after libfs, allowing libfs to
use functions from libc.

Signed-off-by: Laurent Vivier

Modified: trunk/openbios-devel/arch/ppc/build.xml
===================================================================
--- trunk/openbios-devel/arch/ppc/build.xml	2009-11-22 09:50:54 UTC (rev 628)
+++ trunk/openbios-devel/arch/ppc/build.xml	2009-11-22 09:53:54 UTC (rev 629)
@@ -155,8 +155,8 @@
   <external-object source="libbootstrap.a"/>
   <external-object source="libmodules.a"/>
   <external-object source="libdrivers.a"/>
+  <external-object source="libfs.a"/>
   <external-object source="liblibc.a"/>
-  <external-object source="libfs.a"/>
  </executable>

<executable name="openbios-pearpc.elf" target="target" condition="PEARPC">
@@ -170,8 +170,8 @@
   <external-object source="libbootstrap.a"/>
   <external-object source="libmodules.a"/>
   <external-object source="libdrivers.a"/>
+  <external-object source="libfs.a"/>
   <external-object source="liblibc.a"/>
-  <external-object source="libfs.a"/>
  </executable>

<executable name="openbios-qemu.elf" target="target" condition="QEMU">
@@ -185,8 +185,8 @@
   <external-object source="libbootstrap.a"/>
   <external-object source="libmodules.a"/>
   <external-object source="libdrivers.a"/>
+  <external-object source="libfs.a"/>
   <external-object source="liblibc.a"/>
-  <external-object source="libfs.a"/>
   <external-object source="libgcc.a"/>
  </executable>

@@ -200,8 +200,8 @@
   <external-object source="libbootstrap.a"/>
   <external-object source="libmodules.a"/>
   <external-object source="libdrivers.a"/>
+  <external-object source="libfs.a"/>
   <external-object source="liblibc.a"/>
-  <external-object source="libfs.a"/>
  </executable>

</build>

Modified: trunk/openbios-devel/arch/sparc32/build.xml
===================================================================
--- trunk/openbios-devel/arch/sparc32/build.xml	2009-11-22 09:50:54 UTC (rev 628)
+++ trunk/openbios-devel/arch/sparc32/build.xml	2009-11-22 09:53:54 UTC (rev 629)
@@ -34,8 +34,8 @@
   <external-object source="libbootstrap.a"/>
   <external-object source="libmodules.a"/>
   <external-object source="libdrivers.a"/>
+  <external-object source="libfs.a"/>
   <external-object source="liblibc.a"/>
-  <external-object source="libfs.a"/>
   <external-object source="libgcc.a"/>
  </executable>

@@ -68,8 +68,8 @@
   <external-object source="libbootstrap.a"/>
   <external-object source="libmodules.a"/>
   <external-object source="libdrivers.a"/>
+  <external-object source="libfs.a"/>
   <external-object source="liblibc.a"/>
-  <external-object source="libfs.a"/>
   <external-object source="libgcc.a"/>
  </executable>

Modified: trunk/openbios-devel/arch/sparc64/build.xml
===================================================================
--- trunk/openbios-devel/arch/sparc64/build.xml	2009-11-22 09:50:54 UTC (rev 628)
+++ trunk/openbios-devel/arch/sparc64/build.xml	2009-11-22 09:53:54 UTC (rev 629)
@@ -35,8 +35,8 @@
   <external-object source="libbootstrap.a"/>
   <external-object source="libmodules.a"/>
   <external-object source="libdrivers.a"/>
+  <external-object source="libfs.a"/>
   <external-object source="liblibc.a"/>
-  <external-object source="libfs.a"/>
   <external-object source="libgcc.a"/>
  </executable>

@@ -70,8 +70,8 @@
   <external-object source="libbootstrap.a"/>
   <external-object source="libmodules.a"/>
   <external-object source="libdrivers.a"/>
+  <external-object source="libfs.a"/>
   <external-object source="liblibc.a"/>
-  <external-object source="libfs.a"/>
   <external-object source="libgcc.a"/>
  </executable>

Modified: trunk/openbios-devel/arch/unix/build.xml
===================================================================
--- trunk/openbios-devel/arch/unix/build.xml	2009-11-22 09:50:54 UTC (rev 628)
+++ trunk/openbios-devel/arch/unix/build.xml	2009-11-22 09:53:54 UTC (rev 629)
@@ -15,8 +15,8 @@
   <external-object source="libbootstrap.a"/>
   <external-object source="libmodules.a"/>
   <external-object source="libdrivers.a"/>
+  <external-object source="libfs.a"/>
   <external-object source="liblibc.a"/>
-  <external-object source="libfs.a"/>
  </executable>

</build>