1 files changed, 11 insertions, 23 deletions
diff --git a/var/spack/repos/builtin/packages/intel-tbb/tbb_gcc_rtm_key.patch b/var/spack/repos/builtin/packages/intel-tbb/tbb_gcc_rtm_key.patch
index f1a42fb52f..29f040d4a8 100644
--- a/var/spack/repos/builtin/packages/intel-tbb/tbb_gcc_rtm_key.patch
+++ b/var/spack/repos/builtin/packages/intel-tbb/tbb_gcc_rtm_key.patch
@@ -1,23 +1,11 @@
-*** build/linux.gcc.inc.orig	2017-01-10 16:54:01.000000000 -0800
---- build/linux.gcc.inc	2017-01-10 16:54:04.000000000 -0800
-***************
-*** 49,57 ****
-  endif
-  
-  # gcc 4.8 and later support RTM intrinsics, but require command line switch to enable them
-! ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[8-9]|[5-9])"))
-!     RTM_KEY = -mrtm
-! endif
-  
-  ifeq ($(cfg), release)
-          CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
---- 49,57 ----
-  endif
-  
-  # gcc 4.8 and later support RTM intrinsics, but require command line switch to enable them
-! #ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[8-9]|[5-9])"))
-! #    RTM_KEY = -mrtm
-! #endif
-  
-  ifeq ($(cfg), release)
-          CPLUS_FLAGS = $(ITT_NOTIFY) -g -O2 -DUSE_PTHREAD
-\ No newline at end of file
+--- build/linux.gcc.inc~	2016-09-15 07:00:44.000000000 -0500
++++ build/linux.gcc.inc	2018-06-07 17:32:53.181194974 -0500
+@@ -46,7 +46,7 @@
+ 
+ # gcc 4.8 and later support RTM intrinsics, but require command line switch to enable them
+ ifneq (,$(shell gcc -dumpversion | egrep  "^(4\.[8-9]|[5-9])"))
+-    RTM_KEY = -mrtm
++    RTM_KEY = # -mrtm
+ endif
+ 
+ ifeq ($(cfg), release)