[build] Remove support for building with the Intel C compiler

Support for building with the Intel C compiler (icc) was added in 2009
in the expectation that UEFI support would eventually involve
compiling iPXE to EFI Byte Code.

EFI Byte Code has never found any widespread use: no widely available
compilers can emit it, Microsoft refuses to sign EFI Byte Code
binaries for UEFI Secure Boot, and I have personally never encountered
any examples of EFI Byte Code in the wild.

The support for using the Intel C compiler has not been tested in over
a decade, and would almost certainly require modification to work with
current releases of the compiler.

Simplify the build process by removing this old legacy code.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

1 files changed, 5 insertions, 52 deletions

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index bade2da3f..8e769c6af 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -76,9 +76,7 @@ CCDEFS		:= $(shell $(CC) -E -x c -c /dev/null -dM | cut -d" " -f2)
 ccdefs:
 	@$(ECHO) $(CCDEFS)
 
-ifeq ($(filter __ICC,$(CCDEFS)),__ICC)
-CCTYPE		:= icc
-else
+ifeq ($(filter __GNUC__,$(CCDEFS)),__GNUC__)
 CCTYPE		:= gcc
 endif
 cctype:
@@ -466,32 +464,6 @@ CFLAGS		+= -fcommon
 CFLAGS		+= -Wall -W -Wformat-nonliteral
 HOST_CFLAGS	+= -Wall -W -Wformat-nonliteral
 endif
-ifeq ($(CCTYPE),icc)
-CFLAGS		+= -fno-builtin
-CFLAGS		+= -no-ip
-CFLAGS		+= -no-gcc
-CFLAGS		+= -diag-disable 111 # Unreachable code
-CFLAGS		+= -diag-disable 128 # Unreachable loop
-CFLAGS		+= -diag-disable 170 # Array boundary checks
-CFLAGS		+= -diag-disable 177 # Unused functions
-CFLAGS		+= -diag-disable 181 # printf() format checks
-CFLAGS		+= -diag-disable 188 # enum strictness
-CFLAGS		+= -diag-disable 193 # Undefined preprocessor identifiers
-CFLAGS		+= -diag-disable 280 # switch ( constant )
-CFLAGS		+= -diag-disable 310 # K&R parameter lists
-CFLAGS		+= -diag-disable 424 # Extra semicolon
-CFLAGS		+= -diag-disable 589 # Declarations mid-code
-CFLAGS		+= -diag-disable 593 # Unused variables
-CFLAGS		+= -diag-disable 810 # Casting ints to smaller ints
-CFLAGS		+= -diag-disable 981 # Sequence point violations
-CFLAGS		+= -diag-disable 1292 # Ignored attributes
-CFLAGS		+= -diag-disable 1338 # void pointer arithmetic
-CFLAGS		+= -diag-disable 1361 # Variable-length arrays
-CFLAGS		+= -diag-disable 1418 # Missing prototypes
-CFLAGS		+= -diag-disable 1419 # Missing prototypes
-CFLAGS		+= -diag-disable 1599 # Hidden variables
-CFLAGS		+= -Wall -Wmissing-declarations
-endif
 CFLAGS		+= $(WORKAROUND_CFLAGS) $(EXTRA_CFLAGS)
 ASFLAGS		+= $(WORKAROUND_ASFLAGS) $(EXTRA_ASFLAGS)
 LDFLAGS		+= $(WORKAROUND_LDFLAGS) $(EXTRA_LDFLAGS)
@@ -555,16 +527,6 @@ OBJ_CFLAGS	= $(CFLAGS_$(OBJECT)) -DOBJECT=$(subst -,_,$(OBJECT))
 $(BIN)/%.flags :
 	@$(ECHO) $(OBJ_CFLAGS)
 
-# ICC requires postprocessing objects to fix up table alignments
-#
-ifeq ($(CCTYPE),icc)
-POST_O		= && $(ICCFIX) $@
-POST_O_DEPS	:= $(ICCFIX)
-else
-POST_O		:=
-POST_O_DEPS	:=
-endif
-
 # Debug level calculations
 #
 DBGLVL_MAX	= -DDBGLVL_MAX=$(firstword $(subst ., ,$(1)))
@@ -574,9 +536,9 @@ DBGLVL		= $(call DBGLVL_MAX,$(1)) $(call DBGLVL_DFLT,$(1))
 # Rules for specific object types.
 #
 COMPILE_c	= $(CC) $(CFLAGS) $(CFLAGS_c) $(OBJ_CFLAGS)
-RULE_c		= $(Q)$(COMPILE_c) -c $< -o $@ $(POST_O)
+RULE_c		= $(Q)$(COMPILE_c) -c $< -o $@
 RULE_c_to_ids.o = $(Q)$(ECHO_E) '$(OBJ_IDS_ASM_NL)' | $(ASSEMBLE_S) -o $@
-RULE_c_to_dbg%.o= $(Q)$(COMPILE_c) $(call DBGLVL,$*) -c $< -o $@ $(POST_O)
+RULE_c_to_dbg%.o= $(Q)$(COMPILE_c) $(call DBGLVL,$*) -c $< -o $@
 RULE_c_to_c	= $(Q)$(COMPILE_c) -E -c $< > $@
 RULE_c_to_s	= $(Q)$(COMPILE_c) -S -g0 -c $< -o $@
 
@@ -919,7 +881,7 @@ endef
 # $(3) is the source base name (e.g. "rtl8139")
 #
 define rules_template_parts
-$$(BIN)/$(3).o : $(1) $$(MAKEDEPS) $$(POST_O_DEPS) $$($(3)_DEPS)
+$$(BIN)/$(3).o : $(1) $$(MAKEDEPS) $$($(3)_DEPS)
 	$$(QM)$(ECHO) "  [BUILD] $$@"
 	$$(RULE_$(2))
 BOBJS += $$(BIN)/$(3).o
@@ -934,7 +896,7 @@ endef
 # $(4) is the destination type (e.g. "dbg%.o")
 #
 define rules_template_target
-$$(BIN)/$(3).$(4) : $(1) $$(MAKEDEPS) $$(POST_O_DEPS) $$($(3)_DEPS)
+$$(BIN)/$(3).$(4) : $(1) $$(MAKEDEPS) $$($(3)_DEPS)
 	$$(QM)$(ECHO) "  [BUILD] $$@"
 	$$(RULE_$(2)_to_$(4))
 $(TGT)_OBJS += $$(BIN)/$(3).$(4)
@@ -1475,15 +1437,6 @@ CLEANUP += $(EFIFATBIN)
 
 ###############################################################################
 #
-# The ICC fixup utility
-#
-$(ICCFIX) : util/iccfix.c $(MAKEDEPS)
-	$(QM)$(ECHO) "  [HOSTCC] $@"
-	$(Q)$(HOST_CC) $(HOST_CFLAGS) -idirafter include -o $@ $<
-CLEANUP += $(ICCFIX)
-
-###############################################################################
-#
 # The error usage information utility
 #
 $(EINFO) : util/einfo.c $(MAKEDEPS)