- added x32 patch (fix invalid operand size of bsrq instruction); release 2

diff --git a/jemalloc-x32.patch b/jemalloc-x32.patch
new file mode 100644 (file)
index 0000000..82c460d
--- /dev/null
+++ b/jemalloc-x32.patch
@@ -0,0 +1,18 @@
+--- jemalloc-5.2.0/include/jemalloc/internal/bit_util.h.orig   2019-04-28 14:32:25.888211875 +0200
++++ jemalloc-5.2.0/include/jemalloc/internal/bit_util.h        2019-04-28 14:32:29.508401674 +0200
+@@ -86,13 +86,14 @@
+       if(unlikely(x <= 1)) {
+               return x;
+       }
+-      size_t msb_on_index;
+ #if (defined(__amd64__) || defined(__x86_64__))
++      uint64_t msb_on_index;
+       asm ("bsrq %1, %0"
+                       : "=r"(msb_on_index) // Outputs.
+                       : "r"(x-1)           // Inputs.
+               );
+ #elif (defined(JEMALLOC_HAVE_BUILTIN_CLZ))
++      size_t msb_on_index;
+       msb_on_index = (63 ^ __builtin_clzll(x - 1));
+ #endif
+       assert(msb_on_index < 63);

diff --git a/jemalloc.spec b/jemalloc.spec
index 655b4b6161b602c6e24bbb02d16a87c9415e03fa..5ce59174c6eb8df61af5caca2bdc105f115fc6e2 100644 (file)
--- a/jemalloc.spec
+++ b/jemalloc.spec
@@ -2,12 +2,13 @@ Summary:      General-purpose scalable concurrent malloc implementation
 Summary(pl.UTF-8):     Ogólnego przeznaczenia, skalowalna, współbieżna implementacja funkcji malloc
 Name:          jemalloc
 Version:       5.2.0
-Release:       1
+Release:       2
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/jemalloc/jemalloc/releases
 Source0:       https://github.com/jemalloc/jemalloc/releases/download/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5: 0af300de702a1443e6560c1eae254df7
+Patch0:                %{name}-x32.patch
 URL:           http://jemalloc.net/
 BuildRequires: libxslt-progs
 BuildRequires: sed >= 4.0
@@ -57,6 +58,7 @@ Statyczna biblioteka jemalloc.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # This is truncated during build. Seems interesting to save.
 cp -p VERSION version