diff --git a/sources b/sources index 0bf44de..259db9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tbb-2019_U6.tar.gz) = 6513d30a498f507cb3e9a06746e430a8bc829de0d204b15d7a79f79c5e7565e59bb0b459c8ca4946293ecb25e2ce11d25cfc7f311e91c7e67342eceb31000d07 +SHA512 (tbb-2019_U7.tar.gz) = d1dd29d6b0276deb71e8621cd831817d7098cbd1f88586e8ed706118c0b7d9143c748dd05bf3797f4ae78411ae2da92b7a15a84f7ea6e3da6fcdd4e36db7be4a diff --git a/tbb-2019-attributes.patch b/tbb-2019-attributes.patch index 897f0ff..ebb71fb 100644 --- a/tbb-2019-attributes.patch +++ b/tbb-2019-attributes.patch @@ -1,12 +1,12 @@ -diff -up tbb-2019_U6/src/tbbmalloc/proxy.cpp.orig tbb-2019_U6/src/tbbmalloc/proxy.cpp ---- tbb-2019_U6/src/tbbmalloc/proxy.cpp.orig 2019-04-18 05:14:08.000000000 -0600 -+++ tbb-2019_U6/src/tbbmalloc/proxy.cpp 2019-05-08 09:27:27.394676858 -0600 +diff -up tbb-2019_U7/src/tbbmalloc/proxy.cpp.orig tbb-2019_U7/src/tbbmalloc/proxy.cpp +--- tbb-2019_U7/src/tbbmalloc/proxy.cpp.orig 2019-05-23 04:35:29.000000000 -0600 ++++ tbb-2019_U7/src/tbbmalloc/proxy.cpp 2019-05-23 18:25:22.360659477 -0600 @@ -146,7 +146,7 @@ static inline void initPageSize() 1) detection that the proxy library is loaded 2) check that dlsym("malloc") found something different from our replacement malloc */ -extern "C" void *__TBB_malloc_proxy(size_t) __attribute__ ((alias ("malloc"))); -+extern "C" void *__TBB_malloc_proxy(size_t) __attribute__ ((alias ("malloc"),alloc_size(1),leaf,malloc,nothrow)); ++extern "C" void *__TBB_malloc_proxy(size_t) __attribute__ ((alias ("malloc"), copy (malloc))); static void *orig_msize; @@ -19,13 +19,13 @@ diff -up tbb-2019_U6/src/tbbmalloc/proxy.cpp.orig tbb-2019_U6/src/tbbmalloc/prox -void *__libc_memalign(size_t alignment, size_t size) __attribute__ ((alias ("memalign"))); -void *__libc_pvalloc(size_t size) __attribute__ ((alias ("pvalloc"))); -void *__libc_valloc(size_t size) __attribute__ ((alias ("valloc"))); -+void *__libc_malloc(size_t size) __attribute__ ((alias ("malloc"),alloc_size(1),leaf,malloc,nothrow)); -+void *__libc_calloc(size_t num, size_t size) __attribute__ ((alias ("calloc"),alloc_size(1,2),leaf,malloc,nothrow)); -+void *__libc_memalign(size_t alignment, size_t size) __attribute__ ((alias ("memalign"),alloc_size(2),malloc,nothrow)); -+void *__libc_pvalloc(size_t size) __attribute__ ((alias ("pvalloc"),alloc_size(1),malloc,nothrow)); -+void *__libc_valloc(size_t size) __attribute__ ((alias ("valloc"),alloc_size(1),malloc,nothrow)); ++void *__libc_malloc(size_t size) __attribute__ ((alias ("malloc"), copy (malloc))); ++void *__libc_calloc(size_t num, size_t size) __attribute__ ((alias ("calloc"), copy (calloc))); ++void *__libc_memalign(size_t alignment, size_t size) __attribute__ ((alias ("memalign"), copy (memalign))); ++void *__libc_pvalloc(size_t size) __attribute__ ((alias ("pvalloc"), copy (pvalloc))); ++void *__libc_valloc(size_t size) __attribute__ ((alias ("valloc"), copy (valloc))); // call original __libc_* to support naive replacement of free via __libc_free etc void __libc_free(void *ptr) -Diff finished. Wed May 8 09:27:28 2019 +Diff finished. Wed May 23 18:26:03 2019 diff --git a/tbb.spec b/tbb.spec index 15ac476..453ba5d 100644 --- a/tbb.spec +++ b/tbb.spec @@ -1,5 +1,5 @@ %global upver 2019 -%global uprel 6 +%global uprel 7 %global upfullver %{upver}%{?uprel:_U%{uprel}} Name: tbb @@ -187,6 +187,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/cmake/%{name}/README.rst %{python3_sitearch}/__pycache__/TBB* %changelog +* Thu May 23 2019 Jerry James - 2019.7-1 +- Rebase to 2019 update 7 + * Thu May 9 2019 Jerry James - 2019.6-1 - Rebase to 2019 update 6 - Add -attributes patch to silence gcc warnings