From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 24 Oct 2019 21:29:39 +0000 (+0200)
Subject: - use gcc defines to figure out arch
X-Git-Tag: auto/th/dyninst-10.1.0-4
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=a37f299ca4d4128d4bee5d6fd6a958f61636d582;p=packages%2Fdyninst.git

- use gcc defines to figure out arch
- rel 4
---

diff --git a/dyninst.spec b/dyninst.spec
index 46d4464..6420842 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -2,7 +2,7 @@ Summary:	API for Run-time Code Generation
 Summary(pl.UTF-8):	API do generowania kodu w czasie działania
 Name:		dyninst
 Version:	10.1.0
-Release:	3
+Release:	4
 License:	LGPL v2.1+
 Group:		Libraries
 # http://www.dyninst.org/downloads/dyninst-9.x
diff --git a/format-size.patch b/format-size.patch
index b80e142..d0532cd 100644
--- a/format-size.patch
+++ b/format-size.patch
@@ -4,14 +4,14 @@
  	    snprintf(hex, 20, "%x", val.s32val);
  	    break;
  	  case u64:
-+#if defined(arch_x86) || defined(__ILP32__)
++#if defined(__i386__) || defined(__ILP32__)
 +	    snprintf(hex, 20, "%llx", val.u64val);
 +#else
  	    snprintf(hex, 20, "%lx", val.u64val);
 +#endif
  	    break;
  	  case s64:
-+#if defined(arch_x86) || defined(__ILP32__)
++#if defined(__i386__) || defined(__ILP32__)
 +	    snprintf(hex, 20, "%llx", val.s64val);
 +#else
  	    snprintf(hex, 20, "%lx", val.s64val);
@@ -23,14 +23,14 @@
  	    snprintf(hex, 20, "%x", val.bitval);
  	    break;
  	  case u48:
-+#if defined(arch_x86) || defined(__ILP32__)
++#if defined(__i386__) || defined(__ILP32__)
 +	    snprintf(hex, 20, "%llx", val.s48val);
 +#else
  	    snprintf(hex, 20, "%lx", val.s48val);
 +#endif
  	    break;
  	  case s48:
-+#if defined(arch_x86) || defined(__ILP32__)
++#if defined(__i386__) || defined(__ILP32__)
 +	    snprintf(hex, 20, "%llx", val.s48val);
 +#else
  	    snprintf(hex, 20, "%lx", val.s48val);