Update build scripts.

Author: jolars

src/tbb/build/Makefile.tbb

@@ -23,6 +23,7 @@
 tbb_root ?= "$(TBBROOT)"
 BUILDING_PHASE=1
 include $(tbb_root)/build/common.inc
+CPLUS_FLAGS += $(SDL_FLAGS)
 DEBUG_SUFFIX=$(findstring _debug,_$(cfg))
 
 #------------------------------------------------------------
@@ -36,12 +37,7 @@ default_tbb: $(TBB.DLL)
 
 VPATH = $(tbb_root)/src/tbb/$(ASSEMBLY_SOURCE) $(tbb_root)/src/tbb $(tbb_root)/src/old $(tbb_root)/src/rml/client
 
-CPLUS_FLAGS += $(PIC_KEY) $(DEFINE_KEY)__TBB_BUILD=1
-
-# suppress warnings for build of itt_notify by GCC3
-ifneq (,$(findstring gcc_cc3., $(compiler)_$(runtime)))
-KNOWN_WARNINGS += itt_notify.$(OBJ)
-endif
+CPLUS_FLAGS += $(PIC_KEY) $(DSE_KEY) $(DEFINE_KEY)__TBB_BUILD=1
 
 # Object files (that were compiled from C++ code) that gmake up TBB
 TBB_CPLUS.OBJ = concurrent_hash_map.$(OBJ) \
@@ -79,7 +75,7 @@ TBB_CPLUS.OBJ = concurrent_hash_map.$(OBJ) \
 		tbb_main.$(OBJ)
 
 # OLD/Legacy object files for backward binary compatibility
-ifeq (,$(findstring $(DEFINE_KEY)TBB_NO_LEGACY,$(CXXFLAGS)))
+ifeq (,$(findstring $(DEFINE_KEY)TBB_NO_LEGACY,$(CPLUS_FLAGS)))
 TBB_CPLUS_OLD.OBJ = \
 		concurrent_vector_v2.$(OBJ) \
 		concurrent_queue_v2.$(OBJ) \
@@ -118,5 +114,5 @@ endif
 #clean:
 #	$(RM) *.$(OBJ) *.$(DLL) *.res *.map *.ilk *.pdb *.exp *.manifest *.tmp *.d core core.*[0-9][0-9] *.ver
 
-# Include automatically generated dependences
+# Include automatically generated dependencies
 -include *.d

src/tbb/build/Makefile.tbbmalloc

@@ -54,39 +54,43 @@ PROXY.OBJ := proxy.$(OBJ) tbb_function_replacement.$(OBJ)
 M_CPLUS_FLAGS := $(subst $(WARNING_KEY),,$(M_CPLUS_FLAGS)) $(DEFINE_KEY)__TBBMALLOC_BUILD=1
 M_INCLUDES := $(INCLUDES) $(INCLUDE_KEY)$(MALLOC_ROOT) $(INCLUDE_KEY)$(MALLOC_SOURCE_ROOT)
 
-# Suppress superfluous warnings for TBBmalloc compilation
+# Suppress superfluous warnings for TBBMalloc compilation
 $(MALLOC.OBJ): M_CPLUS_FLAGS += $(WARNING_SUPPRESS)
+# Suppress superfluous warnings for TBBMalloc proxy compilation
+$(PROXY.OBJ): CPLUS_FLAGS += $(WARNING_SUPPRESS)
 
 frontend.$(OBJ): frontend.cpp version_string.ver
-	$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(PIC_KEY) $(M_INCLUDES) $(INCLUDE_KEY). $<
+	$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(PIC_KEY) $(DSE_KEY) $(M_INCLUDES) $(INCLUDE_KEY). $<
 
 $(PROXY.OBJ): %.$(OBJ): %.cpp
-	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(PIC_KEY) $(DEFINE_KEY)__TBBMALLOC_BUILD=1 $(M_INCLUDES) $<
+	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(PIC_KEY) $(DSE_KEY) $(DEFINE_KEY)__TBBMALLOC_BUILD=1 $(M_INCLUDES) $<
 
 $(MALLOC_CPLUS.OBJ): %.$(OBJ): %.cpp
