diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-21 16:56:46 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-21 16:56:46 -0800 |
| commit | 3ec39452cdbd1405f5767a9bb82b14d93b4f5e80 (patch) | |
| tree | 5d5258fca3396136a545811ae6660498a72f6e00 | |
| parent | 5055cc713488b799a899faa488f04e2895f587f1 (diff) | |
| download | syslinux-3ec39452cdbd1405f5767a9bb82b14d93b4f5e80.tar.gz syslinux-3ec39452cdbd1405f5767a9bb82b14d93b4f5e80.tar.xz syslinux-3ec39452cdbd1405f5767a9bb82b14d93b4f5e80.zip | |
efi: We need -m32/-m64 even when processing assembly
We need to specify -m32/-m64 even when we are processing assembly.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | mk/efi.mk | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -12,13 +12,11 @@ EFIINC = $(objdir)/include/efi LIBDIR = $(objdir)/lib ifeq ($(ARCH),i386) - SARCHOPT = -march=i386 - CARCHOPT = -m32 -march=i386 + ARCHOPT = -m32 -march=i386 EFI_SUBARCH = ia32 endif ifeq ($(ARCH),x86_64) - SARCHOPT = -march=x86-64 - CARCHOPT = -m64 -march=x86-64 + ARCHOPT = -m64 -march=x86-64 EFI_SUBARCH = $(ARCH) endif @@ -33,7 +31,7 @@ FORMAT=efi-app-$(EFI_SUBARCH) CFLAGS = -I$(EFIINC) -I$(EFIINC)/$(EFI_SUBARCH) \ -DEFI_FUNCTION_WRAPPER -fPIC -fshort-wchar -ffreestanding \ -Wall -I$(com32)/include -I$(com32)/include/sys \ - -I$(core)/include -I$(core)/ $(CARCHOPT) \ + -I$(core)/include -I$(core)/ $(ARCHOPT) \ -I$(com32)/lib/ -I$(com32)/libutil/include -std=gnu99 \ -DELF_DEBUG -DSYSLINUX_EFI -I$(objdir) \ $(GCCWARN) -D__COM32__ -mno-red-zone \ @@ -46,7 +44,7 @@ LDSCRIPT := $(LIBDIR)/elf_$(EFI_SUBARCH)_efi.lds LDFLAGS = -T $(SRC)/$(ARCH)/syslinux.ld -Bsymbolic -pie -nostdlib -znocombreloc \ -L$(LIBDIR) --hash-style=gnu -m elf_$(ARCH) $(CRT0) -E -SFLAGS = $(GCCOPT) $(GCCWARN) $(SARCHOPT) \ +SFLAGS = $(GCCOPT) $(GCCWARN) $(ARCHOPT) \ -fomit-frame-pointer -D__COM32__ \ -nostdinc -iwithprefix include \ -I$(com32)/libutil/include -I$(com32)/include -I$(com32)/include/sys $(GPLINCLUDE) |