firefox-hg: remove three patches that were merged upstream.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: firefox-hg: remove three patches that were merged upstream.
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Wed, 11 May 2016 11:18:17 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed May 11 13:18:17 2016 +0200
Changeset:	208144bf68b90c38b6ace3f044e92af9158fb241

Modified Files:
	firefox-hg/distinfo
Removed Files:
	firefox-hg/patches/patch-js_src_jit_AtomicOperations.h
	firefox-hg/patches/patch-js_src_jit_none_AtomicOperations-sparc.h
	firefox-hg/patches/patch-js_src_threading_posix_ConditionVariable.cpp

Log Message:
firefox-hg: remove three patches that were merged upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=208144bf68b90c38b6ace3f044e92af9158fb241

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 firefox-hg/distinfo                                |   3 -
 .../patches/patch-js_src_jit_AtomicOperations.h    |  16 --
 .../patch-js_src_jit_none_AtomicOperations-sparc.h | 259 ---------------------
 ...ch-js_src_threading_posix_ConditionVariable.cpp |  25 --
 4 files changed, 303 deletions(-)

diffs:
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index c053b8d..8c84911 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -9,9 +9,6 @@ SHA1 (patch-browser_extensions_loop_run-all-loop-tests.sh) = 9f4bc8548485912f0b0
 SHA1 (patch-build_autoconf_nss.m4) = 4241f056d0a046e3d028d823aa5ac54ada0a742b
 SHA1 (patch-build_gyp.mozbuild) = 084e8730d93b2d09901cf85876a39198605ee2a1
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e104bea7922dac0ce441bca4ba7a6f9b2379d17a
-SHA1 (patch-js_src_jit_AtomicOperations.h) = 6baf712644b290173b874910246eab6da438b7de
-SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = c2b7bc27a7e54476b00e142e79b456cbbe9d5d8c
-SHA1 (patch-js_src_threading_posix_ConditionVariable.cpp) = 12bccbbd2b98182e8842f78757138d14ac9f8f6c
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = 0afa1ec917ce9cd6f1bcb39a51be336d6d30e1ce
 SHA1 (patch-media_webrtc_trunk_webrtc_modules_video__capture_linux_video__capture__linux.cc) = 0f2af2631d804a6cb5d2188f3dea712d5ca07ff4
 SHA1 (patch-modules_libpref_init_all.js) = 73dbe0c7001f9bfadb6ff7b50c340f7d135cb42a
