From: "Vesa Jääskeläinen" <chaac@nic.fi>
To: The development of GRUB 2 <grub-devel@gnu.org>
Subject: [patch] Fix for building correct code on i386-pc (CVS-HEAD)
Date: Wed, 31 May 2006 00:08:25 +0300 [thread overview]
Message-ID: <447CB449.9080901@nic.fi> (raw)
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
Hi,
... thanks.
Attached patch fixes problems for compiling correct code on i386-pc...
other platforms needs to be modified similarly too...
Thanks,
Vesa Jääskeläinen
[-- Attachment #2: grub2-compilation-fix.diff --]
[-- Type: text/plain, Size: 10788 bytes --]
Index: conf/common.rmk
===================================================================
RCS file: /sources/grub/grub2/conf/common.rmk,v
retrieving revision 1.7
diff -u -r1.7 common.rmk
--- conf/common.rmk 27 May 2006 21:09:25 -0000 1.7
+++ conf/common.rmk 30 May 2006 21:00:02 -0000
@@ -27,61 +27,73 @@
# For fshelp.mod.
fshelp_mod_SOURCES = fs/fshelp.c
fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
+fshelp_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For fat.mod.
fat_mod_SOURCES = fs/fat.c
fat_mod_CFLAGS = $(COMMON_CFLAGS)
+fat_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For ufs.mod.
ufs_mod_SOURCES = fs/ufs.c
ufs_mod_CFLAGS = $(COMMON_CFLAGS)
+ufs_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For ext2.mod.
ext2_mod_SOURCES = fs/ext2.c
ext2_mod_CFLAGS = $(COMMON_CFLAGS)
+ext2_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For minix.mod.
minix_mod_SOURCES = fs/minix.c
minix_mod_CFLAGS = $(COMMON_CFLAGS)
+minix_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For hfs.mod.
hfs_mod_SOURCES = fs/hfs.c
hfs_mod_CFLAGS = $(COMMON_CFLAGS)
+hfs_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For jfs.mod.
jfs_mod_SOURCES = fs/jfs.c
jfs_mod_CFLAGS = $(COMMON_CFLAGS)
+jfs_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For iso9660.mod.
iso9660_mod_SOURCES = fs/iso9660.c
iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
+iso9660_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For xfs.mod.
xfs_mod_SOURCES = fs/xfs.c
xfs_mod_CFLAGS = $(COMMON_CFLAGS)
+xfs_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For affs.mod.
affs_mod_SOURCES = fs/affs.c
affs_mod_CFLAGS = $(COMMON_CFLAGS)
+affs_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For sfs.mod.
sfs_mod_SOURCES = fs/sfs.c
sfs_mod_CFLAGS = $(COMMON_CFLAGS)
+sfs_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For hfsplus.mod.
hfsplus_mod_SOURCES = fs/hfsplus.c
hfsplus_mod_CFLAGS = $(COMMON_CFLAGS)
+hfsplus_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
hfsplus_mod_LDFLAGS = $(COMMON_LDFLAGS)
# Partition maps.
@@ -90,31 +102,37 @@
# For amiga.mod
amiga_mod_SOURCES = partmap/amiga.c
amiga_mod_CFLAGS = $(COMMON_CFLAGS)
+amiga_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For apple.mod
apple_mod_SOURCES = partmap/apple.c
apple_mod_CFLAGS = $(COMMON_CFLAGS)
+apple_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For pc.mod
pc_mod_SOURCES = partmap/pc.c
pc_mod_CFLAGS = $(COMMON_CFLAGS)
+pc_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For sun.mod
sun_mod_SOURCES = partmap/sun.c
sun_mod_CFLAGS = $(COMMON_CFLAGS)
+sun_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For acorn.mod
acorn_mod_SOURCES = partmap/acorn.c
acorn_mod_CFLAGS = $(COMMON_CFLAGS)
+acorn_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For gpt.mod
gpt_mod_SOURCES = partmap/gpt.c
gpt_mod_CFLAGS = $(COMMON_CFLAGS)
+gpt_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
gpt_mod_LDFLAGS = $(COMMON_LDFLAGS)
@@ -127,71 +145,85 @@
# For hello.mod.
hello_mod_SOURCES = hello/hello.c
hello_mod_CFLAGS = $(COMMON_CFLAGS)
+hello_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For boot.mod.
boot_mod_SOURCES = commands/boot.c
boot_mod_CFLAGS = $(COMMON_CFLAGS)
+boot_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For terminal.mod.
terminal_mod_SOURCES = commands/terminal.c
terminal_mod_CFLAGS = $(COMMON_CFLAGS)
+terminal_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For ls.mod.
ls_mod_SOURCES = commands/ls.c
ls_mod_CFLAGS = $(COMMON_CFLAGS)
+ls_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For cmp.mod.
cmp_mod_SOURCES = commands/cmp.c
cmp_mod_CFLAGS = $(COMMON_CFLAGS)
+cmp_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For cat.mod.
cat_mod_SOURCES = commands/cat.c
cat_mod_CFLAGS = $(COMMON_CFLAGS)
+cat_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For help.mod.
help_mod_SOURCES = commands/help.c
help_mod_CFLAGS = $(COMMON_CFLAGS)
+help_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
help_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For font.mod.
font_mod_SOURCES = font/manager.c
font_mod_CFLAGS = $(COMMON_CFLAGS)
+font_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
font_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For search.mod.
search_mod_SOURCES = commands/search.c
search_mod_CFLAGS = $(COMMON_CFLAGS)
+search_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
search_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For test.mod.
test_mod_SOURCES = commands/test.c
test_mod_CFLAGS = $(COMMON_CFLAGS)
+test_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
test_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For loopback.mod
loopback_mod_SOURCES = disk/loopback.c
loopback_mod_CFLAGS = $(COMMON_CFLAGS)
+loopback_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For configfile.mod
configfile_mod_SOURCES = commands/configfile.c
configfile_mod_CFLAGS = $(COMMON_CFLAGS)
+configfile_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For terminfo.mod.
terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
+terminfo_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For blocklist.mod.
blocklist_mod_SOURCES = commands/blocklist.c
blocklist_mod_CFLAGS = $(COMMON_CFLAGS)
+blocklist_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
blocklist_mod_LDFLAGS = $(COMMON_LDFLAGS)
# Misc.
@@ -200,6 +232,7 @@
# For gzio.mod.
gzio_mod_SOURCES = io/gzio.c
gzio_mod_CFLAGS = $(COMMON_CFLAGS)
+gzio_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
Index: conf/i386-pc.rmk
===================================================================
RCS file: /sources/grub/grub2/conf/i386-pc.rmk,v
retrieving revision 1.65
diff -u -r1.65 i386-pc.rmk
--- conf/i386-pc.rmk 28 May 2006 23:01:43 -0000 1.65
+++ conf/i386-pc.rmk 30 May 2006 21:00:02 -0000
@@ -2,6 +2,7 @@
COMMON_ASFLAGS = -nostdinc -fno-builtin
COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
+COMMON_TARGET_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
COMMON_LDFLAGS = -melf_i386 -nostdlib
# Images.
@@ -37,6 +38,7 @@
machine/memory.h machine/loader.h machine/time.h machine/vga.h \
machine/vbe.h
kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,8200 $(COMMON_CFLAGS)
@@ -117,21 +119,25 @@
# For _chain.mod.
_chain_mod_SOURCES = loader/i386/pc/chainloader.c
_chain_mod_CFLAGS = $(COMMON_CFLAGS)
+_chain_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
_chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For chain.mod.
chain_mod_SOURCES = loader/i386/pc/chainloader_normal.c
chain_mod_CFLAGS = $(COMMON_CFLAGS)
+chain_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For _linux.mod.
_linux_mod_SOURCES = loader/i386/pc/linux.c
_linux_mod_CFLAGS = $(COMMON_CFLAGS)
+_linux_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
_linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For linux.mod.
linux_mod_SOURCES = loader/i386/pc/linux_normal.c
linux_mod_CFLAGS = $(COMMON_CFLAGS)
+linux_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For normal.mod.
@@ -141,68 +147,81 @@
normal/menu_entry.c normal/misc.c grub_script.tab.c \
normal/script.c normal/i386/setjmp.S
normal_mod_CFLAGS = $(COMMON_CFLAGS)
+normal_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
normal_mod_ASFLAGS = $(COMMON_ASFLAGS) -m32
normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For reboot.mod.
reboot_mod_SOURCES = commands/i386/pc/reboot.c
reboot_mod_CFLAGS = $(COMMON_CFLAGS)
+reboot_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For halt.mod.
halt_mod_SOURCES = commands/i386/pc/halt.c
halt_mod_CFLAGS = $(COMMON_CFLAGS)
+halt_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For serial.mod.
serial_mod_SOURCES = term/i386/pc/serial.c
serial_mod_CFLAGS = $(COMMON_CFLAGS)
+serial_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For _multiboot.mod.
_multiboot_mod_SOURCES = loader/i386/pc/multiboot.c
_multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
+_multiboot_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
_multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For multiboot.mod.
multiboot_mod_SOURCES = loader/i386/pc/multiboot_normal.c
multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
+multiboot_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For vbe.mod.
vbe_mod_SOURCES = video/i386/pc/vbe.c video/i386/pc/vbeblit.c \
video/i386/pc/vbefill.c
vbe_mod_CFLAGS = $(COMMON_CFLAGS)
+vbe_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
vbe_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For vbeinfo.mod.
vbeinfo_mod_SOURCES = commands/i386/pc/vbeinfo.c
vbeinfo_mod_CFLAGS = $(COMMON_CFLAGS)
+vbeinfo_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
vbeinfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For vbetest.mod.
vbetest_mod_SOURCES = commands/i386/pc/vbetest.c
vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
+vbetest_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For play.mod.
play_mod_SOURCES = commands/i386/pc/play.c
play_mod_CFLAGS = $(COMMON_CFLAGS)
+play_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
play_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For video.mod.
video_mod_SOURCES = video/video.c
video_mod_CFLAGS = $(COMMON_CFLAGS)
+video_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
video_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For gfxterm.mod.
gfxterm_mod_SOURCES = term/gfxterm.c
gfxterm_mod_CFLAGS = $(COMMON_CFLAGS)
+gfxterm_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
gfxterm_mod_LDFLAGS = $(COMMON_LDFLAGS)
# For videotest.mod.
videotest_mod_SOURCES = commands/videotest.c
videotest_mod_CFLAGS = $(COMMON_CFLAGS)
+videotest_mod_TARGET_CFLAGS = $(COMMON_TARGET_CFLAGS)
videotest_mod_LDFLAGS = $(COMMON_LDFLAGS)
include $(srcdir)/conf/common.mk
next reply other threads:[~2006-05-30 21:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-05-30 21:08 Vesa Jääskeläinen [this message]
2006-05-30 21:15 ` [patch] Fix for building correct code on i386-pc (CVS-HEAD) Hollis Blanchard
2006-05-31 3:59 ` Harley D. Eades III
2006-05-30 22:00 ` Hollis Blanchard
2006-05-31 0:31 ` Yoshinori K. Okuji
2006-05-31 21:00 ` [PATCH] Fix for configure on x86_64 (Was: Re: [patch] Fix for building correct code on i386-pc (CVS-HEAD)) Jeroen Dekkers
2006-06-01 15:39 ` Yoshinori K. Okuji
2006-06-07 11:16 ` [PATCH] Another fix for x86_64 Jeroen Dekkers
2006-06-07 15:55 ` Marco Gerards
2006-05-30 22:10 ` [patch] Fix for building correct code on i386-pc (CVS-HEAD) Marco Gerards
2006-05-31 0:28 ` Yoshinori K. Okuji
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=447CB449.9080901@nic.fi \
--to=chaac@nic.fi \
--cc=grub-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.