From 4e9440b186cfdee8a62c740c3bedabd88d25b8a3 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Wed, 24 Mar 2010 17:16:30 +0000
Subject: [PATCH] fix sparc

---
 systemtap-1.2-fix-sparc.patch | 12 ++++++++++++
 systemtap.spec                | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 systemtap-1.2-fix-sparc.patch

diff --git a/systemtap-1.2-fix-sparc.patch b/systemtap-1.2-fix-sparc.patch
new file mode 100644
index 0000000..2644873
--- /dev/null
+++ b/systemtap-1.2-fix-sparc.patch
@@ -0,0 +1,12 @@
+diff -up systemtap-1.2/includes/sys/sdt.h.BAD systemtap-1.2/includes/sys/sdt.h
+--- systemtap-1.2/includes/sys/sdt.h.BAD	2010-03-24 11:30:50.694520827 -0400
++++ systemtap-1.2/includes/sys/sdt.h	2010-03-24 11:44:29.062420646 -0400
+@@ -72,7 +72,7 @@
+ #define STAP_UNINLINE
+ #endif
+ 
+-#if defined __x86_64__ || defined __i386__  || defined __powerpc__ || defined __arm__
++#if defined __x86_64__ || defined __i386__  || defined __powerpc__ || defined __arm__ || defined __sparc__
+ #define STAP_NOP "\tnop "
+ #else
+ #define STAP_NOP "\tnop 0 "
diff --git a/systemtap.spec b/systemtap.spec
index 059a47b..6f00f06 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -12,7 +12,7 @@
 
 Name: systemtap
 Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -78,6 +78,9 @@ BuildRequires: boost-devel
 %endif
 %endif
 
+# http://sources.redhat.com/bugzilla/show_bug.cgi?id=11427
+Patch2: systemtap-1.2-fix-sparc.patch
+
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
 Developers can write instrumentation to collect data on the operation
@@ -189,6 +192,8 @@ find . \( -name configure -o -name config.h.in \) -print | xargs touch
 cd ..
 %endif
 
+%patch2 -p1 -b .sparc
+
 %build
 
 %if %{with_bundled_elfutils}
@@ -508,6 +513,9 @@ exit 0
 
 
 %changelog
+* Wed Mar 24 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 1.2-2
+- fix compilation on sparc
+
 * Mon Mar 22 2010 Frank Ch. Eigler <fche@redhat.com> - 1.2-1
 - Upstream release.