[oe-commits] =?UTF-8?Q?An=C3=ADbal=20Lim=C3=B3n=20?=: systemtap: Fix build in x32 ABI
git at git.openembedded.org
git at git.openembedded.org
Fri Mar 20 10:59:21 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 212576af812d807a939d15fbcca94a7290c013fe
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=212576af812d807a939d15fbcca94a7290c013fe
Author: Aníbal Limón <anibal.limon at linux.intel.com>
Date: Sun Mar 15 11:00:39 2015 +0000
systemtap: Fix build in x32 ABI
Add a patch for fix printing of time_t value that is long long int
in x32 ABI instead of long int.
[YOCTO #7423]
Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
---
.../systemtap/systemtap/x32_abi_time.patch | 34 ++++++++++++++++++++++
meta/recipes-kernel/systemtap/systemtap_git.inc | 1 +
2 files changed, 35 insertions(+)
diff --git a/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch b/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
new file mode 100644
index 0000000..28a7eae
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
@@ -0,0 +1,34 @@
+Fix time_t print because in x32 ABI is long long int instead of long int.
+
+Upstream-Status: Pending
+
+Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
+
+diff --git a/cache.cxx b/cache.cxx
+index 3546b30..19c77ca 100644
+--- a/cache.cxx
++++ b/cache.cxx
+@@ -294,7 +294,11 @@ clean_cache(systemtap_session& s)
+ {
+ //interval not passed, don't continue
+ if (s.verbose > 1)
++#if defined(__x86_64__) && defined (__ILP32__)
++ clog << _F("Cache cleaning skipped, interval not reached %lld s / %lu s.",
++#else
+ clog << _F("Cache cleaning skipped, interval not reached %lu s / %lu s.",
++#endif
+ (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl;
+ return;
+ }
+@@ -302,7 +306,11 @@ clean_cache(systemtap_session& s)
+ {
+ //interval reached, continue
+ if (s.verbose > 1)
++#if defined(__x86_64__) && defined (__ILP32__)
++ clog << _F("Cleaning cache, interval reached %lld s > %lu s.",
++#else
+ clog << _F("Cleaning cache, interval reached %lu s > %lu s.",
++#endif
+ (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl;
+ }
+
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 4a1f4fb..59a578d 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -8,6 +8,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \
file://obsolete_automake_macros.patch \
file://system_map_location.patch \
file://configure-allow-to-disable-libvirt.patch \
+ file://x32_abi_time.patch \
"
# systemtap doesn't support mips
More information about the Openembedded-commits
mailing list