diff options
author | Michael Brown | 2009-03-10 18:50:01 +0100 |
---|---|---|
committer | Michael Brown | 2009-03-26 08:27:19 +0100 |
commit | 1c67623e37dada045e9b5d1f5e19b414cc79c3e3 (patch) | |
tree | 6baaac3371a85232dbfe0faa5e7530eb76fa7413 /src/arch | |
parent | [3c90x] Remove src/drivers/3c90x.txt (diff) | |
download | ipxe-1c67623e37dada045e9b5d1f5e19b414cc79c3e3.tar.gz ipxe-1c67623e37dada045e9b5d1f5e19b414cc79c3e3.tar.xz ipxe-1c67623e37dada045e9b5d1f5e19b414cc79c3e3.zip |
[build] Enable building with the Intel C compiler (icc)
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/i386/Makefile | 19 | ||||
-rw-r--r-- | src/arch/i386/drivers/net/undiload.c | 5 | ||||
-rw-r--r-- | src/arch/i386/drivers/net/undinet.c | 5 |
3 files changed, 20 insertions, 9 deletions
diff --git a/src/arch/i386/Makefile b/src/arch/i386/Makefile index 1392bbac..ca8ba1b2 100644 --- a/src/arch/i386/Makefile +++ b/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 diff --git a/src/arch/i386/drivers/net/undiload.c b/src/arch/i386/drivers/net/undiload.c index dbd9e7c2..6f34404b 100644 --- a/src/arch/i386/drivers/net/undiload.c +++ b/src/arch/i386/drivers/net/undiload.c @@ -90,11 +90,10 @@ int undi_load ( struct undi_device *undi, struct undi_rom *undirom ) { undi_loader_entry = undirom->loader_entry; __asm__ __volatile__ ( REAL_CODE ( "pushw %%ds\n\t" "pushw %%ax\n\t" - "lcall *%c2\n\t" + "lcall *undi_loader_entry\n\t" "addw $4, %%sp\n\t" ) : "=a" ( exit ) - : "a" ( __from_data16 ( &undi_loader ) ), - "p" ( __from_data16 ( &undi_loader_entry ) ) + : "a" ( __from_data16 ( &undi_loader ) ) : "ebx", "ecx", "edx", "esi", "edi", "ebp" ); /* UNDI API calls may rudely change the status of A20 and not diff --git a/src/arch/i386/drivers/net/undinet.c b/src/arch/i386/drivers/net/undinet.c index d6db6f7c..708fc274 100644 --- a/src/arch/i386/drivers/net/undinet.c +++ b/src/arch/i386/drivers/net/undinet.c @@ -173,12 +173,11 @@ static int undinet_call ( struct undi_nic *undinic, unsigned int function, __asm__ __volatile__ ( REAL_CODE ( "pushw %%es\n\t" "pushw %%di\n\t" "pushw %%bx\n\t" - "lcall *%c3\n\t" + "lcall *undinet_entry_point\n\t" "addw $6, %%sp\n\t" ) : "=a" ( exit ), "=b" ( discard_b ), "=D" ( discard_D ) - : "p" ( __from_data16 ( &undinet_entry_point )), - "b" ( function ), + : "b" ( function ), "D" ( __from_data16 ( &undinet_params ) ) : "ecx", "edx", "esi", "ebp" ); |