Improved TianoCore build procedure; can now build both x86-64 and x86

[refind] / filesystems / Make.tiano

diff --git a/filesystems/Make.tiano b/filesystems/Make.tiano
index 18c85b978bdd8be3416fed29a0b79cb51dc8caf6..960a651bdf9e4a3f8d4a9c08e8fd3a5b8cf3d1b2 100644 (file)
--- a/filesystems/Make.tiano
+++ b/filesystems/Make.tiano
@@ -4,7 +4,7 @@
 #
 
 HOSTARCH        = $(shell uname -m | sed s,i[3456789]86,ia32,)
-ARCH            := $(HOSTARCH)
+ARCH            ?= $(HOSTARCH)
 
 # Note: IA64 options are untested; taken from Debian's rEFIt package.
 ifeq ($(ARCH),ia64)
@@ -16,13 +16,17 @@ endif
 ifeq ($(ARCH),ia32)
   ARCH_C_FLAGS = -m32 -malign-double
   ARCHDIR = Ia32
+  UC_ARCH = IA32
   FILENAME_CODE = ia32
+  LD_CODE = elf_i386
 endif
 
 ifeq ($(ARCH),x86_64)
   ARCH_C_FLAGS = "-DEFIAPI=__attribute__((ms_abi))" -mcmodel=large -m64
   ARCHDIR = X64
+  UC_ARCH = X64
   FILENAME_CODE = x64
+  LD_CODE = elf_x86_64
 endif
 
 EDK2BASE = /usr/local/UDK2010/MyWorkSpace
@@ -31,7 +35,7 @@ EDK2BASE = /usr/local/UDK2010/MyWorkSpace
 # Below file defines TARGET (RELEASE or DEBUG), TARGET_ARCH (X64 or IA32), and TOOL_CHAIN_TAG (GCC44, GCC45, or GCC46)
 include $(EDK2BASE)/Conf/target.txt
 
-EFILIB          = $(EDK2BASE)/Build/MdeModule/$(TARGET)_$(TOOL_CHAIN_TAG)/$(TARGET_ARCH)/MdePkg/Library
+EFILIB          = $(EDK2BASE)/Build/Mde/$(TARGET)_$(TOOL_CHAIN_TAG)/$(UC_ARCH)/MdePkg/Library
 ALL_EFILIBS     = $(EFILIB)/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib/OUTPUT/BaseDebugPrintErrorLevelLib.lib \
                  $(EFILIB)/BasePrintLib/BasePrintLib/OUTPUT/BasePrintLib.lib \
                  $(EFILIB)/BasePcdLibNull/BasePcdLibNull/OUTPUT/BasePcdLibNull.lib \
@@ -73,7 +77,7 @@ GENFW           = $(EDK2BASE)/BaseTools/Source/C/bin/GenFw
 LDSCRIPT = $(EDK2BASE)/BaseTools/Scripts/gcc4.4-ld-script
 
 LDFLAGS         = -nostdlib -n -q --gc-sections --script=$(EDK2BASE)/BaseTools/Scripts/gcc4.4-ld-script \
-                  --entry _ModuleEntryPoint -u _ModuleEntryPoint
+                  --entry _ModuleEntryPoint -u _ModuleEntryPoint -m $(LD_CODE)
 
 %.o: %.c
        $(CC) $(ARCH_C_FLAGS) $(CFLAGS) $(INCLUDE_DIRS) -DFSTYPE=$(DRIVERNAME) -DNO_BUILTIN_VA_FUNCS -c $< -o $@