[arch-commits] Commit in js185/trunk (5 files)
Bruno Pagani
archange at archlinux.org
Thu Jan 11 19:11:17 UTC 2018
Date: Thursday, January 11, 2018 @ 19:11:17
Author: archange
Revision: 281369
Rebuild js185 with some changes
Fix FTBFS with GCC6+
Actually remove the static lib
Use system libffi
Added:
js185/trunk/allow-to-build-against-system-libffi.patch
js185/trunk/autoconf.patch
js185/trunk/destdir.patch
js185/trunk/fix-811665.patch
Modified:
js185/trunk/PKGBUILD
--------------------------------------------+
PKGBUILD | 59 +++++++--
allow-to-build-against-system-libffi.patch | 116 +++++++++++++++++++
autoconf.patch | 163 +++++++++++++++++++++++++++
destdir.patch | 16 ++
fix-811665.patch | 153 +++++++++++++++++++++++++
5 files changed, 492 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-11 18:37:33 UTC (rev 281368)
+++ PKGBUILD 2018-01-11 19:11:17 UTC (rev 281369)
@@ -1,19 +1,41 @@
# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
pkgname=js185
pkgver=1.0.0
-pkgrel=3
+pkgrel=4
pkgdesc="JavaScript interpreter and libraries (legacy)"
arch=(x86_64)
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/1.8.5"
license=(MPL)
-depends=(nspr gcc-libs)
+depends=(nspr libffi)
makedepends=(python2 zip)
-options=(!staticlibs)
-source=(http://ftp.mozilla.org/pub/mozilla.org/js/$pkgname-$pkgver.tar.gz)
-md5sums=('a4574365938222adca0a6bd33329cb32')
+source=("https://ftp.mozilla.org/pub/mozilla.org/js/${pkgname}-${pkgver}.tar.gz"
+ 'fix-811665.patch'
+ 'destdir.patch'
+ 'autoconf.patch'
+ 'allow-to-build-against-system-libffi.patch')
+md5sums=('a4574365938222adca0a6bd33329cb32'
+ 'f810f575c855e136fe32302c1167344f'
+ '27d40e50d8dd25f30e1b71a1902fb7fc'
+ '2bcd0cc9b7eb268de31410bfd97c1282'
+ 'd2b063b75f30fb4b9a2b1e8958cbeec4')
+sha256sums=('5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687'
+ '2b298b8a693865b38e2b0d33277bb5ffe152c6ecf43648e85113fec586aa4752'
+ '1319d729f382703b3a315c7a1bcc2dc14ed52f1111a194d3531a3503f0d0735e'
+ '524e11a66f0931dc1affcfcf47a87e086b6006ee9b747e2c7caae82334d6ba6b'
+ 'eea3f80f72cfde52745fbb24b9d3a3506dd2cdbb08fe53a529d7c9a14f0381a6')
+prepare() {
+ cd js-1.8.5
+
+ patch -p1 -i ../fix-811665.patch
+ patch -p1 -i ../destdir.patch
+ patch -p1 -i ../autoconf.patch
+ patch -p1 -i ../allow-to-build-against-system-libffi.patch
+}
+
build() {
cd js-1.8.5/js/src
@@ -20,21 +42,28 @@
# _FORTIFY_SOURCE causes configure error
unset CPPFLAGS
- ./configure --prefix=/usr --with-system-nspr \
- --enable-threadsafe
+ ./configure \
+ --prefix=/usr \
+ --with-system-nspr \
+ --disable-tests \
+ --enable-ctypes \
+ --enable-threadsafe \
+ --enable-system-ffi
+
make
}
package() {
cd js-1.8.5/js/src
- make DESTDIR="$pkgdir" install
- install -Dm755 shell/js "$pkgdir/usr/bin/js"
- find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} +
- # Bad symlinks (absolute, including DESTDIR!)
- cd "$pkgdir/usr/lib"
- ln -sf libmozjs185.so.1.0.0 libmozjs185.so.1.0
- ln -sf libmozjs185.so.1.0 libmozjs185.so
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm755 shell/js -t "${pkgdir}"/usr/bin/
+
+ find "${pkgdir}"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} +
+
+ # 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:
Added: allow-to-build-against-system-libffi.patch
===================================================================
--- allow-to-build-against-system-libffi.patch (rev 0)
+++ allow-to-build-against-system-libffi.patch 2018-01-11 19:11:17 UTC (rev 281369)
@@ -0,0 +1,116 @@
+From: Mike Hommey <mh at glandium.org>
+Date: Tue, 9 Mar 2010 09:44:37 +0100
+Subject: Allow to build against system libffi
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=551138
+---
+ js/src/Makefile.in | 16 ++++++++++++++--
+ js/src/config/autoconf.mk.in | 4 ++++
+ js/src/configure.in | 14 +++++++++++++-
+ js/src/shell/Makefile.in | 3 +++
+ 4 files changed, 34 insertions(+), 3 deletions(-)
+
+--- a/js/src/Makefile.in
++++ b/js/src/Makefile.in
+@@ -453,11 +453,20 @@ CPPSRCS += \
+ Library.cpp \
+ $(NULL)
+
+-LOCAL_INCLUDES = \
+- -Ictypes/libffi/include \
++ifdef MOZ_NATIVE_FFI
++LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
++else
++LOCAL_INCLUDES = -Ictypes/libffi/include
++endif
++
++LOCAL_INCLUDES += \
+ -I. \
+ $(NULL)
+
++
++ifdef MOZ_NATIVE_FFI
++EXTRA_DSO_LDOPTS += $(MOZ_FFI_LIBS)
++else
+ ifeq ($(OS_ARCH),OS2)
+ SHARED_LIBRARY_LIBS += \
+ ctypes/libffi/.libs/ffi.a \
+@@ -467,6 +476,7 @@ SHARED_LIBRARY_LIBS += \
+ ctypes/libffi/.libs/libffi.$(LIB_SUFFIX) \
+ $(NULL)
+ endif
++endif
+
+ endif # JS_HAS_CTYPES
+
+@@ -546,6 +556,7 @@ endif
+ include $(topsrcdir)/config/rules.mk
+
+ ifdef JS_HAS_CTYPES
++ifndef MOZ_NATIVE_FFI
+ # Build libffi proper as part of the 'exports' target, so things get built
+ # in the right order.
+ export::
+@@ -554,6 +565,7 @@ export::
+ distclean clean::
+ $(call SUBMAKE,$@,ctypes/libffi)
+ endif
++endif
+
+ ifdef MOZ_SYNC_BUILD_FILES
+ # Because the SpiderMonkey can be distributed and built independently
+--- a/js/src/config/autoconf.mk.in
++++ b/js/src/config/autoconf.mk.in
+@@ -250,6 +250,10 @@ NSPR_CONFIG = @NSPR_CONFIG@
+ NSPR_CFLAGS = @NSPR_CFLAGS@
+ NSPR_LIBS = @NSPR_LIBS@
+
++MOZ_NATIVE_FFI = @MOZ_NATIVE_FFI@
++MOZ_FFI_LIBS = @MOZ_FFI_LIBS@
++MOZ_FFI_CFLAGS = @MOZ_FFI_CFLAGS@
++
+ USE_DEPENDENT_LIBS = @USE_DEPENDENT_LIBS@
+
+ JS_NATIVE_EDITLINE = @JS_NATIVE_EDITLINE@
+--- a/js/src/configure.in
++++ b/js/src/configure.in
+@@ -4591,6 +4591,18 @@ if test -n "$MOZ_NATIVE_NSPR"; then
+ CFLAGS=$_SAVE_CFLAGS
+ fi
+
++dnl system libffi Support
++dnl ========================================================
++MOZ_ARG_ENABLE_BOOL(system-ffi,
++[ --enable-system-ffi Use system libffi (located with pkgconfig)],
++ MOZ_NATIVE_FFI=1 )
++
++if test -n "$MOZ_NATIVE_FFI"; then
++ PKG_CHECK_MODULES(MOZ_FFI, libffi)
++fi
++
++AC_SUBST(MOZ_NATIVE_FFI)
++
+ dnl ========================================================
+ dnl =
+ dnl = Application
+@@ -6074,7 +6086,7 @@ AC_MSG_RESULT(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
+--- a/js/src/shell/Makefile.in
++++ b/js/src/shell/Makefile.in
+@@ -53,6 +53,9 @@ CPPSRCS = \
+ DEFINES += -DEXPORT_JS_API
+
+ LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
++ifdef MOZ_NATIVE_FFI
++EXTRA_LIBS += $(MOZ_FFI_LIBS)
++endif
+
+ LOCAL_INCLUDES += -I$(topsrcdir) -I..
+
Added: autoconf.patch
===================================================================
--- autoconf.patch (rev 0)
+++ autoconf.patch 2018-01-11 19:11:17 UTC (rev 281369)
@@ -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
Added: destdir.patch
===================================================================
--- destdir.patch (rev 0)
+++ destdir.patch 2018-01-11 19:11:17 UTC (rev 281369)
@@ -0,0 +1,16 @@
+# 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))
Added: fix-811665.patch
===================================================================
--- fix-811665.patch (rev 0)
+++ fix-811665.patch 2018-01-11 19:11:17 UTC (rev 281369)
@@ -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;
+ }
+@@ -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;
More information about the arch-commits
mailing list