[OpenBIOS] [commit] r929 - in trunk/openbios-devel/arch: ppc ppc64 ppc64/qemu

repository service svn at openbios.org
Sat Oct 30 17:33:11 CEST 2010


Author: afaerber
Date: Sat Oct 30 17:33:11 2010
New Revision: 929
URL: http://tracker.coreboot.org/trac/openbios/changeset/929

Log:
ppc: Don't hardcode "ppc" arch for openbios-qemu.elf

Use $(ARCH) to allow using a different linker script for ppc64.

v2:
* Add ppc64/qemu/ldscript, derived from ppc/qemu/ldscript.

Signed-off-by: Andreas Färber <andreas.faerber at web.de>

Added:
   trunk/openbios-devel/arch/ppc64/
   trunk/openbios-devel/arch/ppc64/qemu/
   trunk/openbios-devel/arch/ppc64/qemu/ldscript
      - copied, changed from r928, trunk/openbios-devel/arch/ppc/qemu/ldscript
Modified:
   trunk/openbios-devel/arch/ppc/build.xml

Modified: trunk/openbios-devel/arch/ppc/build.xml
==============================================================================
--- trunk/openbios-devel/arch/ppc/build.xml	Sat Oct 30 17:19:58 2010	(r928)
+++ trunk/openbios-devel/arch/ppc/build.xml	Sat Oct 30 17:33:11 2010	(r929)
@@ -178,7 +178,7 @@
 
  <executable name="openbios-qemu.elf" target="target" condition="QEMU">
   <rule>
-	$(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/ppc/qemu/ldscript -o $@.nostrip --whole-archive $^,"  LINK  $(TARGET_DIR)$@")
+	$(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/$(ARCH)/qemu/ldscript -o $@.nostrip --whole-archive $^,"  LINK  $(TARGET_DIR)$@")
 	$(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-qemu.syms,"  GEN   $(TARGET_DIR)$@.syms")
 	$(call quiet-command,$(STRIP) $@.nostrip -o $@,"  STRIP $(TARGET_DIR)$@")</rule>
   <object source="qemu/start.S"/>

Copied and modified: trunk/openbios-devel/arch/ppc64/qemu/ldscript (from r928, trunk/openbios-devel/arch/ppc/qemu/ldscript)
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/ldscript	Sat Oct 30 17:19:58 2010	(r928, copy source)
+++ trunk/openbios-devel/arch/ppc64/qemu/ldscript	Sat Oct 30 17:33:11 2010	(r929)
@@ -1,5 +1,5 @@
-OUTPUT_FORMAT(elf32-powerpc)
-OUTPUT_ARCH(powerpc)
+OUTPUT_FORMAT(elf64-powerpc)
+OUTPUT_ARCH(powerpc:common64)
 
 /* Initial load address
  */



More information about the OpenBIOS mailing list