From 241e116e65e76f4f7b4b983a1d6d07b3e0c5f37a Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Wed, 25 Jun 2025 14:20:57 +0200 Subject: [PATCH] svm: don't use __WORDSIZE It is glibc specific, breaks MUSL Type: fix Change-Id: I4f898ec14a9776e298bdf529545adef70f15ddf5 Signed-off-by: Damjan Marion --- src/svm/svm_common.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/svm/svm_common.h b/src/svm/svm_common.h index 0e19ffd3f76..890bc584d23 100644 --- a/src/svm/svm_common.h +++ b/src/svm/svm_common.h @@ -87,16 +87,14 @@ typedef struct svm_map_region_args_ /* * Memory mapped to high addresses for session/vppcom/vcl/etc... */ -#if __WORDSIZE == 64 +#if uword_bits == 64 #ifdef CLIB_SANITIZE_ADDR #define HIGH_SEGMENT_BASEVA 0x300000000000 /* DO NOT CHANGE THIS: YOU'LL BREAK ASAN */ #else /* CLIB_SANITIZE_ADDR */ #define HIGH_SEGMENT_BASEVA (128ULL << 30) /* 128GB */ -#endif /* CLIB_SANITIZE_ADDR */ -#elif __WORDSIZE == 32 -#define HIGH_SEGMENT_BASEVA (3584UL << 20) /* 3.5GB */ +#endif /* CLIB_SANITIZE_ADDR */ #else -#error "unknown __WORDSIZE" +#define HIGH_SEGMENT_BASEVA (3584UL << 20) /* 3.5GB */ #endif /* -- 2.16.6