aboutsummaryrefslogtreecommitdiff
path: root/package/thermald/0001-thd_trip_point-fix-32-bit-build-error-with-musl-v1.2.patch
blob: db5bc99a91d1f72ba6b457fa2e0b4663f9c14fbd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
From 074575bf3640485ab6d43ae1efed3eff9cebae13 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
Date: Thu, 5 Mar 2020 13:45:57 +0800
Subject: [PATCH] thd_trip_point: fix 32-bit build error with musl v1.2.0

Error log:
 ../git/src/thd_trip_point.cpp: In member function 'bool cthd_trip_point::thd_trip_point_check(int, unsigned int, int, bool*)':
| ../git/src/thd_trip_point.cpp:250:19: error: format '%ld' expects argument of type 'long int', but argument 6 has type 'time_t' {aka 'long long int'} [-Werror=format=]
|   250 |      thd_log_info("Too early to act zone:%d index %d tm %ld\n",

musl 1.2.0 have new feature:
time_t is now 64-bit on all archs (not just 64-bit archs)

Commit id:
https://git.musl-libc.org/cgit/musl/commit/?id=38143339646a4ccce8afe298c34467767c899f51

Release note link for musl 1.2.0:
https://git.musl-libc.org/cgit/musl/diff/

use %jd and typecast with intmax_t which is maximum width integer type

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
[Upstream: https://github.com/intel/thermal_daemon/commit/a7136682b9e6ebdb53c3c8b472bcd5039d62dc78.patch]
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 src/thd_trip_point.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/thd_trip_point.cpp b/src/thd_trip_point.cpp
index 46f692d..6358c27 100644
--- a/src/thd_trip_point.cpp
+++ b/src/thd_trip_point.cpp
@@ -242,15 +242,9 @@ bool cthd_trip_point::thd_trip_point_check(int id, unsigned int read_temp,
 				time_t tm;
 				time(&tm);
 				if ((tm - cdevs[i].last_op_time) < cdevs[i].sampling_priod) {
-#if defined __x86_64__ && defined __ILP32__
-					thd_log_info("Too early to act zone:%d index %d tm %lld\n",
+					thd_log_info("Too early to act zone:%d index %d tm %jd\n",
 							zone_id, cdev->thd_cdev_get_index(),
-							tm - cdevs[i].last_op_time);
-#else
-					thd_log_info("Too early to act zone:%d index %d tm %ld\n",
-							zone_id, cdev->thd_cdev_get_index(),
-							tm - cdevs[i].last_op_time);
-#endif
+							(intmax_t)tm - cdevs[i].last_op_time);
 					break;
 				}
 				cdevs[i].last_op_time = tm;
-- 
2.29.2