summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/systemtap
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-03-15 11:00:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 23:56:03 +0000
commit4add6e3a3bf2796c74e5e818dad9b31f4dbccba4 (patch)
treecefa7a0001d962297d1132096939d4b446f59056 /meta/recipes-kernel/systemtap
parent3732fdec0a22a6d8de7f9a9858c60b8e492d2dc0 (diff)
downloadpoky-4add6e3a3bf2796c74e5e818dad9b31f4dbccba4.tar.gz
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] (From OE-Core rev: 194f0be44fa37605d0b5897138848fa378593d62) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/systemtap')
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch34
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc1
2 files changed, 35 insertions, 0 deletions
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 0000000000..28a7eae407
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch
@@ -0,0 +1,34 @@
1Fix time_t print because in x32 ABI is long long int instead of long int.
2
3Upstream-Status: Pending
4
5Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
6
7diff --git a/cache.cxx b/cache.cxx
8index 3546b30..19c77ca 100644
9--- a/cache.cxx
10+++ b/cache.cxx
11@@ -294,7 +294,11 @@ clean_cache(systemtap_session& s)
12 {
13 //interval not passed, don't continue
14 if (s.verbose > 1)
15+#if defined(__x86_64__) && defined (__ILP32__)
16+ clog << _F("Cache cleaning skipped, interval not reached %lld s / %lu s.",
17+#else
18 clog << _F("Cache cleaning skipped, interval not reached %lu s / %lu s.",
19+#endif
20 (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl;
21 return;
22 }
23@@ -302,7 +306,11 @@ clean_cache(systemtap_session& s)
24 {
25 //interval reached, continue
26 if (s.verbose > 1)
27+#if defined(__x86_64__) && defined (__ILP32__)
28+ clog << _F("Cleaning cache, interval reached %lld s > %lu s.",
29+#else
30 clog << _F("Cleaning cache, interval reached %lu s > %lu s.",
31+#endif
32 (current_time.tv_sec-sb.st_mtime), cache_clean_interval) << endl;
33 }
34
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 4a1f4fbcdc..59a578daac 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 \
8 file://obsolete_automake_macros.patch \ 8 file://obsolete_automake_macros.patch \
9 file://system_map_location.patch \ 9 file://system_map_location.patch \
10 file://configure-allow-to-disable-libvirt.patch \ 10 file://configure-allow-to-disable-libvirt.patch \
11 file://x32_abi_time.patch \
11 " 12 "
12 13
13# systemtap doesn't support mips 14# systemtap doesn't support mips