Update NSPR to NSPR_4_8_9_BETA3 which includes bug 661351 and bug 626035 (7f947e26) · Commits · Tommy Webb / Tor Browser

nsprpub/TAG-INFO

+1 −1

Original line number	Diff line number	Diff line
		NSPR_4_8_9_BETA2
		NSPR_4_8_9_BETA3

nsprpub/configure

+319 −132

File changed.

Preview size limit exceeded, changes collapsed.

nsprpub/configure.in

+158 −31

Original line number	Diff line number	Diff line
		@@ -78,7 +78,6 @@ MACOS_SDK_DIR=
		NEXT_ROOT=
		MT=
		MOZ_OS2_HIGH_MEMORY=1
		MOZ_THUMB2=
		PROFILE_GEN_CFLAGS=
		PROFILE_GEN_LDFLAGS=
		PROFILE_USE_CFLAGS=
		@@ -927,39 +926,167 @@ AC_ARG_ENABLE(os2-high-mem,
		fi ])

		dnl ========================================================
		dnl = Enable building the Thumb2 instruction set
		dnl = ARM toolchain tweaks
		dnl ========================================================
		AC_ARG_ENABLE(thumb2,
		[ --enable-thumb2 Enable Thumb-2 instruction set],
		[ if test "$enableval" = "yes"; then
		MOZ_THUMB2=1,
		fi ])

		if test -n "$MOZ_THUMB2"; then
		case "$target_cpu" in
		arm*)
		if test "$GNU_CC"; then
		CFLAGS="$CFLAGS -march=armv7-a -mthumb"
		CXXFLAGS="$CXXFLAGS -march=armv7-a -mthumb"
		ASFLAGS="$ASFLAGS -march=armv7-a -mthumb"
		else
		AC_MSG_ERROR([--enable-thumb2 is not supported for non-GNU toolchains])
		dnl Defaults
		case "${target}" in
		arm-android-eabi)
		MOZ_THUMB=yes
		MOZ_ARCH=armv7-a
		MOZ_FPU=vfp
		MOZ_FLOAT_ABI=softfp
		;;
		arm-)
		if test -n "$MOZ_PLATFORM_MAEMO"; then
		MOZ_THUMB=no
		MOZ_ARCH=armv7-a
		MOZ_FLOAT_ABI=softfp
		fi
		if test "$MOZ_PLATFORM_MAEMO" = 6; then
		MOZ_THUMB=yes
		fi
		;;
		esac

		dnl Kept for compatibility with some buildbot mozconfig
		AC_ARG_ENABLE(thumb2, [], MOZ_THUMB=$enableval)

		AC_ARG_WITH(thumb,
		[ --with-thumb[[=yes\|no\|toolchain-default]]]
		[ Use Thumb instruction set (-mthumb)],
		if test -z "$GNU_CC"; then
		AC_MSG_ERROR([--with-thumb is not supported on non-GNU toolchain-defaults])
		fi
		MOZ_THUMB=$withval)

		AC_ARG_WITH(thumb-interwork,
		[ --with-thumb-interwork[[=yes\|no\|toolchain-default]]
		Use Thumb/ARM instuctions interwork (-mthumb-interwork)],
		if test -z "$GNU_CC"; then
		AC_MSG_ERROR([--with-thumb-interwork is not supported on non-GNU toolchain-defaults])
		fi
		MOZ_THUMB_INTERWORK=$withval)

		AC_ARG_WITH(arch,
		[ --with-arch=[[type\|toolchain-default]]
		Use specific CPU features (-march=type)],
		if test -z "$GNU_CC"; then
		AC_MSG_ERROR([--with-arch is not supported on non-GNU toolchain-defaults])
		fi
		MOZ_ARCH=$withval)

		AC_ARG_WITH(fpu,
		[ --with-fpu=[[type\|toolchain-default]]
		Use specific FPU type (-mfpu=type)],
		if test -z "$GNU_CC"; then
		AC_MSG_ERROR([--with-fpu is not supported on non-GNU toolchain-defaults])
		fi
		MOZ_FPU=$withval)

		AC_ARG_WITH(float-abi,
		[ --with-float-abi=[[type\|toolchain-default]]
		Use specific arm float ABI (-mfloat-abi=type)],
		if test -z "$GNU_CC"; then
		AC_MSG_ERROR([--with-float-abi is not supported on non-GNU toolchain-defaults])
		fi
		MOZ_FLOAT_ABI=$withval)

		AC_ARG_WITH(soft-float,
		[ --with-soft-float[[=yes\|no\|toolchain-default]]
		Use soft float library (-msoft-float)],
		if test -z "$GNU_CC"; then
		AC_MSG_ERROR([--with-soft-float is not supported on non-GNU toolchain-defaults])
		fi
		MOZ_SOFT_FLOAT=$withval)

		case "$MOZ_ARCH" in
		toolchain-default\|"")
		arch_flag=""
		;;
		*)
		AC_MSG_ERROR([--enable-thumb2 is not supported for non-ARM CPU architectures])
		arch_flag="-march=$MOZ_ARCH"
		;;
		esac
		else
		case "$target" in
		arm-android-eabi)
		if test "$GNU_CC"; then
		CFLAGS="$CFLAGS -march=armv5te -mthumb-interwork"
		CXXFLAGS="$CXXFLAGS -march=armv5te -mthumb-interwork"
		ASFLAGS="$ASFLAGS -march=armv5te -mthumb-interwork"
		fi

		case "$MOZ_THUMB" in
		yes)
		MOZ_THUMB2=1
		thumb_flag="-mthumb"
		;;
		no)
		MOZ_THUMB2=
		thumb_flag="-marm"
		;;
		*)
		_SAVE_CFLAGS="$CFLAGS"
		CFLAGS="$arch_flag"
		AC_TRY_COMPILE([],[return sizeof(__thumb2__);],
		MOZ_THUMB2=1,
		MOZ_THUMB2=)
		CFLAGS="$_SAVE_CFLAGS"
		thumb_flag=""
		;;
		esac

		case "$MOZ_THUMB_INTERWORK" in
		yes)
		thumb_interwork_flag="-mthumb-interwork"
		;;
		no)
		thumb_interwork_flag="-mno-thumb-interwork"
		;;
		*) # toolchain-default
		thumb_interwork_flag=""
		;;
		esac

		case "$MOZ_FPU" in
		toolchain-default\|"")
		fpu_flag=""
		;;
		*)
		fpu_flag="-mfpu=$MOZ_FPU"
		;;
		esac

		case "$MOZ_FLOAT_ABI" in
		toolchain-default\|"")
		float_abi_flag=""
		;;
		*)
		float_abi_flag="-mfloat-abi=$MOZ_FLOAT_ABI"
		;;
		esac

		case "$MOZ_SOFT_FLOAT" in
		yes)
		soft_float_flag="-msoft-float"
		;;
		no)
		soft_float_flag="-mno-soft-float"
		;;
		*) # toolchain-default
		soft_float_flag=""
		;;
		esac

		dnl Use echo to avoid accumulating space characters
		all_flags=`echo $arch_flag $thumb_flag $thumb_interwork_flag $fpu_flag $float_abi_flag $soft_float_flag`
		if test -n "$all_flags"; then
		_SAVE_CFLAGS="$CFLAGS"
		CFLAGS="$all_flags"
		AC_MSG_CHECKING(whether the chosen combination of compiler flags ($all_flags) works)
		AC_TRY_COMPILE([],[return 0;],
		AC_MSG_RESULT([yes]),
		AC_MSG_ERROR([no]))

		CFLAGS="$_SAVE_CFLAGS $all_flags"
		CXXFLAGS="$CXXFLAGS $all_flags"
		ASFLAGS="$ASFLAGS $all_flags"
		if test -n "$thumb_flag"; then
		LDFLAGS="$LDFLAGS $thumb_flag"
		fi
		fi

		dnl ========================================================

nsprpub/pr/src/misc/prsystem.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -282,6 +282,7 @@ PR_IMPLEMENT(PRUint64) PR_GetPhysicalMemorySize(void)

		long pageSize = sysconf(_SC_PAGESIZE);
		long pageCount = sysconf(_SC_PHYS_PAGES);
		if (pageSize >= 0 && pageCount >= 0)
		bytes = (PRUint64) pageSize * pageCount;

		#elif defined(NETBSD) \|\| defined(OPENBSD)