[OpenBIOS] r61 - in openbios-devel: . arch/sparc32 arch/sparc64 config/examples libgcc
svn@openbios.org
svn at openbios.org
Sat Jun 10 04:22:45 CEST 2006
Author: stepan
Date: 2006-06-10 04:22:45 +0200 (Sat, 10 Jun 2006)
New Revision: 61
Added:
openbios-devel/libgcc/
Removed:
openbios-devel/arch/sparc32/libgcc/
Modified:
openbios-devel/Makefile
openbios-devel/arch/sparc32/build.xml
openbios-devel/arch/sparc64/build.xml
openbios-devel/build.xml
openbios-devel/config/examples/cross-sparc64_rules.xml
openbios-devel/libgcc/build.xml
Log:
get sparc64 build some further
move libgcc to top level
Modified: openbios-devel/Makefile
===================================================================
--- openbios-devel/Makefile 2006-06-10 02:04:54 UTC (rev 60)
+++ openbios-devel/Makefile 2006-06-10 02:22:45 UTC (rev 61)
@@ -23,7 +23,7 @@
@mkdir -p $(ODIR)/target/arch/ppc/pearpc
@mkdir -p $(ODIR)/target/arch/ppc/mol
@mkdir -p $(ODIR)/target/arch/x86/xbox
- @mkdir -p $(ODIR)/target/arch/sparc32/libgcc
+ @mkdir -p $(ODIR)/target/libgcc
@mkdir -p $(ODIR)/target/kernel
@mkdir -p $(ODIR)/target/modules
@mkdir -p $(ODIR)/target/fs/grubfs
Modified: openbios-devel/arch/sparc32/build.xml
===================================================================
--- openbios-devel/arch/sparc32/build.xml 2006-06-10 02:04:54 UTC (rev 60)
+++ openbios-devel/arch/sparc32/build.xml 2006-06-10 02:22:45 UTC (rev 61)
@@ -1,7 +1,5 @@
<build condition="SPARC32">
- <include href="libgcc/build.xml"/>
-
<dictionary name="openbios-sparc32" init="openbios">
<object source="tree.fs" target="forth"/>
<object source="init.fs" target="forth"/>
@@ -35,25 +33,6 @@
]]></rule>
</executable>
- <executable name="openbios.multiboot" target="target" condition="IMAGE_ELF_MULTIBOOT">
- <rule>
- $(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^
- $(NM) $@.nostrip | sort > $(ODIR)/openbios-multiboot.syms
- cp $@.nostrip $@
- $(STRIP) $@
- </rule>
- <object source="multiboot.c"/>
- <external-object source="target/arch/sparc32/vectors.o"/>
- <external-object source="target/arch/sparc32/entry.o"/>
- <external-object source="libsparc32.a"/>
- <external-object source="libbootstrap.a"/>
- <external-object source="libmodules.a"/>
- <external-object source="libdrivers.a"/>
- <external-object source="liblibc.a"/>
- <external-object source="libfs.a"/>
- <external-object source="libgcc.a"/>
- </executable>
-
<executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF">
<rule>
$(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^
Modified: openbios-devel/arch/sparc64/build.xml
===================================================================
--- openbios-devel/arch/sparc64/build.xml 2006-06-10 02:04:54 UTC (rev 60)
+++ openbios-devel/arch/sparc64/build.xml 2006-06-10 02:22:45 UTC (rev 61)
@@ -30,23 +30,6 @@
]]></rule>
</executable>
- <executable name="openbios.multiboot" target="target" condition="IMAGE_ELF_MULTIBOOT">
- <rule>
- $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^
- $(NM) $@.nostrip | sort > $(ODIR)/openbios-multiboot.syms
- cp $@.nostrip $@
- $(STRIP) $@
- </rule>
- <object source="multiboot.c"/>
- <external-object source="target/arch/sparc64/vectors.o"/>
- <external-object source="target/arch/sparc64/entry.o"/>
- <external-object source="libsparc64.a"/>
- <external-object source="libbootstrap.a"/>
- <external-object source="libmodules.a"/>
- <external-object source="libdrivers.a"/>
- <external-object source="liblibc.a"/>
- <external-object source="libfs.a"/>
- </executable>
<executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF">
<rule>
@@ -64,6 +47,7 @@
<external-object source="libdrivers.a"/>
<external-object source="liblibc.a"/>
<external-object source="libfs.a"/>
+ <external-object source="libgcc.a"/>
</executable>
<!-- HACK ALERT -->
@@ -103,6 +87,7 @@
<external-object source="libdrivers.a"/>
<external-object source="liblibc.a"/>
<external-object source="libfs.a"/>
+ <external-object source="libgcc.a"/>
</executable>
</build>
Modified: openbios-devel/build.xml
===================================================================
--- openbios-devel/build.xml 2006-06-10 02:04:54 UTC (rev 60)
+++ openbios-devel/build.xml 2006-06-10 02:22:45 UTC (rev 61)
@@ -5,6 +5,7 @@
<include href="toke/build.xml"/>
<include href="forth/build.xml"/>
<include href="libc/build.xml"/>
+ <include href="libgcc/build.xml"/>
<include href="modules/build.xml"/>
<include href="drivers/build.xml"/>
<include href="fs/build.xml"/>
Modified: openbios-devel/config/examples/cross-sparc64_rules.xml
===================================================================
--- openbios-devel/config/examples/cross-sparc64_rules.xml 2006-06-10 02:04:54 UTC (rev 60)
+++ openbios-devel/config/examples/cross-sparc64_rules.xml 2006-06-10 02:22:45 UTC (rev 61)
@@ -13,13 +13,13 @@
HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS)
HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include
-CC := sparc-linux-gcc
-AS := sparc-linux-as
-AR := sparc-linux-ar
-LD := sparc-linux-ld
-NM := sparc-linux-nm
-STRIP := sparc-linux-strip
-RANLIB := sparc-linux-ranlib
+CC := sparc64-linux-gcc
+AS := sparc64-linux-as
+AR := sparc64-linux-ar
+LD := sparc64-linux-ld
+NM := sparc64-linux-nm
+STRIP := sparc64-linux-strip
+RANLIB := sparc64-linux-ranlib
CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g
CFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany
CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations
Copied: openbios-devel/libgcc (from rev 59, openbios-devel/arch/sparc32/libgcc)
Modified: openbios-devel/libgcc/build.xml
===================================================================
--- openbios-devel/arch/sparc32/libgcc/build.xml 2006-06-10 01:41:02 UTC (rev 59)
+++ openbios-devel/libgcc/build.xml 2006-06-10 02:22:45 UTC (rev 61)
@@ -1,4 +1,4 @@
-<build condition="SPARC32">
+<build>
<library name="gcc" type="static" target="target">
<object source="ashldi3.c"/>
More information about the OpenBIOS
mailing list