system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-10-15 04:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spa/tests/test-buffer.c
View file

@ -36,7 +36,7 @@ static void test_abi(void)
spa_assert(SPA_DATA_MemId == 4);
spa_assert(SPA_DATA_LAST == 5);
#if defined(__x86_64__)
#if defined(__x86_64__) && defined(__LP64__)
spa_assert(sizeof(struct spa_chunk) == 16);
spa_assert(sizeof(struct spa_data) == 40);
spa_assert(sizeof(struct spa_buffer) == 24);
@ -56,7 +56,7 @@ static void test_abi(void)
spa_assert(SPA_META_Control == 6);
spa_assert(SPA_META_LAST == 7);
#if defined(__x86_64__)
#if defined(__x86_64__) && defined(__LP64__)
spa_assert(sizeof(struct spa_meta) == 16);
spa_assert(sizeof(struct spa_meta_header) == 32);
spa_assert(sizeof(struct spa_meta_region) == 16);

6
spa/tests/test-node.c
View file

@ -42,7 +42,7 @@ static void test_io_abi(void)
spa_assert(SPA_IO_RateMatch == 8);
spa_assert(SPA_IO_Memory == 9);
#if defined(__x86_64__)
#if defined(__x86_64__) && defined(__LP64__)
spa_assert(sizeof(struct spa_io_buffers) == 8);
spa_assert(sizeof(struct spa_io_memory) == 16);
spa_assert(sizeof(struct spa_io_range) == 16);
@ -69,7 +69,7 @@ static void test_io_abi(void)
spa_assert(SPA_IO_POSITION_STATE_STARTING == 1);
spa_assert(SPA_IO_POSITION_STATE_RUNNING == 2);
#if defined(__x86_64__)
#if defined(__x86_64__) && defined(__LP64__)
spa_assert(sizeof(struct spa_io_position) == 1688);
spa_assert(sizeof(struct spa_io_rate_match) == 48);
#else
@ -210,7 +210,7 @@ static void test_node_abi(void)
spa_assert(SPA_NODE_METHOD_NUM == 15);
spa_assert(sizeof(m) == sizeof(methods));
#if defined(__x86_64__)
#if defined(__x86_64__) && defined(__LP64__)
spa_assert(sizeof(struct spa_node_info) == 48);
spa_assert(sizeof(struct spa_port_info) == 48);

2
spa/tests/test-pod.c
View file

@ -35,7 +35,7 @@
static void test_abi(void)
{
/* pod */
#if defined(__x86_64__)
#if defined(__x86_64__) && defined(__LP64__)
spa_assert(sizeof(struct spa_pod) == 8);
spa_assert(sizeof(struct spa_pod_bool) == 16);
spa_assert(sizeof(struct spa_pod_id) == 16);

2
spa/tests/test-utils.c
View file

@ -63,7 +63,7 @@ static void test_abi(void)
spa_assert(f.denom == 125);
}
#if defined(__x86_64__)
#if defined(__x86_64__) && defined(__LP64__)
/* dict */
spa_assert(sizeof(struct spa_dict_item) == 16);
spa_assert(sizeof(struct spa_dict) == 16);

2
src/tests/test-array.c
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));

2
src/tests/test-properties.c
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));

2
src/tests/test-stream.c
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