-	$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(PIC_KEY) $(M_INCLUDES) $<
+	$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(PIC_KEY) $(DSE_KEY) $(M_INCLUDES) $<
 
 itt_notify_malloc.$(OBJ): itt_notify.cpp
-	$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(PIC_KEY) $(OUTPUTOBJ_KEY)$@ $(INCLUDES) $<
+	$(CPLUS) $(COMPILE_ONLY) $(M_CPLUS_FLAGS) $(PIC_KEY) $(DSE_KEY) $(OUTPUTOBJ_KEY)$@ $(INCLUDES) $<
 
 MALLOC_LINK_FLAGS = $(LIB_LINK_FLAGS)
 PROXY_LINK_FLAGS = $(LIB_LINK_FLAGS)
 
 ifneq (,$(MALLOC.DEF))
 tbbmalloc.def: $(MALLOC.DEF)
-	$(CPLUS) $(PREPROC_ONLY) $< $(M_CPLUS_FLAGS) $(INCLUDES) > $@
+	$(CPLUS) $(PREPROC_ONLY) $< $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS) $(INCLUDES) > $@
 
 MALLOC_LINK_FLAGS += $(EXPORT_KEY)tbbmalloc.def
 $(MALLOC.DLL): tbbmalloc.def
 endif
 
+$(MALLOC.DLL) $(MALLOCPROXY.DLL): CPLUS_FLAGS += $(SDL_FLAGS)
+$(MALLOC.DLL) $(MALLOCPROXY.DLL): M_CPLUS_FLAGS += $(SLD_FLAGS)
 $(MALLOC.DLL): BUILDING_LIBRARY = $(MALLOC.DLL)
 $(MALLOC.DLL): $(MALLOC.OBJ) $(MALLOC.RES) $(MALLOC_NO_VERSION.DLL)
 	$(subst $(CPLUS),$(CONLY),$(LIB_LINK_CMD)) $(LIB_OUTPUT_KEY)$(MALLOC.DLL) $(MALLOC.OBJ) $(MALLOC.RES) $(LIB_LINK_LIBS) $(MALLOC_LINK_FLAGS)
 
 ifneq (,$(MALLOCPROXY.DEF))
 tbbmallocproxy.def: $(MALLOCPROXY.DEF)
-	$(CPLUS) $(PREPROC_ONLY) $< $(CPLUS_FLAGS) $(INCLUDES) > $@
+	$(CPLUS) $(PREPROC_ONLY) $< $(CPLUS_FLAGS) $(WARNING_SUPPRESS) $(INCLUDES) > $@
 
 PROXY_LINK_FLAGS += $(EXPORT_KEY)tbbmallocproxy.def
 $(MALLOCPROXY.DLL): tbbmallocproxy.def
@@ -141,6 +145,7 @@ MALLOC_TESTS += test_malloc_overload.$(TEST_EXT) \
                 test_malloc_atexit.$(TEST_EXT)
 endif
 # -----------------------------------------------------
+
 # ------------ Set test specific variables ------------
 ifeq (windows.gcc,$(tbb_os).$(compiler))
 test_malloc_overload.$(TEST_EXT): LIBS += $(MALLOCPROXY.LIB)
@@ -154,13 +159,17 @@ MALLOC_LINK_PROXY_TESTS = test_malloc_overload_proxy.$(TEST_EXT)
 MALLOC_ADD_DLL_TESTS =    test_malloc_lib_unload.$(TEST_EXT) test_malloc_used_by_lib.$(TEST_EXT) \
         test_malloc_atexit.$(TEST_EXT)
 