diff --git a/firefox-hg/patches/patch-js_src_jit_AtomicOperations.h b/firefox-hg/patches/patch-js_src_jit_AtomicOperations.h
deleted file mode 100644
index 4e554bd..0000000
--- a/firefox-hg/patches/patch-js_src_jit_AtomicOperations.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-# See https://bugzilla.mozilla.org/show_bug.cgi?id=1232150
-
-diff -r c5da92c5b490 js/src/jit/AtomicOperations.h
---- js/src/jit/AtomicOperations.h.orig	2016-03-18 22:27:02.000000000 +0000
-+++ js/src/jit/AtomicOperations.h
-@@ -325,6 +325,8 @@ AtomicOperations::isLockfree(int32_t siz
- # include "jit/mips-shared/AtomicOperations-mips-shared.h"
- #elif defined(__ppc__) || defined(__PPC__)
- # include "jit/none/AtomicOperations-ppc.h"
-+#elif defined(__sparc__)
-+# include "jit/none/AtomicOperations-sparc.h"
- #elif defined(JS_CODEGEN_NONE)
-   // You can disable the JIT with --disable-ion but you must still
-   // provide the atomic operations that will be used by the JS engine.
diff --git a/firefox-hg/patches/patch-js_src_jit_none_AtomicOperations-sparc.h b/firefox-hg/patches/patch-js_src_jit_none_AtomicOperations-sparc.h
deleted file mode 100644
index 519c350..0000000
--- a/firefox-hg/patches/patch-js_src_jit_none_AtomicOperations-sparc.h
+++ /dev/null
@@ -1,259 +0,0 @@
-$NetBSD$
-
-# See https://bugzilla.mozilla.org/show_bug.cgi?id=1232150
-
-diff -r c5da92c5b490 js/src/jit/none/AtomicOperations-sparc.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ js/src/jit/none/AtomicOperations-sparc.h	Fri Jan 22 08:52:19 2016 +0100
-@@ -0,0 +1,251 @@
-+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ * vim: set ts=8 sts=4 et sw=4 tw=99:
-+ * 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/. */
-+
-+/* For documentation, see jit/AtomicOperations.h */
-+
-+#ifndef jit_sparc_AtomicOperations_sparc_h
-+#define jit_sparc_AtomicOperations_sparc_h
-+
-+#include "mozilla/Assertions.h"
-+#include "mozilla/Types.h"
-+
-+#if defined(__clang__) || defined(__GNUC__)
-+
-+// The default implementation tactic for gcc/clang is to use the newer
-+// __atomic intrinsics added for use in C++11 <atomic>.  Where that
-+// isn't available, we use GCC's older __sync functions instead.
-+//
-+// ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS is kept as a backward
-+// compatible option for older compilers: enable this to use GCC's old
-+// __sync functions instead of the newer __atomic functions.  This
-+// will be required for GCC 4.6.x and earlier, and probably for Clang
-+// 3.1, should we need to use those versions.
-+
-+//#define ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+
-+inline bool
-+js::jit::AtomicOperations::isLockfree8()
-+{
-+# ifndef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    MOZ_ASSERT(__atomic_always_lock_free(sizeof(int8_t), 0));
-+    MOZ_ASSERT(__atomic_always_lock_free(sizeof(int16_t), 0));
-+    MOZ_ASSERT(__atomic_always_lock_free(sizeof(int32_t), 0));
-+#  if defined(__LP64__)
-+    MOZ_ASSERT(__atomic_always_lock_free(sizeof(int64_t), 0));
-+#  endif
-+    return true;
-+# else
-+    return false;
-+# endif
-+}
-+
-+inline void
-+js::jit::AtomicOperations::fenceSeqCst()
-+{
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    __sync_synchronize();
-+# else
-+    __atomic_thread_fence(__ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template<typename T>
-+inline T
-+js::jit::AtomicOperations::loadSeqCst(T* addr)
-+{
-+    MOZ_ASSERT(sizeof(T) < 8 || isLockfree8());
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    __sync_synchronize();
-+    T v = *addr;
-+    __sync_synchronize();
-+# else
-+    T v;
-+    __atomic_load(addr, &v, __ATOMIC_SEQ_CST);
-+# endif
-+    return v;
-+}
-+
-+template<typename T>
-+inline void
-+js::jit::AtomicOperations::storeSeqCst(T* addr, T val)
-+{
-+    MOZ_ASSERT(sizeof(T) < 8 || isLockfree8());
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    __sync_synchronize();
-+    *addr = val;
-+    __sync_synchronize();
-+# else
-+    __atomic_store(addr, &val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template<typename T>
-+inline T
-+js::jit::AtomicOperations::compareExchangeSeqCst(T* addr, T oldval, T newval)
-+{
-+    MOZ_ASSERT(sizeof(T) < 8 || isLockfree8());
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    return __sync_val_compare_and_swap(addr, oldval, newval);
-+# else
-+    __atomic_compare_exchange(addr, &oldval, &newval, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
-+    return oldval;
-+# endif
-+}
-+
-+template<typename T>
-+inline T
-+js::jit::AtomicOperations::fetchAddSeqCst(T* addr, T val)
-+{
-+#if !defined( __LP64__)
-+    static_assert(sizeof(T) <= 4, "not available for 8-byte values yet");
-+#endif
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    return __sync_fetch_and_add(addr, val);
-+# else
-+    return __atomic_fetch_add(addr, val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template<typename T>
-+inline T
-+js::jit::AtomicOperations::fetchSubSeqCst(T* addr, T val)
-+{
-+#if !defined( __LP64__)
-+    static_assert(sizeof(T) <= 4, "not available for 8-byte values yet");
-+#endif
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    return __sync_fetch_and_sub(addr, val);
-+# else
-+    return __atomic_fetch_sub(addr, val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template<typename T>
-+inline T
-+js::jit::AtomicOperations::fetchAndSeqCst(T* addr, T val)
-+{
-+#if !defined( __LP64__)
-+    static_assert(sizeof(T) <= 4, "not available for 8-byte values yet");
-+#endif
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    return __sync_fetch_and_and(addr, val);
-+# else
-+    return __atomic_fetch_and(addr, val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template<typename T>
-+inline T
-+js::jit::AtomicOperations::fetchOrSeqCst(T* addr, T val)
-+{
-+#if !defined( __LP64__)
-+    static_assert(sizeof(T) <= 4, "not available for 8-byte values yet");
-+#endif
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    return __sync_fetch_and_or(addr, val);
-+# else
-+    return __atomic_fetch_or(addr, val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template<typename T>
-+inline T
-+js::jit::AtomicOperations::fetchXorSeqCst(T* addr, T val)
-+{
-+#if !defined( __LP64__)
-+    static_assert(sizeof(T) <= 4, "not available for 8-byte values yet");
-+#endif
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    return __sync_fetch_and_xor(addr, val);
-+# else
-+    return __atomic_fetch_xor(addr, val, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+template<typename T>
-+inline T
-+js::jit::AtomicOperations::loadSafeWhenRacy(T* addr)
-+{
-+    return *addr;               // FIXME (1208663): not yet safe
-+}
-+
-+template<typename T>
-+inline void
-+js::jit::AtomicOperations::storeSafeWhenRacy(T* addr, T val)
-+{
-+    *addr = val;                // FIXME (1208663): not yet safe
-+}
-+
-+inline void
-+js::jit::AtomicOperations::memcpySafeWhenRacy(void* dest, const void* src, size_t nbytes)
-+{
-+    ::memcpy(dest, src, nbytes); // FIXME (1208663): not yet safe
-+}
-+
-+inline void
-+js::jit::AtomicOperations::memmoveSafeWhenRacy(void* dest, const void* src, size_t nbytes)
-+{
-+    ::memmove(dest, src, nbytes); // FIXME (1208663): not yet safe
-+}
-+
-+template<typename T>
-+inline T
-+js::jit::AtomicOperations::exchangeSeqCst(T* addr, T val)
-+{
-+    MOZ_ASSERT(sizeof(T) < 8 || isLockfree8());
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    T v;
-+    __sync_synchronize();
-+    do {
-+	v = *addr;
-+    } while (__sync_val_compare_and_swap(addr, v, val) != v);
-+    return v;
-+# else
-+    T v;
-+    __atomic_exchange(addr, &val, &v, __ATOMIC_SEQ_CST);
-+    return v;
-+# endif
-+}
-+
-+template<size_t nbytes>
-+inline void
-+js::jit::RegionLock::acquire(void* addr)
-+{
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    while (!__sync_bool_compare_and_swap(&spinlock, 0, 1))
-+        ;
-+# else
-+    uint32_t zero = 0;
-+    uint32_t one = 1;
-+    while (!__atomic_compare_exchange(&spinlock, &zero, &one, false, __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE)) {
-+        zero = 0;
-+        continue;
-+    }
-+# endif
-+}
-+
-+template<size_t nbytes>
-+inline void
-+js::jit::RegionLock::release(void* addr)
-+{
-+    MOZ_ASSERT(AtomicOperations::loadSeqCst(&spinlock) == 1, "releasing unlocked region lock");
-+# ifdef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+    __sync_sub_and_fetch(&spinlock, 1);
-+# else
-+    uint32_t zero = 0;
-+    __atomic_store(&spinlock, &zero, __ATOMIC_SEQ_CST);
-+# endif
-+}
-+
-+# undef ATOMICS_IMPLEMENTED_WITH_SYNC_INTRINSICS
-+
-+#elif defined(ENABLE_SHARED_ARRAY_BUFFER)
-+
-+# error "Either disable JS shared memory, use GCC or Clang, or add code here"
-+
-+#endif
-+
-+#endif // jit_sparc_AtomicOperations_sparc_h
diff --git a/firefox-hg/patches/patch-js_src_threading_posix_ConditionVariable.cpp b/firefox-hg/patches/patch-js_src_threading_posix_ConditionVariable.cpp
deleted file mode 100644
index c336673..0000000
--- a/firefox-hg/patches/patch-js_src_threading_posix_ConditionVariable.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-NetBSD provides a timespecadd macro in sys/time.h, which conflicts with this one.
-https://bugzilla.mozilla.org/show_bug.cgi?id=1271590
-
---- js/src/threading/posix/ConditionVariable.cpp.orig	2016-05-10 09:55:11.875611541 +0000
-+++ js/src/threading/posix/ConditionVariable.cpp
-@@ -37,7 +37,7 @@ static const clockid_t WhichClock = CLOC
- // timespec structure is largely lacking such conveniences. Thankfully, the
- // utilities available in MFBT make implementing our own quite easy.
- static void
--timespecadd(struct timespec* lhs, struct timespec* rhs, struct timespec* result)
-+moz_timespecadd(struct timespec* lhs, struct timespec* rhs, struct timespec* result)
- {
-   // Add nanoseconds. This may wrap, but not above 2 billion.
-   MOZ_RELEASE_ASSERT(lhs->tv_nsec < NanoSecPerSec);
-@@ -149,7 +149,7 @@ js::ConditionVariable::wait_for(UniqueLo
-   MOZ_RELEASE_ASSERT(!r);
- 
-   struct timespec abs_ts;
--  timespecadd(&now_ts, &rel_ts, &abs_ts);
-+  moz_timespecadd(&now_ts, &rel_ts, &abs_ts);
- 
-   r = pthread_cond_timedwait(ptCond, ptMutex, &abs_ts);
- #else
Prev by Date: uTox-git: Update a patch
Next by Date: Update parafly from jb-wip
Previous by Thread: uTox-git: Update a patch
Next by Thread: Update parafly from jb-wip
Indexes:
Home | Main Index | Thread Index | Old Index