Skip to content

Commit

Permalink
devel/onetbb: Integrate patch from previous commit 1daf680
Browse files Browse the repository at this point in the history
to avoid fetch problems.

PR:		257220
Reported by:	mandree
  • Loading branch information
martymac committed Jul 17, 2021
1 parent 75f61e6 commit 908b8b9
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 5 deletions.
3 changes: 0 additions & 3 deletions devel/onetbb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ PORTVERSION= 2021.3.0
DISTVERSIONPREFIX= v
CATEGORIES= devel

PATCH_SITES= https://github.com/oneapi-src/oneTBB/commit/
PATCHFILES= fa944e19600500863507ed8e9b1f5a30037d9df6.patch:-p1

MAINTAINER= martymac@FreeBSD.org
COMMENT= Library that provides thread building blocks

Expand Down
2 changes: 0 additions & 2 deletions devel/onetbb/distinfo
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
TIMESTAMP = 1626043027
SHA256 (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 8f616561603695bbb83871875d2c6051ea28f8187dbe59299961369904d1d49e
SIZE (oneapi-src-oneTBB-v2021.3.0_GH0.tar.gz) = 1651329
SHA256 (fa944e19600500863507ed8e9b1f5a30037d9df6.patch) = a7c4dfdcf6794019d1f4d247cf669e9b8ef4511eb6d254eeca038b82de41334d
SIZE (fa944e19600500863507ed8e9b1f5a30037d9df6.patch) = 1467
30 changes: 30 additions & 0 deletions devel/onetbb/files/patch-src_tbbmalloc_frontend.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Backport fa944e19600500863507ed8e9b1f5a30037d9df6

--- src/tbbmalloc/frontend.cpp.orig 2021-06-30 08:19:55 UTC
+++ src/tbbmalloc/frontend.cpp
@@ -802,21 +802,15 @@ static inline unsigned int highestBitPos(unsigned int
return pos;
}

-
-#if __TBB_x86_32 || __aarch32__
unsigned int getSmallObjectIndex(unsigned int size)
{
- return (size-1)>>3;
-}
-#elif __TBB_x86_64 || __aarch64__
-unsigned int getSmallObjectIndex(unsigned int size)
-{
- // For 64-bit malloc, 16 byte alignment is needed except for bin 0.
unsigned int result = (size-1)>>3;
- if (result) result |= 1; // 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes
+ if (sizeof(void*)==8) {
+ // For 64-bit malloc, 16 byte alignment is needed except for bin 0.
+ if (result) result |= 1; // 0,1,3,5,7; bins 2,4,6 are not aligned to 16 bytes
+ }
return result;
}
-#endif // __TBB_x86_32 || __aarch32__

/*
* Depending on indexRequest, for a given size return either the index into the bin

0 comments on commit 908b8b9

Please sign in to comment.