Bug 1556646 part 1 - Remove PosixNSPR remnants. r=sfink
authorJan de Mooij <jdemooij@mozilla.com>
Fri, 07 Jun 2019 15:47:00 +0000
changeset 537619 1528ef3cf76a5af4ac9048886f0a9af091459dcb
parent 537618 9d30902bfedfe2c9a2c932831bae0e8a785e1b2c
child 537620 b314f6c6148efb8909c3483eb2a49117049a06cd
push id11522
push userffxbld-merge
push dateMon, 01 Jul 2019 09:00:55 +0000
treeherdermozilla-beta@53ea74d2bd09 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfink
bugs1556646
milestone69.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 1556646 part 1 - Remove PosixNSPR remnants. r=sfink Differential Revision: https://phabricator.services.mozilla.com/D33932
js/src/jit/arm64/vixl/Simulator-vixl.h
js/src/moz.build
js/src/util/NSPR.h
js/src/vm/PosixNSPR.cpp
js/src/vm/PosixNSPR.h
js/src/wasm/WasmModule.cpp
--- a/js/src/jit/arm64/vixl/Simulator-vixl.h
+++ b/js/src/jit/arm64/vixl/Simulator-vixl.h
@@ -39,17 +39,16 @@
 #include "jit/arm64/vixl/Instructions-vixl.h"
 #include "jit/arm64/vixl/Instrument-vixl.h"
 #include "jit/arm64/vixl/MozCachingDecoder.h"
 #include "jit/arm64/vixl/Simulator-Constants-vixl.h"
 #include "jit/arm64/vixl/Utils-vixl.h"
 #include "jit/IonTypes.h"
 #include "js/AllocPolicy.h"
 #include "vm/MutexIDs.h"
-#include "vm/PosixNSPR.h"
 #include "wasm/WasmSignalHandlers.h"
 
 namespace vixl {
 
 // Representation of memory, with typed getters and setters for access.
 class Memory {
  public:
   template <typename T>
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -357,21 +357,16 @@ SOURCES += [
     'builtin/RegExp.cpp',
     'jsmath.cpp',
     'jsutil.cpp',
     'util/DoubleToString.cpp',
     'vm/Interpreter.cpp',
     'vm/ProfilingStack.cpp',
 ]
 
-if CONFIG['JS_POSIX_NSPR']:
-    UNIFIED_SOURCES += [
-        'vm/PosixNSPR.cpp',
-    ]
-
 if CONFIG['MOZ_INSTRUMENTS']:
     SOURCES += [
         'devtools/Instruments.cpp',
     ]
 
 if CONFIG['ENABLE_TRACE_LOGGING']:
     SOURCES += [
         'vm/TraceLogging.cpp',
deleted file mode 100644
--- a/js/src/util/NSPR.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=8 sts=2 et sw=2 tw=80:
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef util_NSPR_h
-#define util_NSPR_h
-
-#ifdef JS_POSIX_NSPR
-
-#  include "vm/PosixNSPR.h"
-
-#else /* JS_POSIX_NSPR */
-
-#  include "prinit.h"
-#  include "prio.h"
-#  include "private/pprio.h"
-
-#endif /* JS_POSIX_NSPR */
-
-#endif /* util_NSPR_h */
deleted file mode 100644
--- a/js/src/vm/PosixNSPR.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=8 sts=2 et sw=2 tw=80:
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "vm/PosixNSPR.h"
-
-#include "js/Utility.h"
-
-#ifdef JS_POSIX_NSPR
-
-#  include <errno.h>
-#  include <sys/time.h>
-#  include <time.h>
-
-#endif /* JS_POSIX_NSPR */
deleted file mode 100644
--- a/js/src/vm/PosixNSPR.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim: set ts=8 sts=2 et sw=2 tw=80:
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef vm_PosixNSPR_h
-#define vm_PosixNSPR_h
-
-#ifdef JS_POSIX_NSPR
-
-#  include "jspubtd.h"
-
-#endif /* JS_POSIX_NSPR */
-
-#endif /* vm_PosixNSPR_h */
--- a/js/src/wasm/WasmModule.cpp
+++ b/js/src/wasm/WasmModule.cpp
@@ -20,17 +20,16 @@
 
 #include <chrono>
 #include <thread>
 
 #include "builtin/TypedObject.h"
 #include "jit/JitOptions.h"
 #include "js/BuildId.h"  // JS::BuildIdCharVector
 #include "threading/LockGuard.h"
-#include "util/NSPR.h"
 #include "wasm/WasmBaselineCompile.h"
 #include "wasm/WasmCompile.h"
 #include "wasm/WasmInstance.h"
 #include "wasm/WasmIonCompile.h"
 #include "wasm/WasmJS.h"
 #include "wasm/WasmSerialize.h"
 
 #include "vm/ArrayBufferObject-inl.h"