Backed out changeset 7b6b2d8dd79b (bug 1015547) for bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 30 May 2014 17:09:34 -0400
changeset 206263 67d59294aef1c987484e75567612ed0c50c881fc
parent 206262 646dcacbd009acfdd03a1df31854b5da4478c04f
child 206264 5d327f49c41da4e0295878c969f9e7d6480d3aec
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1015547
milestone32.0a1
backs out7b6b2d8dd79b7d050a20471b63fada1cb74b3bff
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
Backed out changeset 7b6b2d8dd79b (bug 1015547) for bustage.
configure.in
xpcom/base/nsUUIDGenerator.cpp
--- a/configure.in
+++ b/configure.in
@@ -2941,17 +2941,17 @@ then
     AC_SUBST(MOZ_USE_PTHREADS)
 fi
 
 
 dnl Checks for library functions.
 dnl ========================================================
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r arc4random arc4random_buf)
+AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r arc4random)
 
 dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
 AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
                ac_cv_clock_monotonic,
                [for libs in "" -lrt; do
                     _SAVE_LIBS="$LIBS"
                     LIBS="$LIBS $libs"
                     AC_TRY_LINK([#include <time.h>],
--- a/xpcom/base/nsUUIDGenerator.cpp
+++ b/xpcom/base/nsUUIDGenerator.cpp
@@ -121,19 +121,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
   /* XXX we should be saving the return of setstate here and switching
    * back to it; instead, we use the value returned when we called
    * initstate, since older glibc's have broken setstate() return values
    */
 #ifndef HAVE_ARC4RANDOM
   setstate(mState);
 #endif
 
-#ifdef HAVE_ARC4RANDOM_BUF
-  arc4random_buf(aId, sizeof(nsID));
-#else /* HAVE_ARC4RANDOM_BUF */
   size_t bytesLeft = sizeof(nsID);
   while (bytesLeft > 0) {
 #ifdef HAVE_ARC4RANDOM
     long rval = arc4random();
     const size_t mRBytes = 4;
 #else
     long rval = random();
 #endif
@@ -148,17 +145,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
     uint8_t* dst = ((uint8_t*)aId) + (sizeof(nsID) - bytesLeft);
     size_t toWrite = (bytesLeft < mRBytes ? bytesLeft : mRBytes);
     for (size_t i = 0; i < toWrite; i++) {
       dst[i] = src[i];
     }
 
     bytesLeft -= toWrite;
   }
-#endif /* HAVE_ARC4RANDOM_BUF */
 
   /* Put in the version */
   aId->m2 &= 0x0fff;
   aId->m2 |= 0x4000;
 
   /* Put in the variant */
   aId->m3[0] &= 0x3f;
   aId->m3[0] |= 0x80;