NetBSD: Stop depending upon nonstandard __WORDSIZE

There is no way to check CPU type in a portable way across ABIs.

Assume if pointers are 64-bit that CPU is capable to perform fast
64-bit operations. Add an extra check to handle x32-ABI.

PulseAudio by default builds with -Wundef. If we add -Werror=undef this
missing define is fatal. By default build log is full of entries like:

In file included from ./pulsecore/core.h:47:0,
                 from ./pulsecore/module.h:31,
                 from ./pulsecore/sink-input.h:31,
                 from pulsecore/sound-file-stream.c:36:
./pulsecore/sample-util.h: In function 'pa_mult_s16_volume':
./pulsecore/sample-util.h:58:5: warning: "__WORDSIZE" is not defined [-Wundef]
 #if __WORDSIZE == 64 || ((ULONG_MAX) > (UINT_MAX))
     ^

(NetBSD-7.99.21 with default GCC 4.8.5)

This change fixes build issues on NetBSD.

This also address a bug reported by Shawn Walker from Oracle (possibly Solaris):
Bug 90880 - builds can fail due to non-portable glibc-specific internal macro usage
This commit is contained in:
Kamil Rytarowski 2015-12-20 01:25:41 +01:00 committed by David Henningsson
parent 13664cd977
commit 7c1a5d6159
3 changed files with 15 additions and 6 deletions

View file

@ -93,12 +93,10 @@ int main(int argc, char *argv[]) {
if (!getenv("MAKE_CHECK"))
pa_log_set_level(PA_LOG_DEBUG);
#if __WORDSIZE == 64 || ((ULONG_MAX) > (UINT_MAX))
pa_log_debug("This seems to be 64-bit code.");
#elif __WORDSIZE == 32
pa_log_debug("This seems to be 32-bit code.");
#if HAVE_FAST_64BIT_OPERATIONS
pa_log_debug("Detected CPU with fast 64-bit operations.");
#else
pa_log_debug("Don't know if this is 32- or 64-bit code.");
pa_log_debug("Not detected CPU with fast 64-bit operations.");
#endif
s = suite_create("Mult-s16");