mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-07-23 23:48:22 +02:00
1be380a22a
Signed-off-by: sin-ack <sin-ack@protonmail.com> Signed-off-by: Sam James <sam@gentoo.org>
30 lines
1 KiB
Diff
30 lines
1 KiB
Diff
# Elf.cpp expects __ELF_NATIVE_CLASS to be defined at least for platforms
|
|
# besides FreeBSD-based ones, and so it defines FOLLY_ELF_NATIVE_CLASS with it.
|
|
# Without __ELF_NATIVE_CLASS (and apparently musl does not define it),
|
|
# FOLLY_ELF_NATIVE_CLASS is also not defined so what was supposed to be
|
|
# expanded to ELFCLASS32 or ELFCLASS64 ends up being
|
|
# ELFCLASSFOLLY_ELF_NATIVE_CLASS.
|
|
#
|
|
# Please refer: https://github.com/facebook/folly/issues/1478
|
|
#
|
|
# Closes: https://bugs.gentoo.org/835744
|
|
--- a/folly/debugging/symbolizer/Elf.cpp
|
|
+++ b/folly/debugging/symbolizer/Elf.cpp
|
|
@@ -40,14 +40,12 @@
|
|
|
|
#if defined(__ELF_NATIVE_CLASS)
|
|
#define FOLLY_ELF_NATIVE_CLASS __ELF_NATIVE_CLASS
|
|
-#elif defined(__FreeBSD__)
|
|
-#if defined(__LP64__)
|
|
+#elif defined(__ANDROID__)
|
|
+#define FOLLY_ELF_NATIVE_CLASS __WORDSIZE
|
|
+#elif defined(__LP64__)
|
|
#define FOLLY_ELF_NATIVE_CLASS 64
|
|
#else
|
|
#define FOLLY_ELF_NATIVE_CLASS 32
|
|
-#endif
|
|
-#elif defined(__ANDROID__)
|
|
-#define FOLLY_ELF_NATIVE_CLASS __WORDSIZE
|
|
#endif // __ELF_NATIVE_CLASS
|
|
|
|
namespace folly {
|