diff --git a/grub-1.99-gcc-4.7.0.patch b/grub-1.99-gcc-4.7.0.patch index 644a6ff..b8f6e51 100644 --- a/grub-1.99-gcc-4.7.0.patch +++ b/grub-1.99-gcc-4.7.0.patch @@ -1,24 +1,26 @@ -From cc8d234213baf7108f9c850c84fc98d17e780710 Mon Sep 17 00:00:00 2001 +From b0f4ef523b69a497d69820c09bbb07484a6b09cc Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 7 Mar 2012 09:53:50 -0500 Subject: [PATCH] Fix gcc error that kills build. --- - conf/Makefile.common | 2 +- - grub-core/Makefile.am | 12 ++++++------ - grub-core/commands/usbtest.c | 2 +- - 3 files changed, 8 insertions(+), 8 deletions(-) + conf/Makefile.common | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/Makefile.common b/conf/Makefile.common -index 2040a2e..3a6f45c 100644 +index 2040a2e..b3ba765 100644 --- a/conf/Makefile.common +++ b/conf/Makefile.common -@@ -14,7 +14,7 @@ if COND_i386_efi - LDFLAGS_PLATFORM = -melf_i386 +@@ -11,10 +11,10 @@ if COND_i386_pc + CFLAGS_PLATFORM += -mrtd -mregparm=3 + endif + if COND_i386_efi +- LDFLAGS_PLATFORM = -melf_i386 ++ LDFLAGS_PLATFORM = -m32 endif if COND_x86_64_efi - LDFLAGS_PLATFORM = -melf_x86_64 -+ LDFLAGS_PLATFORM = -melf ++ LDFLAGS_PLATFORM = -m64 endif if COND_i386_qemu CFLAGS_PLATFORM += -mrtd -mregparm=3