Changeset d75dc05 in mainline

Timestamp:

2017-10-09T18:17:05Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

02667d9

Parents:

ca207e0

Message:

Remove the unmaintained and likely broken ICC support.

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile.build (modified) (2 diffs)
• contrib/tools/random_check.sh (modified) (1 diff)
• kernel/Makefile (modified) (2 diffs)
• tools/autotool.py (modified) (1 diff)
• uspace/Makefile.common (modified) (3 diffs)

HelenOS.config

@@ -298 +298 @@
 @ "clang" Clang
 @ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
-@ "icc" Intel C Compiler
 @ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=amd64|PLATFORM=ia32|PLATFORM=ia64] COMPILER (choice)
-
-% Compiler
-@ "gcc_cross" GNU C Compiler (cross-compiler)
-@ "clang" Clang
-@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
-@ "gcc_native" GNU C Compiler (native)
-! [PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64|PLATFORM=riscv64] COMPILER (choice)
+! COMPILER (choice)
 
 % Clang Integrated Assembler

boot/Makefile.build

@@ -52 +52 @@
         -pipe
 
-ICC_CFLAGS = -Wall -Wmissing-prototypes -Werror-implicit-function-declaration -wd170
-
 CLANG_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
@@ -78 +76 @@
 ifeq ($(COMPILER),gcc_helenos)
         CFLAGS = $(COMMON_CFLAGS) $(GCC_CFLAGS) $(EXTRA_CFLAGS)
-        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-endif
-
-
-ifeq ($(COMPILER),icc)
-        CFLAGS = $(COMMON_CFLAGS) $(ICC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif

contrib/tools/random_check.sh

@@ -52 +52 @@
                 echo "COMPILER=gcc_native" >>"$PRUNE_CONFIG_FILE"
                 echo "COMPILER=gcc_helenos" >>"$PRUNE_CONFIG_FILE"
-                echo "COMPILER=icc" >>"$PRUNE_CONFIG_FILE"
                 ;;
         *|h)

kernel/Makefile

@@ -92 +92 @@
         -Wwrite-strings -pipe
 
-ICC_CFLAGS = -Wall -Wmissing-prototypes \
-        -Werror-implicit-function-declaration -wd170
-
 CLANG_CFLAGS = -std=gnu99 -Wall -Wextra -Wno-unused-parameter \
         -Wno-missing-field-initializers -Wno-unused-command-line-argument \
@@ -171 +168 @@
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
         INSTRUMENTATION = -finstrument-functions
-endif
-
-ifeq ($(COMPILER),icc)
-        CFLAGS = $(COMMON_CFLAGS) $(ICC_CFLAGS)
-        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-        INSTRUMENTATION =
 endif
 

tools/autotool.py

@@ -893 +893 @@
                         common['CC_AUTOGEN'] = common['CC']
                 
-                if (config['COMPILER'] == "icc"):
-                        check_app([common['CC'], "-V"], "Intel C++ Compiler", "support is experimental")
-                        check_gcc(None, "", common, PACKAGE_GCC)
-                        check_binutils(None, binutils_prefix, common, PACKAGE_BINUTILS)
-                        
-                        common['CC'] = "icc"
-                        common['CC_AUTOGEN'] = common['CC']
-                
                 if (config['COMPILER'] == "clang"):
                         check_binutils(path, prefix, common, PACKAGE_CROSS)

uspace/Makefile.common

@@ -244 +244 @@
         -Wwrite-strings -pipe
 
-ICC_CFLAGS = -Wall -Wextra -Wno-clobbered -Wno-unused-parameter \
-        -Wmissing-prototypes -Werror-implicit-function-declaration \
-        -Wwrite-strings -pipe
-
 # -Wno-missing-prototypes is there because it warns about main().
 # This should be fixed elsewhere.
@@ -261 +257 @@
 ifeq ($(CONFIG_LINE_DEBUG),y)
         GCC_CFLAGS += -ggdb
-        ICC_CFLAGS += -g
         CLANG_CFLAGS += -g
 endif
@@ -293 +288 @@
 ifeq ($(COMPILER),gcc_native)
         CFLAGS += $(COMMON_CFLAGS) $(GCC_CFLAGS)
-        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-endif
-
-ifeq ($(COMPILER),icc)
-        CFLAGS += $(COMMON_CFLAGS) $(ICC_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif