- fix building on x32

diff --git a/pnet.spec b/pnet.spec
index 3efafadd9ab0d986c90aeafa47e4772bc665bf36..5f6504638ef887dbb67441dba8cc625ee144e94c 100644 (file)
--- a/pnet.spec
+++ b/pnet.spec
@@ -19,6 +19,7 @@ Patch3:               no-regex_syntax.patch
 Patch4:                %{name}-info.patch
 Patch5:                %{name}-link.patch
 Patch6:                %{name}-opt.patch
+Patch7:                x32.patch
 URL:           http://www.gnu.org/software/dotgnu/pnet.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -304,6 +305,7 @@ Header de desenvolviemnto da Portable .NET.
 %ifarch %{ix86}
 %patch6 -p1
 %endif
+%patch7 -p1
 
 %{__rm} ilasm/ilasm_grammar.c
 

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..b65c1e1
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,20 @@
+--- pnet-0.8.0/support/interlocked_x86.h.orig  2020-04-27 09:47:43.129859127 +0200
++++ pnet-0.8.0/support/interlocked_x86.h       2020-04-27 09:48:05.713191727 +0200
+@@ -114,7 +114,7 @@
+       __asm__ __volatile__
+       (
+               "lock;"
+-#if defined(__x86_64__)
++#if defined(__x86_64__) && !defined(__ILP32__)
+               "cmpxchgq %2, %0;"
+ #else
+               "cmpxchgl %2, %0;"
+@@ -137,7 +137,7 @@
+       (
+               "1:;"
+               "lock;"
+-#if defined(__x86_64__)
++#if defined(__x86_64__) && !defined(__ILP32__)
+               "cmpxchgq %2, %0;"
+ #else
+               "cmpxchgl %2, %0;"