diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-01-28 16:53:07 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2007-01-28 16:53:07 -0800 |
| commit | 248a5f1dd85f7619d044cbd498afce24345563a5 (patch) | |
| tree | 04d5b0203e0115fc4b1f1196bc31ceef5b43e53b | |
| parent | 1f7382b2e789b30992f935c471ef154b63cf5b83 (diff) | |
| download | syslinux-elf-248a5f1dd85f7619d044cbd498afce24345563a5.tar.gz syslinux-elf-248a5f1dd85f7619d044cbd498afce24345563a5.tar.xz syslinux-elf-248a5f1dd85f7619d044cbd498afce24345563a5.zip | |
Remove -m32 from the CC variable globally.
| -rw-r--r-- | memdisk/Makefile | 6 | ||||
| -rw-r--r-- | sample/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/memdisk/Makefile b/memdisk/Makefile index f628ff24..b983dfde 100644 --- a/memdisk/Makefile +++ b/memdisk/Makefile @@ -1,6 +1,6 @@ ## ----------------------------------------------------------------------- ## -## Copyright 2001-2004 H. Peter Anvin - All Rights Reserved +## Copyright 2001-2007 H. Peter Anvin - All Rights Reserved ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -19,8 +19,8 @@ M32 := $(call gcc_ok,-m32,) ALIGN := $(call gcc_ok,-falign-functions=0 -falign-jumps=0 -falign-loops=0,-malign-functions=0 -malign-jumps=0 -malign-loops=0) FREE := $(call gcc_ok,-ffreestanding,) -CC = gcc $(M32) $(FREE) -CFLAGS = -g -W -Wall -Wno-sign-compare \ +CC = gcc +CFLAGS = $(M32) $(FREE) -g -W -Wall -Wno-sign-compare \ -Os -fomit-frame-pointer -march=i386 $(ALIGN) \ -DVERSION='"$(VERSION)"' -DDATE='"$(DATE)"' LDFLAGS = -g diff --git a/sample/Makefile b/sample/Makefile index b92f820b..14089060 100644 --- a/sample/Makefile +++ b/sample/Makefile @@ -19,12 +19,12 @@ gcc_ok = $(shell if gcc $(1) -c -x c /dev/null -o /dev/null 2>/dev/null; \ M32 := $(call gcc_ok,-m32,) $(call gcc_ok,-ffreestanding,) -CC = gcc $(M32) +CC = gcc LD = ld -m elf_i386 AR = ar NASM = nasm RANLIB = ranlib -CFLAGS = -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include +CFLAGS = $(M32) -W -Wall -march=i386 -Os -fomit-frame-pointer -I../com32/include SFLAGS = -march=i386 LDFLAGS = -s OBJCOPY = objcopy |