diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2019-03-01 00:34:27 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2019-03-01 00:34:27 -0800 |
| commit | 6b7acf82e7ae82d5a35dd6775ea2d94bd9e422c7 (patch) | |
| tree | 76d52a89a9e66b366e36babcc84219fdafcc4307 | |
| parent | a89d436eda9c260745dd3a772d8bcc193566c809 (diff) | |
| download | syslinux-6b7acf82e7ae82d5a35dd6775ea2d94bd9e422c7.tar.gz syslinux-6b7acf82e7ae82d5a35dd6775ea2d94bd9e422c7.tar.xz syslinux-6b7acf82e7ae82d5a35dd6775ea2d94bd9e422c7.zip | |
WIP: fix 64-bit EFI core build, now fails at the same as EFI32
| -rw-r--r-- | com32/include/elfutils.h | 2 | ||||
| -rw-r--r-- | mk/elf.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/com32/include/elfutils.h b/com32/include/elfutils.h index 831cf4cd..2bd1e079 100644 --- a/com32/include/elfutils.h +++ b/com32/include/elfutils.h @@ -67,7 +67,7 @@ typedef Elf64_Sym Elf_Sym; typedef Elf64_Ehdr Elf_Ehdr; typedef Elf64_Phdr Elf_Phdr; typedef Elf64_Rel Elf_Rel; -typedef Elf64_Bwword Elf_Bword; +typedef Elf64_Bword Elf_Bword; # define ELF_R_SYM(x) ELF64_R_SYM(x) # define ELF_R_TYPE(x) ELF64_R_TYPE(x) #else @@ -30,7 +30,6 @@ ifeq ($(ARCH),i386) endif ifeq ($(ARCH),x86_64) GCCOPT += -m64 -march=x86-64 - GCCOPT += $(call gcc_ok,-march=x86-64) # let preferred-stack-boundary be default (=4) NASMFLAGS += -f elf64 endif @@ -75,7 +74,7 @@ INCLUDE += -nostdinc -iwithprefix include -I$(SRC) \ -I$(com32)/include/sys $(GPLINCLUDE) \ -I$(core)/include -I$(core)/$(fwclass)/include -I$(objdir) -OPTFLAGS = -Os -march=$(ARCH) -falign-functions=0 -falign-jumps=0 \ +OPTFLAGS = -Os -falign-functions=0 -falign-jumps=0 \ -falign-labels=0 -ffast-math -fomit-frame-pointer WARNFLAGS = $(GCCWARN) -Wpointer-arith -Wwrite-strings \ -Wstrict-prototypes -Winline |