From owner-freebsd-gecko@FreeBSD.ORG  Mon Nov 26 05:13:18 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
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 BF0926CB
 for <freebsd-gecko@freebsd.org>; Mon, 26 Nov 2012 05:13:18 +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 273C48FC0C
 for <freebsd-gecko@freebsd.org>; Mon, 26 Nov 2012 05:13:17 +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 qAQ5DGsO050747
 for <freebsd-gecko@freebsd.org>; Mon, 26 Nov 2012 05:13:16 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id qAQ5DBYH050430
 for freebsd-gecko@freebsd.org; Mon, 26 Nov 2012 05:13:11 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Mon, 26 Nov 2012 05:13:11 GMT
Message-Id: <201211260513.qAQ5DBYH050430@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
Subject: [SVN-Commit] r1104 - in trunk/www: firefox-nightly/files firefox/files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Nov 2012 05:13:18 -0000

Author: jbeich
Date: Mon Nov 26 05:13:11 2012
New Revision: 1104

Log:
one more ugly workaround for gcc42

Added:
   trunk/www/firefox-nightly/files/patch-bug815025
   trunk/www/firefox/files/patch-bug815025

Added: trunk/www/firefox-nightly/files/patch-bug815025
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug815025	Mon Nov 26 05:13:11 2012	(r1104)
@@ -0,0 +1,27 @@
+--- mfbt/SHA1.h~
++++ mfbt/SHA1.h
+@@ -13,6 +13,11 @@
+ 
+ #include <stddef.h>
+ 
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++/* c++/36107: mark SHA1Sum constructor as weak manually */
++__asm__(".weak _ZN7mozilla7SHA1SumC1Ev");
++#endif
++
+ namespace mozilla {
+ 
+ /**
+@@ -44,7 +49,12 @@ class SHA1Sum
+     bool mDone;
+ 
+   public:
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++    /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
++    MOZ_IMPORT_API SHA1Sum();
++#else
+     MFBT_API SHA1Sum();
++#endif
+ 
+     static const size_t HashSize = 20;
+     typedef uint8_t Hash[HashSize];

Added: trunk/www/firefox/files/patch-bug815025
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug815025	Mon Nov 26 05:13:11 2012	(r1104)
@@ -0,0 +1,27 @@
+--- mfbt/SHA1.h~
++++ mfbt/SHA1.h
+@@ -27,6 +27,11 @@
+ #include "mozilla/StandardInteger.h"
+ #include "mozilla/Types.h"
+ 
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++/* c++/36107: mark SHA1Sum constructor as weak manually */
++__asm__(".weak _ZN7mozilla7SHA1SumC1Ev");
++#endif
++
+ namespace mozilla {
+ class SHA1Sum {
+   union {
+@@ -39,7 +43,12 @@ class SHA1Sum {
+ 
+ public:
+   static const unsigned int HashSize = 20;
++#if !defined(__clang__) && defined(__GNUC__) && __GNUC_MINOR__ <= 3
++  /* c++/36107: gcc42 fails to remove *INTERNAL* from produced asm */
++  MOZ_IMPORT_API() SHA1Sum();
++#else
+   MFBT_API() SHA1Sum();
++#endif
+   MFBT_API(void) update(const void* dataIn, uint32_t len);
+   MFBT_API(void) finish(uint8_t hashout[20]);
+ };