forked from eweOS/packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[libmarisa] 0.2.6-2: fix riscv64 build
This makes detection of MARISA_WORD_SIZE architecture independent. Links: s-yata/marisa-trie#58
- Loading branch information
Showing
2 changed files
with
49 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
From 6925413d873cec8fd4cabb360fd512be8abc4551 Mon Sep 17 00:00:00 2001 | ||
From: Natanael Copa <[email protected]> | ||
Date: Wed, 24 Apr 2024 11:17:09 +0200 | ||
Subject: [PATCH] Fix detection of MARISA_WORD_SIZE | ||
|
||
Detect the MARISA_WORD_SIZE independent of architecture. | ||
|
||
Fixes: https://github.com/s-yata/marisa-trie/issues/40 | ||
Fixes: https://github.com/s-yata/marisa-trie/issues/57 | ||
Fixes: https://github.com/s-yata/marisa-trie/pull/44 | ||
Fixes: https://github.com/s-yata/marisa-trie/pull/46 | ||
Fixes: https://github.com/s-yata/marisa-trie/pull/56 | ||
--- | ||
include/marisa/base.h | 11 +++++------ | ||
1 file changed, 5 insertions(+), 6 deletions(-) | ||
|
||
diff --git a/include/marisa/base.h b/include/marisa/base.h | ||
index ffcdc5b..bddce4a 100644 | ||
--- a/include/marisa/base.h | ||
+++ b/include/marisa/base.h | ||
@@ -28,14 +28,13 @@ typedef uint32_t marisa_uint32; | ||
typedef uint64_t marisa_uint64; | ||
#endif // _MSC_VER | ||
|
||
-#if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \ | ||
- defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \ | ||
- defined(__sparc64__) || defined(__mips64__) || defined(__aarch64__) || \ | ||
- defined(__s390x__) | ||
+#if (UINTPTR_MAX == 0xffffffffffffffff) | ||
#define MARISA_WORD_SIZE 64 | ||
-#else // defined(_WIN64), etc. | ||
+#elif (UINTPTR_MAX == 0xffffffff) | ||
#define MARISA_WORD_SIZE 32 | ||
-#endif // defined(_WIN64), etc. | ||
+#else | ||
+ #error Failed to detect MARISA_WORD_SIZE | ||
+#endif | ||
|
||
//#define MARISA_WORD_SIZE (sizeof(void *) * 8) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters