9d5bfa
diff -up tbb-2019_U6/build/common_rules.inc.orig tbb-2019_U6/build/common_rules.inc
9d5bfa
--- tbb-2019_U6/build/common_rules.inc.orig	2019-04-18 05:14:08.000000000 -0600
9d5bfa
+++ tbb-2019_U6/build/common_rules.inc	2019-05-08 08:30:03.434532204 -0600
9d5bfa
@@ -130,7 +130,7 @@ LINK_FILES+=$(TEST_LIBS)
9d5bfa
 
9d5bfa
 # Customizations
9d5bfa
 $(KNOWN_WARNINGS): %.$(OBJ): %.cpp
9d5bfa
-	$(CPLUS) $(COMPILE_ONLY) $(subst $(WARNING_KEY),,$(CPLUS_FLAGS)) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
9d5bfa
+	$(CPLUS) $(COMPILE_ONLY) $(CPLUS_FLAGS) $(CXX_ONLY_FLAGS) $(CXX_WARN_SUPPRESS) $(INCLUDES) $<
9d5bfa
 
9d5bfa
 tbb_misc.$(OBJ): version_string.ver
9d5bfa
 tbb_misc.$(OBJ): INCLUDES+=$(INCLUDE_KEY).
9d5bfa
diff -up tbb-2019_U6/build/Makefile.tbbmalloc.orig tbb-2019_U6/build/Makefile.tbbmalloc
9d5bfa
--- tbb-2019_U6/build/Makefile.tbbmalloc.orig	2019-04-18 05:14:08.000000000 -0600
9d5bfa
+++ tbb-2019_U6/build/Makefile.tbbmalloc	2019-05-08 08:30:03.447531968 -0600
9d5bfa
@@ -47,11 +47,11 @@ ORIG_LINK_MALLOC.LIB:=$(LINK_MALLOC.LIB)
9d5bfa
 MALLOC_CPLUS.OBJ = backend.$(OBJ) large_objects.$(OBJ) backref.$(OBJ)  tbbmalloc.$(OBJ)
9d5bfa
 MALLOC.OBJ := $(MALLOC_CPLUS.OBJ) $(MALLOC_ASM.OBJ) itt_notify_malloc.$(OBJ) frontend.$(OBJ)
9d5bfa
 PROXY.OBJ := proxy.$(OBJ) tbb_function_replacement.$(OBJ)
9d5bfa
-M_CPLUS_FLAGS += $(DEFINE_KEY)__TBBMALLOC_BUILD=1
9d5bfa
+M_CPLUS_FLAGS += -fno-strict-aliasing $(DEFINE_KEY)__TBBMALLOC_BUILD=1
9d5bfa
 M_INCLUDES := $(INCLUDES) $(INCLUDE_KEY)$(MALLOC_ROOT) $(INCLUDE_KEY)$(MALLOC_SOURCE_ROOT)
9d5bfa
 
9d5bfa
 # Suppress superfluous warnings for TBBMalloc compilation
9d5bfa
-$(MALLOC.OBJ): M_CPLUS_FLAGS := $(subst $(WARNING_KEY),,$(M_CPLUS_FLAGS)) $(WARNING_SUPPRESS)
9d5bfa
+$(MALLOC.OBJ): M_CPLUS_FLAGS := $(M_CPLUS_FLAGS) $(WARNING_SUPPRESS)
9d5bfa
 # Suppress superfluous warnings for TBBMalloc proxy compilation
9d5bfa
 $(PROXY.OBJ): CPLUS_FLAGS += $(WARNING_SUPPRESS)
9d5bfa
 
9d5bfa
diff -up tbb-2019_U6/build/Makefile.test.orig tbb-2019_U6/build/Makefile.test
9d5bfa
--- tbb-2019_U6/build/Makefile.test.orig	2019-05-08 08:30:03.448531949 -0600
9d5bfa
+++ tbb-2019_U6/build/Makefile.test	2019-05-08 08:31:48.190498336 -0600
9d5bfa
@@ -275,7 +275,7 @@ test_tbb_plain: $(TEST_PREREQUISITE) $(T
9d5bfa
 
9d5bfa
 
9d5bfa
 # For deprecated files, we don't mind warnings etc., thus compilation rules are most relaxed
9d5bfa
-CPLUS_FLAGS_DEPRECATED = $(DEFINE_KEY)__TBB_TEST_DEPRECATED=1 $(subst $(WARNING_KEY),,$(CPLUS_FLAGS)) $(WARNING_SUPPRESS) $(INCLUDE_KEY)$(tbb_root)/src/test
9d5bfa
+CPLUS_FLAGS_DEPRECATED = $(DEFINE_KEY)__TBB_TEST_DEPRECATED=1 $(CPLUS_FLAGS) $(WARNING_SUPPRESS) $(INCLUDE_KEY)$(tbb_root)/src/test
9d5bfa
 TEST_TBB_OLD.OBJ = test_concurrent_vector_v2.$(OBJ) test_concurrent_queue_v2.$(OBJ) test_mutex_v2.$(OBJ) test_task_scheduler_observer_v3.$(OBJ)
9d5bfa
 
9d5bfa
 $(TEST_TBB_OLD.OBJ): CPLUS_FLAGS := $(CPLUS_FLAGS_DEPRECATED)
9d5bfa
9d5bfa
Diff finished.  Wed May  8 08:31:49 2019