diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO index 081023c1e0ba..21c774a00756 100644 --- a/nsprpub/TAG-INFO +++ b/nsprpub/TAG-INFO @@ -1 +1 @@ -NSPR_4_34_1_RTM \ No newline at end of file +NSPR_4_35_BETA1 \ No newline at end of file diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h index e49e92677e3e..6c66b37ca0fc 100644 --- a/nsprpub/config/prdepend.h +++ b/nsprpub/config/prdepend.h @@ -10,3 +10,4 @@ */ #error "Do not include this header file." + diff --git a/nsprpub/configure b/nsprpub/configure index 6ad81ac9438d..6343ec7f87a8 100755 --- a/nsprpub/configure +++ b/nsprpub/configure @@ -2486,8 +2486,8 @@ test -n "$target_alias" && program_prefix=${target_alias}- MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=34 -MOD_PATCH_VERSION=1 +MOD_MINOR_VERSION=35 +MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff --git a/nsprpub/configure.in b/nsprpub/configure.in index 53ffe3882bd7..7d4446689a82 100644 --- a/nsprpub/configure.in +++ b/nsprpub/configure.in @@ -15,8 +15,8 @@ dnl ======================================================== dnl = Defaults dnl ======================================================== MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=34 -MOD_PATCH_VERSION=1 +MOD_MINOR_VERSION=35 +MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= USE_PTHREADS= diff --git a/nsprpub/pr/include/md/_linux.cfg b/nsprpub/pr/include/md/_linux.cfg index 23b160fde28d..2232820afeae 100644 --- a/nsprpub/pr/include/md/_linux.cfg +++ b/nsprpub/pr/include/md/_linux.cfg @@ -499,7 +499,7 @@ #elif defined(__mips__) /* For _ABI64 */ -#include +#include #ifdef __MIPSEB__ #define IS_BIG_ENDIAN 1 @@ -1255,6 +1255,52 @@ #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" diff --git a/nsprpub/pr/include/md/_linux.h b/nsprpub/pr/include/md/_linux.h index a26291a8062c..ad57d083301c 100644 --- a/nsprpub/pr/include/md/_linux.h +++ b/nsprpub/pr/include/md/_linux.h @@ -73,6 +73,8 @@ #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 @@ -141,6 +143,18 @@ 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 */ diff --git a/nsprpub/pr/include/prinit.h b/nsprpub/pr/include/prinit.h index c1b9905174d2..ddb7ac44a3f3 100644 --- a/nsprpub/pr/include/prinit.h +++ b/nsprpub/pr/include/prinit.h @@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C ** The format of the version string is ** ".[.] []" */ -#define PR_VERSION "4.34.1" +#define PR_VERSION "4.35 Beta" #define PR_VMAJOR 4 -#define PR_VMINOR 34 -#define PR_VPATCH 1 -#define PR_BETA PR_FALSE +#define PR_VMINOR 35 +#define PR_VPATCH 0 +#define PR_BETA PR_TRUE /* ** PRVersionCheck diff --git a/nsprpub/pr/src/io/prsocket.c b/nsprpub/pr/src/io/prsocket.c index e0f917c16a6b..4ca2bad8f2e8 100644 --- a/nsprpub/pr/src/io/prsocket.c +++ b/nsprpub/pr/src/io/prsocket.c @@ -322,7 +322,7 @@ static PRStatus PR_CALLBACK SocketConnectContinue( #if defined(_WIN64) if (fd->secret->overlappedActive) { PRInt32 rvSent; - if (GetOverlappedResult(osfd, &fd->secret->ol, &rvSent, FALSE) == FALSE) { + if (GetOverlappedResult((HANDLE)osfd, &fd->secret->ol, &rvSent, FALSE) == FALSE) { err = WSAGetLastError(); PR_LOG(_pr_io_lm, PR_LOG_MIN, ("SocketConnectContinue GetOverlappedResult failed %d\n", err)); @@ -354,7 +354,7 @@ static PRStatus PR_CALLBACK SocketConnectContinue( if (fd->secret->overlappedActive) { PR_ASSERT(fd->secret->nonblocking); PRInt32 rvSent; - if (GetOverlappedResult(osfd, &fd->secret->ol, &rvSent, FALSE) == TRUE) { + if (GetOverlappedResult((HANDLE)osfd, &fd->secret->ol, &rvSent, FALSE) == TRUE) { fd->secret->overlappedActive = PR_FALSE; PR_LOG(_pr_io_lm, PR_LOG_MIN, ("SocketConnectContinue GetOverlappedResult succeeded\n")); diff --git a/nsprpub/pr/src/md/unix/unix.c b/nsprpub/pr/src/md/unix/unix.c index f71d1f66a1dd..70bb8e8744f9 100644 --- a/nsprpub/pr/src/md/unix/unix.c +++ b/nsprpub/pr/src/md/unix/unix.c @@ -2755,8 +2755,8 @@ static void _PR_InitIOV(void) _md_iovector._mmap64 = mmap64; #if (defined(ANDROID) && __ANDROID_API__ < 21) /* Same as the open64 case for Android. */ - _md_iovector._fstat64 = fstat; - _md_iovector._stat64 = stat; + _md_iovector._fstat64 = (_MD_Fstat64)fstat; + _md_iovector._stat64 = (_MD_Stat64)stat; #else _md_iovector._fstat64 = fstat64; _md_iovector._stat64 = stat64; diff --git a/nsprpub/pr/src/md/windows/w95sock.c b/nsprpub/pr/src/md/windows/w95sock.c index 5aff369be4b9..abe462fe0219 100644 --- a/nsprpub/pr/src/md/windows/w95sock.c +++ b/nsprpub/pr/src/md/windows/w95sock.c @@ -491,7 +491,7 @@ _PR_MD_TCPSENDTO(PRFileDesc *fd, const void *buf, PRInt32 amount, PRIntn flags, if ( rv < 0 ) { return -1; } - rv = GetOverlappedResult(osfd, &fd->secret->ol, &rvSent, FALSE); + rv = GetOverlappedResult((HANDLE)osfd, &fd->secret->ol, &rvSent, FALSE); if ( rv == TRUE ) { return rvSent; } else { diff --git a/nsprpub/pr/src/misc/prsystem.c b/nsprpub/pr/src/misc/prsystem.c index 109f1ed23f95..dba093e9b17d 100644 --- a/nsprpub/pr/src/misc/prsystem.c +++ b/nsprpub/pr/src/misc/prsystem.c @@ -206,7 +206,11 @@ PR_IMPLEMENT(PRInt32) PR_GetNumberOfProcessors( void ) size_t len = sizeof(numCpus); mib[0] = CTL_HW; +#ifdef HW_NCPUONLINE + mib[1] = HW_NCPUONLINE; +#else mib[1] = HW_NCPU; +#endif rc = sysctl( mib, 2, &numCpus, &len, NULL, 0 ); if ( -1 == rc ) { numCpus = -1; /* set to -1 for return value on error */ diff --git a/nsprpub/pr/tests/vercheck.c b/nsprpub/pr/tests/vercheck.c index 35a922a96600..95bda45292c7 100644 --- a/nsprpub/pr/tests/vercheck.c +++ b/nsprpub/pr/tests/vercheck.c @@ -58,8 +58,8 @@ static char *incompatible_version[] = { "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.34.2", - "4.35", "4.35.1", + "4.35.1", + "4.36", "4.36.1", "10.0", "11.1", "12.14.20" };