Only assert about x86_64 struct sizes if ABI is LP64, not x32

The __x86_64__ macro identifies a CPU family, and is unfortunately not
enough to identify a concrete ABI.

The normal x86_64 ABI that is used by practical Linux distributions is
LP64 (i.e. 32-bit int, and 64-bit long and pointer), and defines
__x86_64__ and __LP64__.

x32 is a niche ILP32 ABI (i.e. 32-bit int, long and pointer) for x86_64
CPUs, which has different struct sizes due to sizeof(long) and
sizeof(void *) being smaller. It defines __x86_64__ and __ILP32__.

Signed-off-by: Simon McVittie <smcv@debian.org>
This commit is contained in:
Simon McVittie 2020-09-07 14:01:58 +01:00 committed by Wim Taymans
parent b8c58c74d8
commit a652edce0a
7 changed files with 10 additions and 10 deletions

View file

@ -27,7 +27,7 @@
static void test_abi(void)
{
/* array */
#if defined(__x86_64__)
#if defined(__x86_64__) && defined(__LP64__)
spa_assert(sizeof(struct pw_array) == 32);
#else
fprintf(stderr, "%zd\n", sizeof(struct pw_array));

View file

@ -26,7 +26,7 @@
static void test_abi(void)
{
#if defined(__x86_64__)
#if defined(__x86_64__) && defined(__LP64__)
spa_assert(sizeof(struct pw_properties) == 24);
#else
fprintf(stderr, "%zd\n", sizeof(struct pw_properties));

View file

@ -59,7 +59,7 @@ static void test_abi(void)
TEST_FUNC(ev, test, process);
TEST_FUNC(ev, test, drained);
#if defined(__x86_64__)
#if defined(__x86_64__) && defined(__LP64__)
spa_assert(sizeof(struct pw_buffer) == 24);
spa_assert(sizeof(struct pw_time) == 40);
#else