FT-582 Remove remaining artifacts from the ICC days

Author: esmet

ft/tests/ftloader-test.cc

@@ -186,7 +186,7 @@ static void test_merge_internal (int a[], int na, int b[], int nb, bool dups) {
 static void test_merge (void) {
     {
 	int avals[]={1,2,3,4,5};
-	int *bvals = NULL; //icc won't let us use a zero-sized array explicitly or by [] = {} construction.
+	int *bvals = NULL;
 	test_merge_internal(avals, 5, bvals, 0, false);
 	test_merge_internal(bvals, 0, avals, 5, false);
     }

portability/toku_portability.h

@@ -188,26 +188,6 @@ extern "C" {
 
 // Deprecated functions.
 #if !defined(TOKU_ALLOW_DEPRECATED)
-#   if defined(__ICL) || defined(__ICC) // Intel Compiler
-#       pragma deprecated (creat, fstat, stat, getpid, syscall, sysconf, mkdir, strdup)
-//#       pragma poison   off_t
-//#       pragma poison   pthread_attr_t       pthread_t
-//#       pragma poison   pthread_mutexattr_t  pthread_mutex_t
-//#       pragma poison   pthread_condattr_t   pthread_cond_t
-//#       pragma poison   pthread_rwlockattr_t pthread_rwlock_t
-//#       pragma poison   timespec
-#    ifndef DONT_DEPRECATE_WRITES
-#       pragma poison   write                pwrite
-#    endif
-#    ifndef DONT_DEPRECATE_MALLOC
-#       pragma deprecated (malloc, free, realloc)
-#    endif
-#    ifndef DONT_DEPRECATE_ERRNO
-#       pragma deprecated (errno)
-#    endif
-#    pragma poison   dup2
-#    pragma poison   _dup2
-#   else
 int      creat(const char *pathname, mode_t mode)   __attribute__((__deprecated__));
 int      fstat(int fd, struct stat *buf)            __attribute__((__deprecated__));
 int      stat(const char *path, struct stat *buf)   __attribute__((__deprecated__));
@@ -281,7 +261,6 @@ extern void *realloc(void*, size_t)            __THROW __attribute__((__deprecat
 #pragma GCC poison __sync_synchronize
 #pragma GCC poison __sync_lock_test_and_set
 #pragma GCC poison __sync_release
-#   endif
 #endif
 
 #if defined(__cplusplus)

scripts/run.fractal.tree.tests.cmake

@@ -85,19 +85,16 @@ set(all_opts
 set(rel_opts
   ${all_opts}
   -DCMAKE_BUILD_TYPE=Release
-  -DINTEL_CC=ON
   -DUSE_BDB=ON
   )
 set(dbg_opts
   ${all_opts}
   -DCMAKE_BUILD_TYPE=Debug
-  -DINTEL_CC=ON
   -DUSE_BDB=ON
   )
 set(cov_opts
   ${all_opts}
   -DCMAKE_BUILD_TYPE=Debug
-  -DINTEL_CC=OFF
   -DUSE_GCOV=ON
   )
 

src/tests/CMakeLists.txt

@@ -160,10 +160,7 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS)
     endforeach(av)
   endforeach(ov)
 
-  if (NOT (CMAKE_SYSTEM_NAME MATCHES Darwin OR
-           (CMAKE_CXX_COMPILER_ID STREQUAL Intel AND
-            CMAKE_BUILD_TYPE STREQUAL Release)
-           OR USE_GCOV))
+  if (NOT (CMAKE_SYSTEM_NAME MATCHES Darwin OR USE_GCOV))
     declare_custom_tests(helgrind1.tdb)
     add_test(NAME ydb/helgrind_helgrind1.tdb
       COMMAND valgrind --quiet --tool=helgrind --error-exitcode=1 --log-file=helgrind1.tdb.deleteme $<TARGET_FILE:helgrind1.tdb>)

util/tests/test_partitioned_counter.cc

@@ -201,9 +201,6 @@ static inline void increment (void) {
 	    head->prev = cp;
 	}
         head = cp;
-#ifdef __INTEL_COMPILER
-        __memory_barrier(); // for some reason I don't understand, ICC needs a memory barrier here. -Bradley
-#endif
 	cp->counter = 0;
 	cp->inited = true;
 	cp->myid = idcounter++;