rpms/grub2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add fix for i386 as well.

Browse Source
This commit is contained in:
Peter Jones 2012-03-07 10:56:37 -05:00
parent 645dc62a35
commit d1b39fb814
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
grub-1.99-gcc-4.7.0.patch
View File

@ -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 <pjones@redhat.com> From: Peter Jones <pjones@redhat.com>
Date: Wed, 7 Mar 2012 09:53:50 -0500 Date: Wed, 7 Mar 2012 09:53:50 -0500
Subject: [PATCH] Fix gcc error that kills build. Subject: [PATCH] Fix gcc error that kills build.
--- ---
conf/Makefile.common | 2 +- conf/Makefile.common | 4 ++--
grub-core/Makefile.am | 12 ++++++------ 1 files changed, 2 insertions(+), 2 deletions(-)
grub-core/commands/usbtest.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/conf/Makefile.common b/conf/Makefile.common diff --git a/conf/Makefile.common b/conf/Makefile.common
index 2040a2e..3a6f45c 100644 index 2040a2e..b3ba765 100644
--- a/conf/Makefile.common --- a/conf/Makefile.common
+++ b/conf/Makefile.common +++ b/conf/Makefile.common
@@ -14,7 +14,7 @@ if COND_i386_efi @@ -11,10 +11,10 @@ if COND_i386_pc
LDFLAGS_PLATFORM = -melf_i386 CFLAGS_PLATFORM += -mrtd -mregparm=3
endif
if COND_i386_efi
- LDFLAGS_PLATFORM = -melf_i386
+ LDFLAGS_PLATFORM = -m32
endif endif
if COND_x86_64_efi if COND_x86_64_efi
- LDFLAGS_PLATFORM = -melf_x86_64 - LDFLAGS_PLATFORM = -melf_x86_64
+ LDFLAGS_PLATFORM = -melf + LDFLAGS_PLATFORM = -m64
endif endif
if COND_i386_qemu if COND_i386_qemu
CFLAGS_PLATFORM += -mrtd -mregparm=3 CFLAGS_PLATFORM += -mrtd -mregparm=3