diff options
| author |   WANG Xuerui <xen0n@gentoo.org> | 2022-05-25 22:07:54 +0800 |
|---|---|---|
| committer | WANG Xuerui <xen0n@gentoo.org> | 2022-05-26 08:55:12 +0800 |
| commit | 03b18997ede10a7dcb57b75af04448310d0772c2 (patch) | |
| tree | bee4443a15cd70508fac5df71a31a75fd860edf3 | |
| parent | dev-libs/log4cpp: update EAPI 6 -> 8, avoid Bashism issues w/ configure (diff) | |
| download | gentoo-03b18997ede10a7dcb57b75af04448310d0772c2.tar.gz gentoo-03b18997ede10a7dcb57b75af04448310d0772c2.tar.bz2 gentoo-03b18997ede10a7dcb57b75af04448310d0772c2.zip | |
dev-libs/nspr: fix build on loong
Patch applied here has been running on real loong hardware since late
2021, simple and no problems so far.
See: https://github.com/gentoo/gentoo/pull/25632
Acked-by: Joonas Niilola <juippis@gentoo.org>
Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
| -rw-r--r-- | dev-libs/nspr/files/nspr-4.33-loong.patch | 100 | ||||
| -rw-r--r-- | dev-libs/nspr/nspr-4.33.ebuild | 1 |
2 files changed, 101 insertions, 0 deletions
diff --git a/dev-libs/nspr/files/nspr-4.33-loong.patch b/dev-libs/nspr/files/nspr-4.33-loong.patch new file mode 100644 index 000000000000..96772a2767c0 --- /dev/null +++ b/dev-libs/nspr/files/nspr-4.33-loong.patch @@ -0,0 +1,100 @@ +https://phabricator.services.mozilla.com/D142407 + +--- a/pr/include/md/_linux.h ++++ b/pr/include/md/_linux.h +@@ -71,10 +71,12 @@ + #define _PR_SI_ARCHITECTURE "microblaze" + #elif defined(__nds32__) + #define _PR_SI_ARCHITECTURE "nds32" + #elif defined(__xtensa__) + #define _PR_SI_ARCHITECTURE "xtensa" ++#elif defined(__loongarch64) ++#define _PR_SI_ARCHITECTURE "loongarch64" + #else + #error "Unknown CPU architecture" + #endif + #define PR_DLL_SUFFIX ".so" + +@@ -139,10 +141,22 @@ + #define _MD_ATOMIC_ADD _PR_x86_64_AtomicAdd + extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval); + #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet + #endif + ++#if defined(__loongarch__) ++#if defined(__GNUC__) ++/* Use GCC built-in functions */ ++#define _PR_HAVE_ATOMIC_OPS ++#define _MD_INIT_ATOMIC() ++#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) ++#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) ++#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) ++#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) ++#endif ++#endif ++ + #if defined(__or1k__) + #if defined(__GNUC__) + /* Use GCC built-in functions */ + #define _PR_HAVE_ATOMIC_OPS + #define _MD_INIT_ATOMIC() +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg +@@ -1253,10 +1253,56 @@ + #define PR_ALIGN_OF_WORD 8 + + #define PR_BYTES_PER_WORD_LOG2 3 + #define PR_BYTES_PER_DWORD_LOG2 3 + ++#elif defined(__loongarch64) ++ ++#undef IS_BIG_ENDIAN ++#define IS_LITTLE_ENDIAN 1 ++#define IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 8 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 8 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 64 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 64 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 6 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 6 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 8 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 8 ++#define PR_ALIGN_OF_WORD 8 ++ ++#define PR_BYTES_PER_WORD_LOG2 3 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #else + + #error "Unknown CPU architecture" + + #endif + diff --git a/dev-libs/nspr/nspr-4.33.ebuild b/dev-libs/nspr/nspr-4.33.ebuild index 7be0ae41e449..679f81b80400 100644 --- a/dev-libs/nspr/nspr-4.33.ebuild +++ b/dev-libs/nspr/nspr-4.33.ebuild @@ -28,6 +28,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.8.9-link-flags.patch # We do not need to pass -L$libdir via nspr-config --libs "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch + "${FILESDIR}"/${PN}-4.33-loong.patch ) src_prepare() { |