+# TODO: implement accurate warning suppression for tests to unify with Makefile.test.
+
 $(MALLOC_M_CPLUS_TESTS): CPLUS_FLAGS=$(M_CPLUS_FLAGS)
 $(MALLOC_M_CPLUS_TESTS): INCLUDES=$(M_INCLUDES)
 $(MALLOC_NO_LIB_TESTS): LINK_MALLOC.LIB=
 $(MALLOC_NO_LIB_TESTS): LINK_FLAGS+=$(LIBDL)
 $(MALLOC_LINK_PROXY_TESTS): LINK_MALLOC.LIB=$(LINK_MALLOCPROXY.LIB)
+ifneq (,$(DYLIB_KEY))
 $(MALLOC_ADD_DLL_TESTS): %.$(TEST_EXT): %_dll.$(DLL)
 $(MALLOC_ADD_DLL_TESTS): TEST_LIBS+=$(@:.$(TEST_EXT)=_dll.$(LIBEXT))
+endif
 
 test_malloc_over%.$(TEST_EXT): CPLUS_FLAGS=$(subst /MT,/MD,$(M_CPLUS_FLAGS))
 test_malloc_over%.$(TEST_EXT): INCLUDES=$(M_INCLUDES)
@@ -169,13 +178,13 @@ test_malloc_overload_proxy.$(TEST_EXT): LINK_FLAGS+=$(LIBDL)
 test_malloc_atexit_dll.$(DLL): CPLUS_FLAGS=$(subst /MT,/MD,$(M_CPLUS_FLAGS))
 test_malloc_atexit.$(TEST_EXT): CPLUS_FLAGS=$(subst /MT,/MD,$(M_CPLUS_FLAGS))
 test_malloc_atexit.$(TEST_EXT): LINK_FLAGS+=$(LIBDL)
-# on Ubuntu 11.10 linker called with --as-needed, so dependence on libtbbmalloc_proxy
+# on Ubuntu 11.10 linker called with --as-needed, so dependency on libtbbmalloc_proxy
 # is not created, and malloc overload via linking with -ltbbmalloc_proxy is not working.
 # Overcome with --no-as-needed.
 ifeq (linux.gcc,$(tbb_os).$(compiler))
 test_malloc_atexit.$(TEST_EXT): MALLOCPROXY.LIB := -Wl,--no-as-needed $(MALLOCPROXY.LIB)
 endif
-# The test doesn't added to MALLOC_LINK_PROXY_TESTS, because we need both
+# The test isn't added to MALLOC_LINK_PROXY_TESTS, because we need both
 # tbbmalloc and proxy libs. For platforms other than Android it's enough
 # to modify LINK_MALLOC.LIB for TEST_EXT target only. But under Android build
 # of DLL and TEST_EXT can be requested independently, so there is no chance
