Work around keyboard input problem in gptsync on some Macs. Minor

[refind] / filesystems / Make.tiano

diff --git a/filesystems/Make.tiano b/filesystems/Make.tiano
index 39cdfa54f16a64c1502aa3f7f6e7c735c7a4f864..537c0e0b81cd91c0f5cf7495e3fa863162af8f5a 100644 (file)
--- a/filesystems/Make.tiano
+++ b/filesystems/Make.tiano
@@ -3,37 +3,15 @@
 # Build control file for rEFInd's EFI filesystem drivers
 #
 
-HOSTARCH        = $(shell uname -m | sed s,i[3456789]86,ia32,)
-ARCH            ?= $(HOSTARCH)
-
-# Note: IA64 options are untested; taken from Debian's rEFIt package.
-ifeq ($(ARCH),ia64)
-  # EFI specs allows only lower floating point partition to be used
-  ARCH_C_CFLAGS  = -frename-registers -mfixed-range=f32-f127
-  # TODO: Add ARCHDIR and FILENAME_CODE as appropriate
-endif
-
-ifeq ($(ARCH),ia32)
-  ARCH_C_FLAGS = -m32 -malign-double -g
-  ARCHDIR = Ia32
-  UC_ARCH = IA32
-  FILENAME_CODE = ia32
-  LD_CODE = elf_i386
-endif
+# This program is licensed under the terms of the GNU GPL, version 3,
+# or (at your option) any later version.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-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/UDK2014/MyWorkSpace
-#EDK2BASE = /usr/local/edk2
+include ../Make.common
 
 # Below file defines TARGET (RELEASE or DEBUG) and TOOL_CHAIN_TAG (GCC44, GCC45, or GCC46)
-include $(EDK2BASE)/Conf/target.txt
+#include $(EDK2BASE)/Conf/target.txt
 
 EFILIB          = $(EDK2BASE)/Build/Mde/$(TARGET)_$(TOOL_CHAIN_TAG)/$(UC_ARCH)/MdePkg/Library
 ALL_EFILIBS     = $(EFILIB)/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib/OUTPUT/BaseDebugPrintErrorLevelLib.lib \
@@ -49,38 +27,27 @@ ALL_EFILIBS     = $(EFILIB)/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevel
                  $(EFILIB)/UefiLib/UefiLib/OUTPUT/UefiLib.lib \
                  $(EFILIB)/UefiDriverEntryPoint/UefiDriverEntryPoint/OUTPUT/UefiDriverEntryPoint.lib
 
-INCLUDE_DIRS    = -I $(EDK2BASE)/MdePkg \
-                  -I $(EDK2BASE)/MdePkg/Include \
-                  -I $(EDK2BASE)/MdePkg/Include/$(ARCHDIR) \
-                 -I $(EDK2BASE)/EdkCompatibilityPkg/Foundation/Framework/Include \
-                 -I $(EDK2BASE)/EdkCompatibilityPkg/Foundation/Library/Dxe/Include
+ifeq ($(ARCH),aarch64)
+  ALL_EFILIBS +=  $(EFILIB)/BaseStackCheckLib/BaseStackCheckLib/OUTPUT/BaseStackCheckLib.lib
+endif
+
+TIANO_INCLUDE_DIRS = -I $(EDK2BASE)/MdePkg \
+                     -I $(EDK2BASE)/MdePkg/Include \
+                     -I $(EDK2BASE)/MdePkg/Include/$(ARCHDIR) \
+                    -I $(EDK2BASE)/EdkCompatibilityPkg/Foundation/Framework/Include \
+                    -I $(EDK2BASE)/EdkCompatibilityPkg/Foundation/Library/Dxe/Include
 
 FSW_NAMES       = fsw_efi fsw_core fsw_efi_lib fsw_lib AutoGen
 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 -DHOST_EFI_EDK2
-
-prefix          = /usr/bin/
-CC              = $(prefix)gcc
-AS              = $(prefix)as
-LD              = $(prefix)ld
-AR              = $(prefix)ar
-RANLIB          = $(prefix)ranlib
-OBJCOPY         = $(prefix)objcopy
-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 -m $(LD_CODE)
+ENTRYPOINT = _ModuleEntryPoint
 
 %.obj: %.c
-       $(CC) $(ARCH_C_FLAGS) $(CFLAGS) $(INCLUDE_DIRS) -DFSTYPE=$(DRIVERNAME) -DNO_BUILTIN_VA_FUNCS -c $< -o $@
+       $(CC) $(ARCH_CFLAGS) $(CFLAGS) $(TIANO_INCLUDE_DIRS) \
+             -DFSTYPE=$(DRIVERNAME) -DNO_BUILTIN_VA_FUNCS \
+             -D__MAKEWITH_TIANO -c $< -o $@
 
 ifneq (,$(filter %.efi,$(BUILDME)))
 
@@ -89,13 +56,12 @@ DLL_TARGET = $(subst .efi,.dll,$(BUILDME))
 all: $(BUILDME)
 
 $(DLL_TARGET): $(OBJS) fsw_$(DRIVERNAME).obj
-       $(LD) -o $(DRIVERNAME)_$(FILENAME_CODE).dll $(LDFLAGS) --start-group $(ALL_EFILIBS) $(OBJS) fsw_$(DRIVERNAME).obj --end-group
+       $(LD) -o $(DRIVERNAME)_$(FILENAME_CODE).dll $(TIANO_LDFLAGS) \
+             --start-group $(ALL_EFILIBS) $(OBJS) fsw_$(DRIVERNAME).obj --end-group
 
 $(BUILDME): $(DLL_TARGET)
        $(OBJCOPY) --strip-unneeded -R .eh_frame $(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_$(FILENAME_CODE)
        cp $(BUILDME) ../drivers_$(FILENAME_CODE)