[arch-commits] Commit in js185/trunk (7 files)
Bruno Pagani
archange at archlinux.org
Tue Jan 1 14:43:02 UTC 2019
Date: Tuesday, January 1, 2019 @ 14:43:02
Author: archange
Revision: 420164
Disable forced optimization (-O3)
Might be the cause of some segfaults.
Also some patches cleaning/renaming
Added:
js185/trunk/fix-gcc6.patch
(from rev 420163, js185/trunk/fix-811665.patch)
js185/trunk/fix-install-symlinks.patch
(from rev 420163, js185/trunk/destdir.patch)
js185/trunk/system-libffi-autoconf.patch
(from rev 420163, js185/trunk/autoconf.patch)
Modified:
js185/trunk/PKGBUILD
Deleted:
js185/trunk/autoconf.patch
js185/trunk/destdir.patch
js185/trunk/fix-811665.patch
------------------------------+
PKGBUILD | 36 ++++-----
autoconf.patch | 163 -----------------------------------------
destdir.patch | 16 ----
fix-811665.patch | 153 --------------------------------------
fix-gcc6.patch | 153 ++++++++++++++++++++++++++++++++++++++
fix-install-symlinks.patch | 15 +++
system-libffi-autoconf.patch | 163 +++++++++++++++++++++++++++++++++++++++++
7 files changed, 349 insertions(+), 350 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-01 14:30:39 UTC (rev 420163)
+++ PKGBUILD 2019-01-01 14:43:02 UTC (rev 420164)
@@ -3,7 +3,7 @@
pkgname=js185
pkgver=1.0.0
-pkgrel=4
+pkgrel=5
pkgdesc="JavaScript interpreter and libraries (legacy)"
arch=(x86_64)
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/1.8.5"
@@ -11,27 +11,24 @@
depends=(nspr libffi)
makedepends=(python2 zip)
source=("https://ftp.mozilla.org/pub/mozilla.org/js/${pkgname}-${pkgver}.tar.gz"
- 'fix-811665.patch'
- 'destdir.patch'
- 'autoconf.patch'
+ 'fix-gcc6.patch'
+ 'fix-install-symlinks.patch'
+ 'system-libffi-autoconf.patch'
'allow-to-build-against-system-libffi.patch')
-md5sums=('a4574365938222adca0a6bd33329cb32'
- 'f810f575c855e136fe32302c1167344f'
- '27d40e50d8dd25f30e1b71a1902fb7fc'
- '2bcd0cc9b7eb268de31410bfd97c1282'
- 'd2b063b75f30fb4b9a2b1e8958cbeec4')
sha256sums=('5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687'
- '2b298b8a693865b38e2b0d33277bb5ffe152c6ecf43648e85113fec586aa4752'
- '1319d729f382703b3a315c7a1bcc2dc14ed52f1111a194d3531a3503f0d0735e'
+ '7d252ea688f3011360c3a370820e1a00c85ae785cdad37c6655d0d5ef996fb76'
+ 'b738dc60b6f9c4697aede30ca09a87ac0d5895fe5da6c9f277295531cbe8c215'
'524e11a66f0931dc1affcfcf47a87e086b6006ee9b747e2c7caae82334d6ba6b'
'eea3f80f72cfde52745fbb24b9d3a3506dd2cdbb08fe53a529d7c9a14f0381a6')
prepare() {
cd js-1.8.5
-
- patch -p1 -i ../fix-811665.patch
- patch -p1 -i ../destdir.patch
- patch -p1 -i ../autoconf.patch
+
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811665
+ patch -p1 -i ../fix-gcc6.patch
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=628723
+ patch -p1 -i ../fix-install-symlinks.patch
+ patch -p1 -i ../system-libffi-autoconf.patch
patch -p1 -i ../allow-to-build-against-system-libffi.patch
}
@@ -38,7 +35,8 @@
build() {
cd js-1.8.5/js/src
- # _FORTIFY_SOURCE causes configure error
+ # _FORTIFY_SOURCE causes the following configure error:
+ # checking for the alignment of void*... configure: error: No alignment found for void*
unset CPPFLAGS
./configure \
@@ -45,7 +43,11 @@
--prefix=/usr \
--with-system-nspr \
--disable-tests \
+ --disable-optimize \
+ --disable-profile-guided-optimization \
--enable-ctypes \
+ --enable-jemalloc \
+ --enable-readline \
--enable-threadsafe \
--enable-system-ffi
@@ -64,5 +66,3 @@
# Remove static lib (!staticlibs does not work because name do not match)
rm "${pkgdir}"/usr/lib/libmozjs185-1.0.a
}
-
-# vim:set ts=2 sw=2 et:
Deleted: autoconf.patch
===================================================================
--- autoconf.patch 2019-01-01 14:30:39 UTC (rev 420163)
+++ autoconf.patch 2019-01-01 14:43:02 UTC (rev 420164)
@@ -1,163 +0,0 @@
---- a/js/src/configure
-+++ b/js/src/configure
-@@ -99,6 +99,8 @@ ac_help="$ac_help
- --with-nspr-exec-prefix=PFX
- Exec prefix where NSPR is installed"
- ac_help="$ac_help
-+ --enable-system-ffi Use system libffi (located with pkgconfig)"
-+ac_help="$ac_help
- --with-arm-kuser Use kuser helpers (Linux/ARM only -- requires kernel 2.6.13 or later)"
- ac_help="$ac_help
- --enable-ui-locale=ab-CD
-@@ -13204,19 +13206,128 @@ rm -f conftest*
- CFLAGS=$_SAVE_CFLAGS
- fi
-
-+# Check whether --enable-system-ffi or --disable-system-ffi was given.
-+if test "${enable_system_ffi+set}" = set; then
-+ enableval="$enable_system_ffi"
-+ if test "$enableval" = "yes"; then
-+ MOZ_NATIVE_FFI=1
-+ elif test "$enableval" = "no"; then
-+ :
-+ else
-+ { echo "configure: error: Option, system-ffi, does not take an argument ($enableval)." 1>&2; exit 1; }
-+ fi
-+fi
-+
-+
-+if test -n "$MOZ_NATIVE_FFI"; then
-+ succeeded=no
-+
-+ if test -z "$PKG_CONFIG"; then
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:13210: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ case "$PKG_CONFIG" in
-+ /*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ ?:/*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
-+ ;;
-+ *)
-+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-+ ac_dummy="$PATH"
-+ for ac_dir in $ac_dummy; do
-+ test -z "$ac_dir" && ac_dir=.
-+ if test -f $ac_dir/$ac_word; then
-+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-+ break
-+ fi
-+ done
-+ IFS="$ac_save_ifs"
-+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-+ ;;
-+esac
-+fi
-+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+if test -n "$PKG_CONFIG"; then
-+ echo "$ac_t""$PKG_CONFIG" 1>&6
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+ fi
-+
-+ if test "$PKG_CONFIG" = "no" ; then
-+ echo "*** The pkg-config script could not be found. Make sure it is"
-+ echo "*** in your path, or set the PKG_CONFIG environment variable"
-+ echo "*** to the full path to pkg-config."
-+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+ else
-+ PKG_CONFIG_MIN_VERSION=0.9.0
-+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+ echo $ac_n "checking for libffi""... $ac_c" 1>&6
-+echo "configure:13254: checking for libffi" >&5
-+
-+ if $PKG_CONFIG --exists "libffi" ; then
-+ echo "$ac_t""yes" 1>&6
-+ succeeded=yes
-+
-+ echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6
-+echo "configure:13261: checking MOZ_FFI_CFLAGS" >&5
-+ MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi"`
-+ echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6
-+
-+ echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6
-+echo "configure:13266: checking MOZ_FFI_LIBS" >&5
-+ ## Remove evil flags like -Wl,--export-dynamic
-+ MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi\" |sed s/-Wl,--export-dynamic//g`"
-+ echo "$ac_t""$MOZ_FFI_LIBS" 1>&6
-+ else
-+ MOZ_FFI_CFLAGS=""
-+ MOZ_FFI_LIBS=""
-+ ## If we have a custom action on failure, don't print errors, but
-+ ## do set a variable so people can do so.
-+ MOZ_FFI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libffi"`
-+ echo $MOZ_FFI_PKG_ERRORS
-+ fi
-+
-+
-+
-+ else
-+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+ fi
-+ fi
-+
-+ if test $succeeded = yes; then
-+ :
-+ else
-+ if test "$COMPILE_ENVIRONMENT"; then
-+ { echo "configure: error: Library requirements (libffi) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; }
-+ fi
-+ fi
-+
-+fi
-+
-+
-+
-
- # Application
-
- BUILD_STATIC_LIBS=
- ENABLE_TESTS=1
-
- MOZ_THUMB2=
- USE_ARM_KUSER=
-
- case "${target}" in
- arm-android-eabi)
- USE_ARM_KUSER=1
- MOZ_THUMB2=1
- ;;
- esac
-
-@@ -15741,9 +15851,13 @@ s%@HAVE_GCC3_ABI@%$HAVE_GCC3_ABI%g
- s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
- s%@NSPR_LIBS@%$NSPR_LIBS%g
- s%@NSPR_CONFIG@%$NSPR_CONFIG%g
-+s%@PKG_CONFIG@%$PKG_CONFIG%g
-+s%@MOZ_FFI_CFLAGS@%$MOZ_FFI_CFLAGS%g
-+s%@MOZ_FFI_LIBS@%$MOZ_FFI_LIBS%g
-+s%@MOZ_NATIVE_FFI@%$MOZ_NATIVE_FFI%g
- s%@MOZ_UI_LOCALE@%$MOZ_UI_LOCALE%g
- s%@MOZ_THUMB2@%$MOZ_THUMB2%g
- s%@MOZ_ARM_ARCH@%$MOZ_ARM_ARCH%g
- s%@MOZ_OPTIMIZE@%$MOZ_OPTIMIZE%g
- s%@MOZ_OPTIMIZE_FLAGS@%$MOZ_OPTIMIZE_FLAGS%g
- s%@MOZ_OPTIMIZE_LDFLAGS@%$MOZ_OPTIMIZE_LDFLAGS%g
-@@ -16121,7 +16235,7 @@ echo "$ac_t""invoking make to create js-
- $GMAKE js-config
-
- # Build jsctypes if it's enabled.
--if test "$JS_HAS_CTYPES"; then
-+if test "$JS_HAS_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then
- # Run the libffi 'configure' script.
- ac_configure_args="--disable-shared --enable-static --disable-raw-api"
- if test "$MOZ_DEBUG"; then
Deleted: destdir.patch
===================================================================
--- destdir.patch 2019-01-01 14:30:39 UTC (rev 420163)
+++ destdir.patch 2019-01-01 14:43:02 UTC (rev 420164)
@@ -1,16 +0,0 @@
-# See discussion in https://bugzilla.mozilla.org/show_bug.cgi?id=628723
-# Patch created by Colin Walters <walters at verbum.org>
-
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -900,8 +900,8 @@ endif
- ifeq (,$(HOST_BIN_SUFFIX))
- mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
- @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
-- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
-- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
-+ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
-+ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
- endif
- endif
- ifneq (,$(IMPORT_LIBRARY))
Deleted: fix-811665.patch
===================================================================
--- fix-811665.patch 2019-01-01 14:30:39 UTC (rev 420163)
+++ fix-811665.patch 2019-01-01 14:43:02 UTC (rev 420164)
@@ -1,153 +0,0 @@
-Description: Fix FTBFS with gcc6
- Most fixes are returning NULL instead of false and a narrowing issues.
-Author: Tobias Frost <tobi at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811665
-Last-Update: 2016-09-25
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/js/src/ctypes/CTypes.cpp
-+++ b/js/src/ctypes/CTypes.cpp
-@@ -4753,7 +4753,7 @@ NewFunctionInfo(JSContext* cx,
- for (JSUint32 i = 0; i < argLength; ++i) {
- bool isEllipsis;
- if (!IsEllipsis(cx, argTypes[i], &isEllipsis))
-- return false;
-+ return NULL;
- if (isEllipsis) {
- fninfo->mIsVariadic = true;
- if (i < 1) {
---- a/js/src/jsapi.cpp
-+++ b/js/src/jsapi.cpp
-@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob
- AutoIdVector props(cx);
- JSIdArray *ida;
- if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida))
-- return false;
-+ return NULL;
- for (size_t n = 0; n < size_t(ida->length); ++n)
- JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]);
- return ida;
---- a/js/src/jsfun.cpp
-+++ b/js/src/jsfun.cpp
-@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje
-
- JSString *str = JS_DecompileFunction(cx, fun, indent);
- if (!str)
-- return false;
-+ return NULL;
-
- if (!indent)
- cx->compartment->toSourceCache.put(fun, str);
-@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon
- const Shape *shape = funobj->nativeLookup(id);
- if (!shape) {
- if (!ResolveInterpretedFunctionPrototype(cx, funobj))
-- return false;
-+ return NULL;
- shape = funobj->nativeLookup(id);
- }
- JS_ASSERT(!shape->configurable());
---- a/js/src/jsiter.cpp
-+++ b/js/src/jsiter.cpp
-@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f
- */
- JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
- if (!obj)
-- return false;
-+ return NULL;
- obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
- obj->setMap(cx->compartment->emptyEnumeratorShape);
- return obj;
---- a/js/src/jsparse.cpp
-+++ b/js/src/jsparse.cpp
-@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun
- if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
- JS_ASSERT(pn->pn_cookie.isFree());
- if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
-- return false;
-+ return NULL;
- }
-
- pn->pn_blockid = outertc->blockid();
---- a/js/src/jsstr.cpp
-+++ b/js/src/jsstr.cpp
-@@ -1734,7 +1734,7 @@ class RegExpGuard
- if (flat) {
- patstr = flattenPattern(cx, fm.patstr);
- if (!patstr)
-- return false;
-+ return NULL;
- } else {
- patstr = fm.patstr;
- }
-@@ -3408,7 +3408,7 @@ js_InitStringClass(JSContext *cx, JSObje
- UndefinedValue(), NULL, NULL,
- JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
- NULL)) {
-- return JS_FALSE;
-+ return NULL;
- }
-
- return proto;
---- a/js/src/jstypedarray.cpp
-+++ b/js/src/jstypedarray.cpp
-@@ -1334,7 +1334,7 @@ class TypedArrayTemplate
- if (size != 0 && count >= INT32_MAX / size) {
- JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
- JSMSG_NEED_DIET, "size and count");
-- return false;
-+ return NULL;
- }
-
- int32 bytelen = size * count;
-@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint
-
- default:
- JS_NOT_REACHED("shouldn't have gotten here");
-- return false;
-+ return NULL;
- }
- }
-
---- a/js/src/jsxml.cpp
-+++ b/js/src/jsxml.cpp
-@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS
-
- obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass);
- if (!obj)
-- return JS_FALSE;
-+ return NULL;
- JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal()));
- JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal()));
- JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared()));
-@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb
- size_t length = str->length();
- jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
- if (!chars)
-- return JS_FALSE;
-+ return NULL;
- *chars = '@';
- const jschar *strChars = str->getChars(cx);
- if (!strChars) {
---- a/js/src/methodjit/InvokeHelpers.cpp
-+++ b/js/src/methodjit/InvokeHelpers.cpp
-@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx)
- {
- JSStackFrame *fp = cx->fp();
- if (fp->hasImacropc())
-- return false;
-+ return NULL;
-
- JSScript *script = fp->script();
- return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc);
---- a/js/src/nanojit/NativeX64.cpp
-+++ b/js/src/nanojit/NativeX64.cpp
-@@ -1899,7 +1899,7 @@ namespace nanojit
- }
- }
-
-- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
-+ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {(int64_t) 0x8000000000000000ULL,0};
-
- void Assembler::asm_fneg(LIns *ins) {
- Register rr, ra;
Copied: js185/trunk/fix-gcc6.patch (from rev 420163, js185/trunk/fix-811665.patch)
===================================================================
--- fix-gcc6.patch (rev 0)
+++ fix-gcc6.patch 2019-01-01 14:43:02 UTC (rev 420164)
@@ -0,0 +1,153 @@
+Description: Fix FTBFS with gcc6
+ Most fixes are returning NULL instead of false and a narrowing issues.
+Author: Tobias Frost <tobi at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811665
+Last-Update: 2016-09-25
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/js/src/ctypes/CTypes.cpp
++++ b/js/src/ctypes/CTypes.cpp
+@@ -4753,7 +4753,7 @@ NewFunctionInfo(JSContext* cx,
+ for (JSUint32 i = 0; i < argLength; ++i) {
+ bool isEllipsis;
+ if (!IsEllipsis(cx, argTypes[i], &isEllipsis))
+- return false;
++ return NULL;
+ if (isEllipsis) {
+ fninfo->mIsVariadic = true;
+ if (i < 1) {
+--- a/js/src/jsapi.cpp
++++ b/js/src/jsapi.cpp
+@@ -3985,7 +3985,7 @@ JS_Enumerate(JSContext *cx, JSObject *ob
+ AutoIdVector props(cx);
+ JSIdArray *ida;
+ if (!GetPropertyNames(cx, obj, JSITER_OWNONLY, &props) || !VectorToIdArray(cx, props, &ida))
+- return false;
++ return NULL;
+ for (size_t n = 0; n < size_t(ida->length); ++n)
+ JS_ASSERT(js_CheckForStringIndex(ida->vector[n]) == ida->vector[n]);
+ return ida;
+--- a/js/src/jsfun.cpp
++++ b/js/src/jsfun.cpp
+@@ -2051,7 +2051,7 @@ fun_toStringHelper(JSContext *cx, JSObje
+
+ JSString *str = JS_DecompileFunction(cx, fun, indent);
+ if (!str)
+- return false;
++ return NULL;
+
+ if (!indent)
+ cx->compartment->toSourceCache.put(fun, str);
+@@ -2657,7 +2657,7 @@ LookupInterpretedFunctionPrototype(JSCon
+ const Shape *shape = funobj->nativeLookup(id);
+ if (!shape) {
+ if (!ResolveInterpretedFunctionPrototype(cx, funobj))
+- return false;
++ return NULL;
+ shape = funobj->nativeLookup(id);
+ }
+ JS_ASSERT(!shape->configurable());
+--- a/js/src/jsiter.cpp
++++ b/js/src/jsiter.cpp
+@@ -425,7 +425,7 @@ NewIteratorObject(JSContext *cx, uintN f
+ */
+ JSObject *obj = js_NewGCObject(cx, FINALIZE_OBJECT0);
+ if (!obj)
+- return false;
++ return NULL;
+ obj->init(cx, &js_IteratorClass, NULL, NULL, NULL, false);
+ obj->setMap(cx->compartment->emptyEnumeratorShape);
+ return obj;
+--- a/js/src/jsparse.cpp
++++ b/js/src/jsparse.cpp
+@@ -3352,7 +3352,7 @@ Parser::functionDef(JSAtom *funAtom, Fun
+ if (!outertc->inFunction() && bodyLevel && funAtom && !lambda && outertc->compiling()) {
+ JS_ASSERT(pn->pn_cookie.isFree());
+ if (!DefineGlobal(pn, outertc->asCodeGenerator(), funAtom))
+- return false;
++ return NULL;
+ }
+
+ pn->pn_blockid = outertc->blockid();
+--- a/js/src/jsstr.cpp
++++ b/js/src/jsstr.cpp
+@@ -1734,7 +1734,7 @@ class RegExpGuard
+ if (flat) {
+ patstr = flattenPattern(cx, fm.patstr);
+ if (!patstr)
+- return false;
++ return NULL;
+ } else {
+ patstr = fm.patstr;
+ }
+@@ -3400,7 +3400,7 @@ js_InitStringClass(JSContext *cx, JSObje
+ UndefinedValue(), NULL, NULL,
+ JSPROP_READONLY | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0,
+ NULL)) {
+- return JS_FALSE;
++ return NULL;
+ }
+
+ return proto;
+--- a/js/src/jstypedarray.cpp
++++ b/js/src/jstypedarray.cpp
+@@ -1334,7 +1334,7 @@ class TypedArrayTemplate
+ if (size != 0 && count >= INT32_MAX / size) {
+ JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
+ JSMSG_NEED_DIET, "size and count");
+- return false;
++ return NULL;
+ }
+
+ int32 bytelen = size * count;
+@@ -1668,7 +1668,7 @@ TypedArrayConstruct(JSContext *cx, jsint
+
+ default:
+ JS_NOT_REACHED("shouldn't have gotten here");
+- return false;
++ return NULL;
+ }
+ }
+
+--- a/js/src/jsxml.cpp
++++ b/js/src/jsxml.cpp
+@@ -282,7 +282,7 @@ NewXMLNamespace(JSContext *cx, JSLinearS
+
+ obj = NewBuiltinClassInstanceXML(cx, &js_NamespaceClass);
+ if (!obj)
+- return JS_FALSE;
++ return NULL;
+ JS_ASSERT(JSVAL_IS_VOID(obj->getNamePrefixVal()));
+ JS_ASSERT(JSVAL_IS_VOID(obj->getNameURIVal()));
+ JS_ASSERT(JSVAL_IS_VOID(obj->getNamespaceDeclared()));
+@@ -431,7 +431,7 @@ ConvertQNameToString(JSContext *cx, JSOb
+ size_t length = str->length();
+ jschar *chars = (jschar *) cx->malloc((length + 2) * sizeof(jschar));
+ if (!chars)
+- return JS_FALSE;
++ return NULL;
+ *chars = '@';
+ const jschar *strChars = str->getChars(cx);
+ if (!strChars) {
+--- a/js/src/methodjit/InvokeHelpers.cpp
++++ b/js/src/methodjit/InvokeHelpers.cpp
+@@ -728,7 +728,7 @@ AtSafePoint(JSContext *cx)
+ {
+ JSStackFrame *fp = cx->fp();
+ if (fp->hasImacropc())
+- return false;
++ return NULL;
+
+ JSScript *script = fp->script();
+ return script->maybeNativeCodeForPC(fp->isConstructing(), cx->regs->pc);
+--- a/js/src/nanojit/NativeX64.cpp
++++ b/js/src/nanojit/NativeX64.cpp
+@@ -1899,7 +1899,7 @@ namespace nanojit
+ }
+ }
+
+- static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {0x8000000000000000LL,0};
++ static const AVMPLUS_ALIGN16(int64_t) negateMask[] = {(int64_t) 0x8000000000000000ULL,0};
+
+ void Assembler::asm_fneg(LIns *ins) {
+ Register rr, ra;
Copied: js185/trunk/fix-install-symlinks.patch (from rev 420163, js185/trunk/destdir.patch)
===================================================================
--- fix-install-symlinks.patch (rev 0)
+++ fix-install-symlinks.patch 2019-01-01 14:43:02 UTC (rev 420164)
@@ -0,0 +1,15 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -888,8 +888,8 @@ endif
+ ifeq (,$(HOST_BIN_SUFFIX))
+ mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER)
+ @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER)
+- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER)
+- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER)
++ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER)
++ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER)
+ endif
+ endif
+ ifneq (,$(IMPORT_LIBRARY))
Copied: js185/trunk/system-libffi-autoconf.patch (from rev 420163, js185/trunk/autoconf.patch)
===================================================================
--- system-libffi-autoconf.patch (rev 0)
+++ system-libffi-autoconf.patch 2019-01-01 14:43:02 UTC (rev 420164)
@@ -0,0 +1,163 @@
+--- a/js/src/configure
++++ b/js/src/configure
+@@ -99,6 +99,8 @@ ac_help="$ac_help
+ --with-nspr-exec-prefix=PFX
+ Exec prefix where NSPR is installed"
+ ac_help="$ac_help
++ --enable-system-ffi Use system libffi (located with pkgconfig)"
++ac_help="$ac_help
+ --with-arm-kuser Use kuser helpers (Linux/ARM only -- requires kernel 2.6.13 or later)"
+ ac_help="$ac_help
+ --enable-ui-locale=ab-CD
+@@ -13204,19 +13206,128 @@ rm -f conftest*
+ CFLAGS=$_SAVE_CFLAGS
+ fi
+
++# Check whether --enable-system-ffi or --disable-system-ffi was given.
++if test "${enable_system_ffi+set}" = set; then
++ enableval="$enable_system_ffi"
++ if test "$enableval" = "yes"; then
++ MOZ_NATIVE_FFI=1
++ elif test "$enableval" = "no"; then
++ :
++ else
++ { echo "configure: error: Option, system-ffi, does not take an argument ($enableval)." 1>&2; exit 1; }
++ fi
++fi
++
++
++if test -n "$MOZ_NATIVE_FFI"; then
++ succeeded=no
++
++ if test -z "$PKG_CONFIG"; then
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:13210: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
++else
++ case "$PKG_CONFIG" in
++ /*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ ?:/*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
++ break
++ fi
++ done
++ IFS="$ac_save_ifs"
++ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
++ ;;
++esac
++fi
++PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++if test -n "$PKG_CONFIG"; then
++ echo "$ac_t""$PKG_CONFIG" 1>&6
++else
++ echo "$ac_t""no" 1>&6
++fi
++
++ fi
++
++ if test "$PKG_CONFIG" = "no" ; then
++ echo "*** The pkg-config script could not be found. Make sure it is"
++ echo "*** in your path, or set the PKG_CONFIG environment variable"
++ echo "*** to the full path to pkg-config."
++ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
++ else
++ PKG_CONFIG_MIN_VERSION=0.9.0
++ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
++ echo $ac_n "checking for libffi""... $ac_c" 1>&6
++echo "configure:13254: checking for libffi" >&5
++
++ if $PKG_CONFIG --exists "libffi" ; then
++ echo "$ac_t""yes" 1>&6
++ succeeded=yes
++
++ echo $ac_n "checking MOZ_FFI_CFLAGS""... $ac_c" 1>&6
++echo "configure:13261: checking MOZ_FFI_CFLAGS" >&5
++ MOZ_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi"`
++ echo "$ac_t""$MOZ_FFI_CFLAGS" 1>&6
++
++ echo $ac_n "checking MOZ_FFI_LIBS""... $ac_c" 1>&6
++echo "configure:13266: checking MOZ_FFI_LIBS" >&5
++ ## Remove evil flags like -Wl,--export-dynamic
++ MOZ_FFI_LIBS="`$PKG_CONFIG --libs \"libffi\" |sed s/-Wl,--export-dynamic//g`"
++ echo "$ac_t""$MOZ_FFI_LIBS" 1>&6
++ else
++ MOZ_FFI_CFLAGS=""
++ MOZ_FFI_LIBS=""
++ ## If we have a custom action on failure, don't print errors, but
++ ## do set a variable so people can do so.
++ MOZ_FFI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libffi"`
++ echo $MOZ_FFI_PKG_ERRORS
++ fi
++
++
++
++ else
++ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
++ echo "*** See http://www.freedesktop.org/software/pkgconfig"
++ fi
++ fi
++
++ if test $succeeded = yes; then
++ :
++ else
++ if test "$COMPILE_ENVIRONMENT"; then
++ { echo "configure: error: Library requirements (libffi) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; }
++ fi
++ fi
++
++fi
++
++
++
+
+ # Application
+
+ BUILD_STATIC_LIBS=
+ ENABLE_TESTS=1
+
+ MOZ_THUMB2=
+ USE_ARM_KUSER=
+
+ case "${target}" in
+ arm-android-eabi)
+ USE_ARM_KUSER=1
+ MOZ_THUMB2=1
+ ;;
+ esac
+
+@@ -15741,9 +15851,13 @@ s%@HAVE_GCC3_ABI@%$HAVE_GCC3_ABI%g
+ s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
+ s%@NSPR_LIBS@%$NSPR_LIBS%g
+ s%@NSPR_CONFIG@%$NSPR_CONFIG%g
++s%@PKG_CONFIG@%$PKG_CONFIG%g
++s%@MOZ_FFI_CFLAGS@%$MOZ_FFI_CFLAGS%g
++s%@MOZ_FFI_LIBS@%$MOZ_FFI_LIBS%g
++s%@MOZ_NATIVE_FFI@%$MOZ_NATIVE_FFI%g
+ s%@MOZ_UI_LOCALE@%$MOZ_UI_LOCALE%g
+ s%@MOZ_THUMB2@%$MOZ_THUMB2%g
+ s%@MOZ_ARM_ARCH@%$MOZ_ARM_ARCH%g
+ s%@MOZ_OPTIMIZE@%$MOZ_OPTIMIZE%g
+ s%@MOZ_OPTIMIZE_FLAGS@%$MOZ_OPTIMIZE_FLAGS%g
+ s%@MOZ_OPTIMIZE_LDFLAGS@%$MOZ_OPTIMIZE_LDFLAGS%g
+@@ -16121,7 +16235,7 @@ echo "$ac_t""invoking make to create js-
+ $GMAKE js-config
+
+ # Build jsctypes if it's enabled.
+-if test "$JS_HAS_CTYPES"; then
++if test "$JS_HAS_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then
+ # Run the libffi 'configure' script.
+ ac_configure_args="--disable-shared --enable-static --disable-raw-api"
+ if test "$MOZ_DEBUG"; then
More information about the arch-commits
mailing list