diff options
| author | Aníbal Limón <anibal.limon@linux.intel.com> | 2015-03-15 11:00:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 23:56:03 +0000 |
| commit | 4add6e3a3bf2796c74e5e818dad9b31f4dbccba4 (patch) | |
| tree | cefa7a0001d962297d1132096939d4b446f59056 | |
| parent | 3732fdec0a22a6d8de7f9a9858c60b8e492d2dc0 (diff) | |
| download | ast2050-yocto-poky-4add6e3a3bf2796c74e5e818dad9b31f4dbccba4.zip ast2050-yocto-poky-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>
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/x32_abi_time.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 1 |
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 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@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 |
