diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-02 22:41:00 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-02 22:41:00 -0800 |
| commit | 702c7fbe7342403472e887508716add0c58c385c (patch) | |
| tree | 639050b522cea25f4475d48da54380d61c7d10f3 /gpxe/src/arch/i386/Makefile | |
| parent | 1e96e9cc1c3549c86dbf4e7caf880477e16e93e0 (diff) | |
| download | syslinux.git-702c7fbe7342403472e887508716add0c58c385c.tar.gz syslinux.git-702c7fbe7342403472e887508716add0c58c385c.tar.xz syslinux.git-702c7fbe7342403472e887508716add0c58c385c.zip | |
Update gPXE to version 1.0.0
Diffstat (limited to 'gpxe/src/arch/i386/Makefile')
| -rw-r--r-- | gpxe/src/arch/i386/Makefile | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/gpxe/src/arch/i386/Makefile b/gpxe/src/arch/i386/Makefile index 1392bbac..dd8da802 100644 --- a/gpxe/src/arch/i386/Makefile +++ b/gpxe/src/arch/i386/Makefile @@ -4,22 +4,33 @@ CFLAGS += -march=i386 # Code size reduction. # -CFLAGS += -fstrength-reduce -fomit-frame-pointer +CFLAGS += -fomit-frame-pointer + +# Code size reduction. +# +ifeq ($(CCTYPE),gcc) +CFLAGS += -fstrength-reduce +endif # Code size reduction. gcc3 needs a different syntax to gcc2 if you # want to avoid spurious warnings. # +ifeq ($(CCTYPE),gcc) GCC_VERSION := $(subst ., ,$(shell $(CC) -dumpversion)) GCC_MAJOR := $(firstword $(GCC_VERSION)) ifeq ($(GCC_MAJOR),2) CFLAGS += -malign-jumps=1 -malign-loops=1 -malign-functions=1 else CFLAGS += -falign-jumps=1 -falign-loops=1 -falign-functions=1 -endif +endif # gcc2 +endif # gcc -# Code size reduction. This is almost always a win. The kernel uses it, too. +# Code size reduction. This is almost always a win. The kernel uses +# it, too. # +ifeq ($(CCTYPE),gcc) CFLAGS += -mpreferred-stack-boundary=2 +endif # Code size reduction. Use regparm for all functions - C functions # called from assembly (or vice versa) need __asmcall now @@ -27,7 +38,9 @@ CFLAGS += -mpreferred-stack-boundary=2 CFLAGS += -mregparm=3 # Code size reduction. Use -mrtd (same __asmcall requirements as above) +ifeq ($(CCTYPE),gcc) CFLAGS += -mrtd +endif # Code size reduction. This is the logical complement to -mregparm=3. # It doesn't currently buy us anything, but if anything ever tries to @@ -67,7 +80,9 @@ SRCDIRS += arch/i386/drivers SRCDIRS += arch/i386/drivers/net SRCDIRS += arch/i386/interface/pcbios SRCDIRS += arch/i386/interface/pxe +SRCDIRS += arch/i386/interface/pxeparent SRCDIRS += arch/i386/interface/syslinux +SRCDIRS += arch/i386/hci/commands # The various xxx_loader.c files are #included into core/loader.c and # should not be compiled directly. @@ -76,11 +91,6 @@ NON_AUTO_SRCS += arch/i386/core/aout_loader.c NON_AUTO_SRCS += arch/i386/core/freebsd_loader.c NON_AUTO_SRCS += arch/i386/core/wince_loader.c -# unnrv2b.S is used to generate a 16-bit as well as a 32-bit object. -# -OBJS_unnrv2b = unnrv2b unnrv2b16 -CFLAGS_unnrv2b16 = -DCODE16 - # Include common x86 Makefile # MAKEDEPS += arch/x86/Makefile @@ -101,13 +111,6 @@ NON_AUTO_MEDIA += fd0 $(Q)dd if=$< bs=512 conv=sync of=/dev/fd0 $(Q)sync -# rule to create padded disk images -NON_AUTO_MEDIA += pdsk -%pdsk : %dsk - $(QM)$(ECHO) " [DSKPAD] $@" - $(Q)cp $< $@ - $(Q)$(PERL) ./util/dskpad.pl $@ - # Add NON_AUTO_MEDIA to the media list, so that they show up in the # output of "make" # |