From owner-freebsd-gecko@FreeBSD.ORG Thu Aug 23 00:38:36 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5DF5F106566B for ; Thu, 23 Aug 2012 00:38:36 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 013AA8FC0C for ; Thu, 23 Aug 2012 00:38:35 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q7N0cYW3064811 for ; Thu, 23 Aug 2012 00:38:34 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7N0cTo9063968 for freebsd-gecko@freebsd.org; Thu, 23 Aug 2012 00:38:29 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 23 Aug 2012 00:38:29 GMT Message-Id: <201208230038.q7N0cTo9063968@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r947 - in branches/experimental: mail/thunderbird/files www/firefox-nightly/files www/firefox/files www/seamonkey/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Aug 2012 00:38:36 -0000 Author: jbeich Date: Thu Aug 23 00:38:29 2012 New Revision: 947 Log: unbreak --enable-debug --disable-methodjit on ia64 Reported by: Anton Shterenlikht Added: branches/experimental/mail/thunderbird/files/patch-bug784741 branches/experimental/www/firefox-nightly/files/patch-bug784741 branches/experimental/www/firefox/files/patch-bug784741 branches/experimental/www/seamonkey/files/patch-bug784741 Added: branches/experimental/mail/thunderbird/files/patch-bug784741 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-bug784741 Thu Aug 23 00:38:29 2012 (r947) @@ -0,0 +1,43 @@ +diff --git js/src/Makefile.in js/src/Makefile.in +index 8eb385f..01bd8e3 100644 +--- mozilla/js/src/Makefile.in ++++ mozilla/js/src/Makefile.in +@@ -323,6 +323,7 @@ endif + + ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) + ENABLE_YARR_JIT = 1 ++DEFINES += -DENABLE_YARR_JIT=1 + + VPATH += $(srcdir)/assembler/assembler \ + $(srcdir)/methodjit \ +diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h +index 6570f2d..0c84896 100644 +--- mozilla/js/src/assembler/wtf/Platform.h ++++ mozilla/js/src/assembler/wtf/Platform.h +@@ -1102,9 +1102,7 @@ + #if WTF_PLATFORM_CHROMIUM + #define ENABLE_YARR_JIT 0 + +-#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT) +-#define ENABLE_YARR_JIT 1 +- ++#elif ENABLE_YARR_JIT + /* Setting this flag compares JIT results with interpreter results. */ + #define ENABLE_YARR_JIT_DEBUG 0 + #endif +diff --git js/src/configure.in js/src/configure.in +index c142eb7..34f98b9 100644 +--- mozilla/js/src/configure.in ++++ mozilla/js/src/configure.in +@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug, + (using compiler flags DBG)], + [ if test "$enableval" != "no"; then + MOZ_DEBUG=1 +- ENABLE_METHODJIT_SPEW=1 ++ if test "$ENABLE_METHODJIT"; then ++ # needs MethodJIT or YarrJIT ++ ENABLE_METHODJIT_SPEW=1 ++ fi + if test -n "$enableval" -a "$enableval" != "yes"; then + MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` + _MOZ_DEBUG_FLAGS_SET=1 Added: branches/experimental/www/firefox-nightly/files/patch-bug784741 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox-nightly/files/patch-bug784741 Thu Aug 23 00:38:29 2012 (r947) @@ -0,0 +1,43 @@ +diff --git js/src/Makefile.in js/src/Makefile.in +index 8eb385f..01bd8e3 100644 +--- js/src/Makefile.in ++++ js/src/Makefile.in +@@ -323,6 +323,7 @@ endif + + ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) + ENABLE_YARR_JIT = 1 ++DEFINES += -DENABLE_YARR_JIT=1 + + VPATH += $(srcdir)/assembler/assembler \ + $(srcdir)/methodjit \ +diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h +index 6570f2d..0c84896 100644 +--- js/src/assembler/wtf/Platform.h ++++ js/src/assembler/wtf/Platform.h +@@ -1102,9 +1102,7 @@ + #if WTF_PLATFORM_CHROMIUM + #define ENABLE_YARR_JIT 0 + +-#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT) +-#define ENABLE_YARR_JIT 1 +- ++#elif ENABLE_YARR_JIT + /* Setting this flag compares JIT results with interpreter results. */ + #define ENABLE_YARR_JIT_DEBUG 0 + #endif +diff --git js/src/configure.in js/src/configure.in +index c142eb7..34f98b9 100644 +--- js/src/configure.in ++++ js/src/configure.in +@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug, + (using compiler flags DBG)], + [ if test "$enableval" != "no"; then + MOZ_DEBUG=1 +- ENABLE_METHODJIT_SPEW=1 ++ if test "$ENABLE_METHODJIT"; then ++ # needs MethodJIT or YarrJIT ++ ENABLE_METHODJIT_SPEW=1 ++ fi + if test -n "$enableval" -a "$enableval" != "yes"; then + MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` + _MOZ_DEBUG_FLAGS_SET=1 Added: branches/experimental/www/firefox/files/patch-bug784741 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox/files/patch-bug784741 Thu Aug 23 00:38:29 2012 (r947) @@ -0,0 +1,43 @@ +diff --git js/src/Makefile.in js/src/Makefile.in +index 8eb385f..01bd8e3 100644 +--- js/src/Makefile.in ++++ js/src/Makefile.in +@@ -323,6 +323,7 @@ endif + + ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) + ENABLE_YARR_JIT = 1 ++DEFINES += -DENABLE_YARR_JIT=1 + + VPATH += $(srcdir)/assembler/assembler \ + $(srcdir)/methodjit \ +diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h +index 6570f2d..0c84896 100644 +--- js/src/assembler/wtf/Platform.h ++++ js/src/assembler/wtf/Platform.h +@@ -1102,9 +1102,7 @@ + #if WTF_PLATFORM_CHROMIUM + #define ENABLE_YARR_JIT 0 + +-#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT) +-#define ENABLE_YARR_JIT 1 +- ++#elif ENABLE_YARR_JIT + /* Setting this flag compares JIT results with interpreter results. */ + #define ENABLE_YARR_JIT_DEBUG 0 + #endif +diff --git js/src/configure.in js/src/configure.in +index c142eb7..34f98b9 100644 +--- js/src/configure.in ++++ js/src/configure.in +@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug, + (using compiler flags DBG)], + [ if test "$enableval" != "no"; then + MOZ_DEBUG=1 +- ENABLE_METHODJIT_SPEW=1 ++ if test "$ENABLE_METHODJIT"; then ++ # needs MethodJIT or YarrJIT ++ ENABLE_METHODJIT_SPEW=1 ++ fi + if test -n "$enableval" -a "$enableval" != "yes"; then + MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` + _MOZ_DEBUG_FLAGS_SET=1 Added: branches/experimental/www/seamonkey/files/patch-bug784741 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/patch-bug784741 Thu Aug 23 00:38:29 2012 (r947) @@ -0,0 +1,43 @@ +diff --git js/src/Makefile.in js/src/Makefile.in +index 8eb385f..01bd8e3 100644 +--- mozilla/js/src/Makefile.in ++++ mozilla/js/src/Makefile.in +@@ -323,6 +323,7 @@ endif + + ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU))) + ENABLE_YARR_JIT = 1 ++DEFINES += -DENABLE_YARR_JIT=1 + + VPATH += $(srcdir)/assembler/assembler \ + $(srcdir)/methodjit \ +diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h +index 6570f2d..0c84896 100644 +--- mozilla/js/src/assembler/wtf/Platform.h ++++ mozilla/js/src/assembler/wtf/Platform.h +@@ -1102,9 +1102,7 @@ + #if WTF_PLATFORM_CHROMIUM + #define ENABLE_YARR_JIT 0 + +-#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT) +-#define ENABLE_YARR_JIT 1 +- ++#elif ENABLE_YARR_JIT + /* Setting this flag compares JIT results with interpreter results. */ + #define ENABLE_YARR_JIT_DEBUG 0 + #endif +diff --git js/src/configure.in js/src/configure.in +index c142eb7..34f98b9 100644 +--- mozilla/js/src/configure.in ++++ mozilla/js/src/configure.in +@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug, + (using compiler flags DBG)], + [ if test "$enableval" != "no"; then + MOZ_DEBUG=1 +- ENABLE_METHODJIT_SPEW=1 ++ if test "$ENABLE_METHODJIT"; then ++ # needs MethodJIT or YarrJIT ++ ENABLE_METHODJIT_SPEW=1 ++ fi + if test -n "$enableval" -a "$enableval" != "yes"; then + MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'` + _MOZ_DEBUG_FLAGS_SET=1