From: H. Peter Anvin <hpa@zytor.com>
Date: Mon, 25 May 2009 22:50:12 +0000 (-0700)
Subject: Merge branch 'master' into core32
X-Git-Tag: syslinux-4.00-pre1~78
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12f1c65e7748559aef772cfe760be11f1f7745fa;p=profile%2Fivi%2Fsyslinux.git

Merge branch 'master' into core32

Conflicts:
	com32/MCONFIG

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

12f1c65e7748559aef772cfe760be11f1f7745fa
diff --cc com32/MCONFIG
index 414011a,f8d9d97..6d25b2d
--- a/com32/MCONFIG
+++ b/com32/MCONFIG
@@@ -43,7 -41,8 +43,8 @@@ SFLAGS     = $(GCCOPT) -W -Wall -march=
  	     -nostdinc -iwithprefix include \
  	     -I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE)
  
- LDFLAGS    = -m elf_i386 --emit-relocs -T $(com32)/lib/com32.ld
+ COM32LD	   = $(com32)/lib/com32.ld
 -LDFLAGS    = -m elf_i386 -T $(COM32LD)
++LDFLAGS    = -m elf_i386 --emit-relocs -T $(COM32LD)
  LIBGCC    := $(shell $(CC) $(GCCOPT) --print-libgcc)
  
  LNXCFLAGS  = -I$(com32)/libutil/include -W -Wall -O -g -D_GNU_SOURCE