Rename the "sys_auxv" feature to "getauxval"

Change-Id: I8d96dea9955d4c749b99fffd14cdbd1e69940d33
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Thiago Macieira 2017-07-02 23:09:49 -07:00
parent d38122f4a2
commit 9ca3443a37
6 changed files with 14 additions and 14 deletions

View File

@ -0,0 +1 @@
SOURCES = getauxval.cpp

View File

@ -1 +0,0 @@
SOURCES = sys_auxv.cpp

View File

@ -162,6 +162,11 @@
"type": "compile", "type": "compile",
"test": "unix/futimesat" "test": "unix/futimesat"
}, },
"getauxval": {
"label": "getauxval()",
"type": "compile",
"test": "unix/getauxval"
},
"getentropy": { "getentropy": {
"label": "getentropy()", "label": "getentropy()",
"type": "compile", "type": "compile",
@ -217,11 +222,6 @@
"type": "compile", "type": "compile",
"test": "unix/syslog" "test": "unix/syslog"
}, },
"sys_auxv": {
"label": "sys/auxv.h",
"type": "compile",
"test": "unix/sys_auxv"
},
"xlocalescanprint": { "xlocalescanprint": {
"label": "xlocale.h (or equivalents)", "label": "xlocale.h (or equivalents)",
"type": "compile", "type": "compile",
@ -281,6 +281,11 @@
"condition": "!config.win32 && !features.futimens && !features.futimes && tests.futimesat", "condition": "!config.win32 && !features.futimens && !features.futimes && tests.futimesat",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"getauxval": {
"label": "getauxval()",
"condition": "config.linux && tests.getauxval",
"output": [ "privateFeature" ]
},
"getentropy": { "getentropy": {
"label": "getentropy()", "label": "getentropy()",
"condition": "config.unix && tests.getentropy", "condition": "config.unix && tests.getentropy",
@ -418,11 +423,6 @@
"condition": "tests.syslog", "condition": "tests.syslog",
"output": [ "privateFeature" ] "output": [ "privateFeature" ]
}, },
"sys_auxv": {
"label": "sys/auxv.h",
"condition": "config.linux && tests.sys_auxv",
"output": [ "privateFeature" ]
},
"threadsafe-cloexec": { "threadsafe-cloexec": {
"label": "Threadsafe pipe creation", "label": "Threadsafe pipe creation",
"condition": "tests.cloexec", "condition": "tests.cloexec",

View File

@ -76,6 +76,7 @@
# define QT_FEATURE_alloca_malloc_h -1 # define QT_FEATURE_alloca_malloc_h -1
#endif #endif
#define QT_FEATURE_cxx11_random (QT_HAS_INCLUDE(<random>) ? 1 : -1) #define QT_FEATURE_cxx11_random (QT_HAS_INCLUDE(<random>) ? 1 : -1)
#define QT_FEATURE_getauxval (QT_HAS_INCLUDE(<sys/auxv.h>) ? 1 : -1)
#define QT_FEATURE_getentropy -1 #define QT_FEATURE_getentropy -1
#define QT_FEATURE_iconv -1 #define QT_FEATURE_iconv -1
#define QT_FEATURE_icu -1 #define QT_FEATURE_icu -1
@ -98,7 +99,6 @@
#define QT_NO_GEOM_VARIANT #define QT_NO_GEOM_VARIANT
#define QT_FEATURE_sharedmemory -1 #define QT_FEATURE_sharedmemory -1
#define QT_FEATURE_systemsemaphore -1 #define QT_FEATURE_systemsemaphore -1
#define QT_FEATURE_sys_auxv (QT_HAS_INCLUDE(<sys/auxv.h>) ? 1 : -1)
#ifdef QT_BUILD_QMAKE #ifdef QT_BUILD_QMAKE
#define QT_FEATURE_commandlineparser -1 #define QT_FEATURE_commandlineparser -1

View File

@ -57,7 +57,7 @@
# include "qhashfunctions.h" # include "qhashfunctions.h"
# endif # endif
# if QT_CONFIG(sys_auxv) # if QT_CONFIG(getauxval)
# include <sys/auxv.h> # include <sys/auxv.h>
# endif # endif
#endif // !QT_CONFIG(getentropy) #endif // !QT_CONFIG(getentropy)
@ -291,7 +291,7 @@ static void fallback_fill(quint32 *ptr, qssize_t left) Q_DECL_NOTHROW
if (quint32 v = seed.load()) if (quint32 v = seed.load())
*end++ = v; // 6 *end++ = v; // 6
#if QT_CONFIG(sys_auxv) #if QT_CONFIG(getauxval)
// works on Linux -- all modern libc have getauxval // works on Linux -- all modern libc have getauxval
# ifdef AT_RANDOM # ifdef AT_RANDOM
// ELF's auxv AT_RANDOM has 16 random bytes // ELF's auxv AT_RANDOM has 16 random bytes