From 6b14609040bad69502069bbaa6e200b5270bf571 Mon Sep 17 00:00:00 2001 From: marco_g Date: Thu, 14 Sep 2006 19:04:18 +0000 Subject: [PATCH] 2006-09-14 Marco Gerards * conf/i386-pc.rmk (COMMON_LDFLAGS): Use `-m32' instead of `-melf_i386'. --- ChangeLog | 7 +++++++ conf/i386-pc.mk | 2 +- conf/i386-pc.rmk | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93929fad2..1814f619e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,15 @@ +2006-09-14 Marco Gerards + + * conf/i386-pc.rmk (COMMON_LDFLAGS): Use `-m32' instead of + `-melf_i386'. + 2006-09-14 Robert Millan * util/i386/pc/grub-install.in: Skip menu.lst when removing + /boot/grub/*.lst. * util/i386/pc/getroot.c: Don't recurse into dotdirs (e.g. ".static"). + * util/i386/pc/grub-mkdevicemap.c: Make sure the floppy device exists before adding it to device.map. diff --git a/conf/i386-pc.mk b/conf/i386-pc.mk index e5c2d0e37..792d14e2a 100644 --- a/conf/i386-pc.mk +++ b/conf/i386-pc.mk @@ -2,7 +2,7 @@ COMMON_ASFLAGS = -nostdinc -fno-builtin -m32 COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32 -COMMON_LDFLAGS = -melf_i386 -nostdlib +COMMON_LDFLAGS = -m32 -nostdlib # Images. pkgdata_IMAGES = boot.img diskboot.img kernel.img pxeboot.img diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk index dd5117fb6..612479991 100644 --- a/conf/i386-pc.rmk +++ b/conf/i386-pc.rmk @@ -2,7 +2,7 @@ COMMON_ASFLAGS = -nostdinc -fno-builtin -m32 COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32 -COMMON_LDFLAGS = -melf_i386 -nostdlib +COMMON_LDFLAGS = -m32 -nostdlib # Images. pkgdata_IMAGES = boot.img diskboot.img kernel.img pxeboot.img