Commit 166c4cb1 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

#2977 compile the linux portability layer with icc 12.0.3 refs[t:2977]

git-svn-id: file:///svn/toku/tokudb@30134 c7de825b-a66e-492c-adef-691d508d4ae1
parent 81cd82cf
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
CPPFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CPPFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
CPPFLAGS += -I../../toku_include -I.. -I. CPPFLAGS += -I../../toku_include -I.. -I.
OPTFLAGS = -O0 OPTFLAGS = -O0
CFLAGS = -W -Wall -Werror -g $(OPTFLAGS) -std=c99 CFLAGS = -Wall -Werror -g $(OPTFLAGS) -std=c99
ifeq ($(GCCVERSION),4.4.4) ifeq ($(GCCVERSION),4.4.4)
CFLAGS += -Wno-deprecated CFLAGS += -Wno-deprecated
else ifeq ($(GCCVERSION),4.4.2) else ifeq ($(GCCVERSION),4.4.2)
......
...@@ -11,7 +11,7 @@ extern "C" { ...@@ -11,7 +11,7 @@ extern "C" {
#endif #endif
static inline float toku_tdiff (struct timeval *a, struct timeval *b) { static inline float toku_tdiff (struct timeval *a, struct timeval *b) {
return (a->tv_sec - b->tv_sec) +1e-6*(a->tv_usec - b->tv_usec); return (float)((a->tv_sec - b->tv_sec) + 1e-6 * (a->tv_usec - b->tv_usec));
} }
// *************** Performance timers ************************ // *************** Performance timers ************************
......
...@@ -241,7 +241,7 @@ ifeq ($(CC),icc) ...@@ -241,7 +241,7 @@ ifeq ($(CC),icc)
COMBINE_C = -ipo-c COMBINE_C = -ipo-c
FORMAT= #No argument for extra format warnings. FORMAT= #No argument for extra format warnings.
WALL = -Wall -Wcheck # '-Wextra' becomes '-Wcheck' in icc WALL = -Wall -Wcheck # '-Wextra' becomes '-Wcheck' in icc
SYMBOLS= -g -debug all -inline-debug-info SYMBOLS= -g -debug all # deprecated -inline-debug-info
PORTABILITY=-diag-enable port-win PORTABILITY=-diag-enable port-win
AR=xiar AR=xiar
DISABLE_WARNING= DISABLE_WARNING=
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment