Skip to content

Commit

Permalink
dev-util/systemtap: tweak operand constraints for ia64, bug #510134
Browse files Browse the repository at this point in the history
Reported-by: Émeric Maschino
Closes: https://bugs.gentoo.org/510134
Package-Manager: Portage-2.3.13, Repoman-2.3.4
  • Loading branch information
Sergei Trofimovich committed Nov 7, 2017
1 parent cac4e82 commit aba6b82
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
23 changes: 23 additions & 0 deletions dev-util/systemtap/files/systemtap-3.1-ia64.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Workaround build failure on ia64

Avoid 'o' constraint to allow gcc to select register operand.
That way instruction selector can satisfy all constraints
for PROBE2 macro.

Reported-by: Émeric Maschino
Bug: https://bugs.gentoo.org/510134
diff --git a/cache.cxx b/cache.cxx
index 3546b30..2710abf 100644
--- a/cache.cxx
+++ b/cache.cxx
@@ -8,2 +8,10 @@

+#ifdef __ia64__
+// Default is: nor
+// We disable 'o' because gcc fails to select register
+// constraint for second instruction in 'add_script_to_cache'
+// https://bugs.gentoo.org/510134
+# define STAP_SDT_ARG_CONSTRAINT nr
+#endif
+
#include "config.h"
2 changes: 2 additions & 0 deletions dev-util/systemtap/systemtap-3.1-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ ERROR_DEBUG_FS="${PN} works best with support for Debug Filesystem (DEBUG_FS) -

DOCS="AUTHORS HACKING NEWS README"

PATCHES=("${FILESDIR}"/${PN}-3.1-ia64.patch)

pkg_setup() {
linux-info_pkg_setup
python-single-r1_pkg_setup
Expand Down

0 comments on commit aba6b82

Please sign in to comment.