summaryrefslogtreecommitdiffstats
path: root/package/lshw/0003-Fix-use-of-LONG_BIT.patch
blob: 7d8d73945282ed6f75a30d4f9f9fc8b1208391e9 (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
From 50284ac4400ac3d7562f4765726492caee8ff547 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sat, 27 Aug 2016 01:15:13 +0200
Subject: [PATCH] Fix use of LONG_BIT

LONG_BIT is not a sysconf value, it is either 32 or 64. Using it as
a sysconf value will give weird results.

Originally it was sysconf(_SC_LONG_BIT) (before it was "fixed" by the
gentoo guys). But this is useless: it will always return a value
equal to LONG_BIT: it's either compiled 32-bit or 64-bit so a runtime
lookup doesn't make sense. For this reason, musl has removed the
definition of _SC_LONG_BIT.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 src/core/abi.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/core/abi.cc b/src/core/abi.cc
index 76e5082..a13daaa 100644
--- a/src/core/abi.cc
+++ b/src/core/abi.cc
@@ -19,8 +19,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
 
 bool scan_abi(hwNode & system)
 {
-  // are we compiled as 32- or 64-bit process ?
-  system.setWidth(sysconf(LONG_BIT));
+  system.setWidth(LONG_BIT);
 
   pushd(PROC_SYS);
 
-- 
2.9.3

OpenPOWER on IntegriCloud