X-Git-Url: https://code.delx.au/refind/blobdiff_plain/cee29bbe756d31c517f874c668e33305642a504d..e07b72471fa62945801b4a4e3bcac662a1b4888d:/filesystems/Make.tiano

diff --git a/filesystems/Make.tiano b/filesystems/Make.tiano
index 7a5de97..b9ad0a8 100644
--- 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)
@@ -14,23 +14,28 @@ ifeq ($(ARCH),ia64)
 endif
 
 ifeq ($(ARCH),ia32)
-  ARCH_C_FLAGS = -m32
+  ARCH_C_FLAGS = -m32 -malign-double -g
   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
+#EDK2BASE = /usr/local/edk2
 
-# Below file defines TARGET (RELEASE or DEBUG), TARGET_ARCH (X64 or IA32), and TOOL_CHAIN_TAG (GCC44, GCC45, or GCC46)
+# Below file defines TARGET (RELEASE or DEBUG) 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 \
@@ -51,13 +56,13 @@ INCLUDE_DIRS    = -I $(EDK2BASE)/MdePkg \
 		  -I $(EDK2BASE)/EdkCompatibilityPkg/Foundation/Library/Dxe/Include
 
 FSW_NAMES       = fsw_efi fsw_core fsw_efi_lib fsw_lib AutoGen
-OBJS            = $(FSW_NAMES:=.o)
+OBJS            = $(FSW_NAMES:=.obj)
 #DRIVERNAME      = ext2
 BUILDME          = $(DRIVERNAME)_$(FILENAME_CODE).efi
 
 OPTIMFLAGS      = -fno-strict-aliasing -mno-red-zone -Wno-address -Os
 DEBUGFLAGS      = -Wall -Wno-missing-braces -Wno-array-bounds -ffunction-sections -fdata-sections
-CFLAGS          = $(OPTIMFLAGS) -g -fshort-wchar -fno-stack-protector $(DEBUGFLAGS) -c -include AutoGen.h
+CFLAGS          = $(OPTIMFLAGS) -g -fshort-wchar -fno-stack-protector $(DEBUGFLAGS) -c -include AutoGen.h -DHOST_EFI_EDK2
 
 prefix          = /usr/bin/
 CC              = $(prefix)gcc
@@ -72,9 +77,9 @@ 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
+%.obj: %.c
 	$(CC) $(ARCH_C_FLAGS) $(CFLAGS) $(INCLUDE_DIRS) -DFSTYPE=$(DRIVERNAME) -DNO_BUILTIN_VA_FUNCS -c $< -o $@
 
 ifneq (,$(filter %.efi,$(BUILDME)))
@@ -83,16 +88,16 @@ DLL_TARGET = $(subst .efi,.dll,$(BUILDME))
 
 all: $(BUILDME)
 
-$(DLL_TARGET): $(OBJS) fsw_$(DRIVERNAME).o
-	$(LD) -o $(DRIVERNAME)_$(FILENAME_CODE).dll $(LDFLAGS) --start-group $(ALL_EFILIBS) $(OBJS) fsw_$(DRIVERNAME).o --end-group
+$(DLL_TARGET): $(OBJS) fsw_$(DRIVERNAME).obj
+	$(LD) -o $(DRIVERNAME)_$(FILENAME_CODE).dll $(LDFLAGS) --start-group $(ALL_EFILIBS) $(OBJS) fsw_$(DRIVERNAME).obj --end-group
 
 $(BUILDME): $(DLL_TARGET)
 	$(OBJCOPY) --strip-unneeded $(DLL_TARGET)
 	$(GENFW) -e UEFI_DRIVER -o $(BUILDME) $(DLL_TARGET)
 #	$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel \
 #		   -j .rela -j .reloc --rename-section .data=.hii --target=efi-bsdrv-$(ARCH) $< $@
-	mkdir -p ../drivers
-	cp $(BUILDME) ../drivers
+	mkdir -p ../drivers_$(FILENAME_CODE)
+	cp $(BUILDME) ../drivers_$(FILENAME_CODE)
 
 endif