head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2013.02.20.00.52.22;	author svnexp;	state dead;
branches;
next	1.1;

1.1
date	2013.01.10.23.03.35;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/312608
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@--- 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]);
 };
@


1.1
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/310207
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r310207 | flo | 2013-01-10 22:29:23 +0000 (Thu, 10 Jan 2013) | 9 lines
## SVN ##
## SVN ## - update www/firefox to 18.0
## SVN ## - update www/firefox-esr to 17.0.2
## SVN ## - update www/seamonkey to 2.15 (enigmail to 1.5.0)
## SVN ## - remove QT4 option to avoid confusion (it turned out to be too experimental)
## SVN ##
## SVN ## In collaboration with: Jan Beich <jbeich@@tormail.org>
## SVN ##
## SVN ## Security:	http://www.vuxml.org/freebsd/a4ed6632-5aa9-11e2-8fcb-c8600054b392.html
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@@