@@ -196,6 +205,7 @@ test_malloc_used_by_lib_dll.$(DLL): CPLUS_FLAGS=$(subst /MT,/LD,$(M_CPLUS_FLAGS)
 test_malloc_used_by_lib_dll.$(DLL): LINK_FILES+=$(ORIG_LINK_MALLOC.LIB)
 test_malloc_used_by_lib_dll.$(DLL): LIBDL=
 # -----------------------------------------------------
+
 # ---- The list of TBBMalloc test running commands ----
 # run_cmd is usually empty
 malloc_test: $(MALLOC.DLL) malloc_test_no_depends
@@ -222,5 +232,5 @@ endif
 # End of rules for making the TBBMalloc unit tests
 #------------------------------------------------------
 
-# Include automatically generated dependences
+# Include automatically generated dependencies
 -include *.d

src/tbb/build/generate_tbbvars.bat

@@ -26,7 +26,6 @@ set fslash_bin_dir=%bin_dir:\=/%
 set _INCLUDE=INCLUDE& set _LIB=LIB
 if not x%UNIXMODE%==x set _INCLUDE=CPATH& set _LIB=LIBRARY_PATH
 
-if exist tbbvars.bat goto skipbat
 echo Generating local tbbvars.bat
 echo @echo off>tbbvars.bat
 echo SET TBBROOT=%actual_root%>>tbbvars.bat
@@ -36,9 +35,7 @@ echo SET %_INCLUDE%=%%TBBROOT%%\include;%%%_INCLUDE%%%>>tbbvars.bat
 echo SET %_LIB%=%bin_dir%;%%%_LIB%%%>>tbbvars.bat
 echo SET PATH=%bin_dir%;%%PATH%%>>tbbvars.bat
 if not x%UNIXMODE%==x echo SET LD_LIBRARY_PATH=%bin_dir%;%%LD_LIBRARY_PATH%%>>tbbvars.bat
-:skipbat
 
-if exist tbbvars.sh goto skipsh
 echo Generating local tbbvars.sh
 echo #!/bin/sh>tbbvars.sh
 echo export TBBROOT="%fslash_root%">>tbbvars.sh
@@ -48,9 +45,7 @@ echo export %_INCLUDE%="${TBBROOT}/include;$%_INCLUDE%">>tbbvars.sh
 echo export %_LIB%="%fslash_bin_dir%;$%_LIB%">>tbbvars.sh
 echo export PATH="%fslash_bin_dir%;$PATH">>tbbvars.sh
 if not x%UNIXMODE%==x echo export LD_LIBRARY_PATH="%fslash_bin_dir%;$LD_LIBRARY_PATH">>tbbvars.sh
-:skipsh
 
-if exist tbbvars.csh goto skipcsh
 echo Generating local tbbvars.csh
 echo #!/bin/csh>tbbvars.csh
 echo setenv TBBROOT "%actual_root%">>tbbvars.csh
@@ -60,10 +55,11 @@ echo setenv %_INCLUDE% "${TBBROOT}\include;$%_INCLUDE%">>tbbvars.csh
 echo setenv %_LIB% "%bin_dir%;$%_LIB%">>tbbvars.csh
 echo setenv PATH "%bin_dir%;$PATH">>tbbvars.csh
 if not x%UNIXMODE%==x echo setenv LD_LIBRARY_PATH "%bin_dir%;$LD_LIBRARY_PATH">>tbbvars.csh
-:skipcsh
 
-REM Workaround for copying Android* specific libgnustl_shared.so library to work folder
-if not x%LIB_GNU_STL_ANDROID%==x copy /Y "%LIB_GNU_STL_ANDROID%"\libgnustl_shared.so
+if not x%LIB_STL_ANDROID%==x (
+REM Workaround for copying Android* specific stl shared library to work folder
+copy /Y "%LIB_STL_ANDROID:/=\%" .
+)
 
 endlocal
 exit

src/tbb/build/generate_tbbvars.sh

@@ -23,7 +23,7 @@ bin_dir="$PWD"  #
 cd "$tbb_root"  # keep this comments here
 tbb_root="$PWD" # to make it unsensible
 cd "$bin_dir"   # to EOL encoding
-[ -f ./tbbvars.sh ] || cat >./tbbvars.sh <<EOF
+cat >./tbbvars.sh <<EOF
 #!/bin/bash
 export TBBROOT="${tbb_root}" #
 tbb_bin="${bin_dir}" #
@@ -44,7 +44,7 @@ else #
 fi #
 ${TBB_CUSTOM_VARS_SH} #
 EOF
-[ -f ./tbbvars.csh ] || cat >./tbbvars.csh <<EOF
+cat >./tbbvars.csh <<EOF
 #!/bin/csh
 setenv TBBROOT "${tbb_root}" #
 setenv tbb_bin "${bin_dir}" #
@@ -65,7 +65,7 @@ else #
 endif #
 ${TBB_CUSTOM_VARS_CSH} #
 EOF
-# Workaround for copying Android* specific libgnustl_shared.so library to "."
-if [ ! -z "${LIB_GNU_STL_ANDROID}" ]; then #
-	cp ${LIB_GNU_STL_ANDROID}/libgnustl_shared.so . #
+# Workaround for copying Android* specific stl shared library to "."
+if [ ! -z "${LIB_STL_ANDROID}" ]; then #
+    cp ${LIB_STL_ANDROID} . #
 fi #