diff options
author | Ms2ger <Ms2ger@gmail.com> | 2015-10-16 14:47:58 +0200 |
---|---|---|
committer | Ms2ger <Ms2ger@gmail.com> | 2015-10-16 14:47:58 +0200 |
commit | 18f36d075cac0266d6aa1cdbdc6c6719a11f8886 (patch) | |
tree | 3f843bfba2f8c7cb952f932284273fa2999e132e | |
parent | efc4ce876f0fb81e2b7b39c9c567d0bf6944bd64 (diff) | |
download | servo-18f36d075cac0266d6aa1cdbdc6c6719a11f8886.tar.gz servo-18f36d075cac0266d6aa1cdbdc6c6719a11f8886.zip |
Remove long-obsolete /etc/patches directory.
-rw-r--r-- | etc/patches/README | 7 | ||||
-rw-r--r-- | etc/patches/mozjs-stack-bounds.diff | 77 |
2 files changed, 0 insertions, 84 deletions
diff --git a/etc/patches/README b/etc/patches/README deleted file mode 100644 index 63868fe4824..00000000000 --- a/etc/patches/README +++ /dev/null @@ -1,7 +0,0 @@ -Patches live here for submodules that should remain as pristine as possible. -This will allow us to unconditionally update them, then apply necessary -patches as needed. - -* mozjs-stack-bounds.diff: - add a public API to overwrite the engine's computed stack bounds for - GC scanning. diff --git a/etc/patches/mozjs-stack-bounds.diff b/etc/patches/mozjs-stack-bounds.diff deleted file mode 100644 index 5f82df03dde..00000000000 --- a/etc/patches/mozjs-stack-bounds.diff +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp -index 5571fc0..7e1e30d 100644 ---- a/js/src/jsapi.cpp -+++ b/js/src/jsapi.cpp -@@ -735,6 +735,7 @@ JSRuntime::JSRuntime() - #endif - selfHostedGlobal_(NULL), - nativeStackBase(0), -+ nativeStackEnd(0), - nativeStackQuota(0), - interpreterFrames(NULL), - cxCallback(NULL), -@@ -7084,6 +7085,18 @@ JS_SetRuntimeThread(JSRuntime *rt) - #endif - } - -+extern JS_PUBLIC_API(void) -+JS_SetNativeStackBounds(JSRuntime *rt, uintptr_t minValue, uintptr_t maxValue) -+{ -+#if JS_STACK_GROWTH_DIRECTION < 0 -+ rt->nativeStackBase = maxValue; -+ rt->nativeStackEnd = minValue; -+#else -+ rt->nativeStackBase = minValue; -+ rt->nativeStackEnd = maxValue; -+#endif -+} -+ - extern JS_NEVER_INLINE JS_PUBLIC_API(void) - JS_AbortIfWrongThread(JSRuntime *rt) - { -diff --git a/js/src/jsapi.h b/js/src/jsapi.h -index c8ab0f0..9ac582e 100644 ---- a/js/src/jsapi.h -+++ b/js/src/jsapi.h -@@ -6248,6 +6248,9 @@ JS_ClearRuntimeThread(JSRuntime *rt); - extern JS_PUBLIC_API(void) - JS_SetRuntimeThread(JSRuntime *rt); - -+extern JS_PUBLIC_API(void) -+JS_SetNativeStackBounds(JSRuntime *rt, uintptr_t minValue, uintptr_t maxValue); -+ - #ifdef __cplusplus - JS_END_EXTERN_C - -diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h -index 0bb6d1c..32e016e 100644 ---- a/js/src/jscntxt.h -+++ b/js/src/jscntxt.h -@@ -439,6 +439,9 @@ struct JSRuntime : js::RuntimeFriendFields - /* Base address of the native stack for the current thread. */ - uintptr_t nativeStackBase; - -+ /* Base address of the native stack for the current thread. */ -+ uintptr_t nativeStackEnd; -+ - /* The native stack size limit that runtime should not exceed. */ - size_t nativeStackQuota; - -diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp -index f5cbc62..eae29da 100644 ---- a/js/src/jsgc.cpp -+++ b/js/src/jsgc.cpp -@@ -1177,9 +1177,11 @@ MarkConservativeStackRoots(JSTracer *trc, bool useSavedRoots) - uintptr_t *stackMin, *stackEnd; - #if JS_STACK_GROWTH_DIRECTION > 0 - stackMin = rt->nativeStackBase; -- stackEnd = cgcd->nativeStackTop; -+ stackEnd = rt->nativeStackEnd ? reinterpret_cast<uintptr_t*>(rt->nativeStackEnd) -+ : cgcd->nativeStackTop; - #else -- stackMin = cgcd->nativeStackTop + 1; -+ stackMin = rt->nativeStackEnd ? reinterpret_cast<uintptr_t*>(rt->nativeStackEnd) -+ : cgcd->nativeStackTop + 1; - stackEnd = reinterpret_cast<uintptr_t *>(rt->nativeStackBase); - #endif - |