- use gcc defines to figure out arch

- rel 4

diff --git a/dyninst.spec b/dyninst.spec
index 46d44647981ee053ec1dd98c69e9d07c63e9f149..64208426a599975ba8b38d54d93cd5d308db8552 100644 (file)
--- 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 b80e1427a5a2372c80342e4bfff74bc187998815..d0532cd7d18ef574f87b3ec3aeec0f55da980066 100644 (file)
--- 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);