Bug 992471: Update to NSPR_4_10_5_BETA4.
authorWan-Teh Chang <wtc@google.com>
Sun, 27 Apr 2014 19:59:07 -0700
changeset 180505 3a49b88c5bb05b15aabcde775e18aa405c0bf7a1
parent 180504 ba55dd0b1a12bcc3462d7b4357e20ea1dbf2f007
child 180506 08c2d710f13d693b0fad5afab3070ffdca78f02e
push id26670
push usercbook@mozilla.com
push dateMon, 28 Apr 2014 12:22:00 +0000
treeherdermozilla-central@bbad533aa83e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs992471
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 992471: Update to NSPR_4_10_5_BETA4.
nsprpub/TAG-INFO
nsprpub/config/prdepend.h
nsprpub/configure
nsprpub/configure.in
nsprpub/pr/src/pthreads/ptsynch.c
--- a/nsprpub/TAG-INFO
+++ b/nsprpub/TAG-INFO
@@ -1,1 +1,1 @@
-NSPR_4_10_5_BETA3
+NSPR_4_10_5_BETA4
--- a/nsprpub/config/prdepend.h
+++ b/nsprpub/config/prdepend.h
@@ -5,9 +5,8 @@
 
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSPR in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
-
--- a/nsprpub/configure
+++ b/nsprpub/configure
@@ -3123,18 +3123,17 @@ if test -n "$MOZ_DEBUG"; then
     esac
 else
     $as_echo "#define NDEBUG 1" >>confdefs.h
 
     DEFINES="$DEFINES -UDEBUG"
 fi
 
 if test -z "$SKIP_COMPILER_CHECKS"; then
-
-if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
+if test "$target" != "$host"; then
     echo "cross compiling from $host to $target"
     cross_compiling=yes
 
     case "$build:$target" in
       powerpc-apple-darwin8*:i?86-apple-darwin*)
                                                 _SAVE_CFLAGS=$CFLAGS
         _SAVE_CXXFLAGS=$CXXFLAGS
         CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
@@ -3979,17 +3978,17 @@ fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
+if test "$target" != "$host"; then
     if test -n "$USE_CPLUS"; then
         for ac_prog in $CXX "${target_alias}-g++" "${target}-g++"
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CXX+:} false; then :
--- a/nsprpub/configure.in
+++ b/nsprpub/configure.in
@@ -565,21 +565,17 @@ else
     AC_DEFINE(NDEBUG)
     DEFINES="$DEFINES -UDEBUG"
 fi
 
 if test -z "$SKIP_COMPILER_CHECKS"; then
 dnl ========================================================
 dnl Checks for compilers.
 dnl ========================================================
-
-dnl Explicitly honor $CROSS_COMPILE to allow cross-compiling
-dnl between toolkits on the same architecture, as when
-dnl targeting the iOS Simulator from OS X.
-if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
+if test "$target" != "$host"; then
     echo "cross compiling from $host to $target"
     cross_compiling=yes
 
     case "$build:$target" in
       powerpc-apple-darwin8*:i?86-apple-darwin*)
         dnl The Darwin cross compiler doesn't necessarily point itself at a
         dnl root that has libraries for the proper architecture, it defaults
         dnl to the system root.  The libraries in the system root on current
@@ -608,17 +604,17 @@ fi
 
 dnl In the latest versions of autoconf, AC_PROG_CC is a one-shot macro,
 dnl declared with AC_DEFUN_ONCE. So it must not be expanded inside a
 dnl conditional block. Invoke AC_PROG_CC outside any conditional block
 dnl and before invoking AC_TRY_COMPILE (which requires AC_PROG_CC).
 AC_PROG_CC
 
 dnl Reenter the conditional blocks after invoking AC_PROG_CC.
-if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
+if test "$target" != "$host"; then
     if test -n "$USE_CPLUS"; then
         AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", echo)
         unset ac_cv_prog_CXX
         AC_PROG_CXX
     fi
 
     case "$build:$target" in
       powerpc-apple-darwin8*:i?86-apple-darwin*|*:arm*-apple-darwin*)
--- a/nsprpub/pr/src/pthreads/ptsynch.c
+++ b/nsprpub/pr/src/pthreads/ptsynch.c
@@ -509,17 +509,17 @@ PR_IMPLEMENT(PRMonitor*) PR_NewMonitor(v
     return mon;
 
 error3:
     pthread_cond_destroy(&mon->entryCV);
 error2:
     pthread_mutex_destroy(&mon->lock);
 error1:
     PR_Free(mon);
-    PR_SetError(PR_OPERATION_NOT_SUPPORTED_ERROR, 0);
+    _PR_MD_MAP_DEFAULT_ERROR(rv);
     return NULL;
 }  /* PR_NewMonitor */
 
 PR_IMPLEMENT(PRMonitor*) PR_NewNamedMonitor(const char* name)
 {
     PRMonitor* mon = PR_NewMonitor();
     if (mon)
         mon->name = name;