Merge remote-tracking branch 'origin/chromium8' into chromium11

sirikata · May 12, 2012 · fd3c93d · fd3c93d
2 parents 9f3b3dc + f8c441a
commit fd3c93d
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 0 deletions.
diff --git a/patches/chromium-gcc-463-glibc-2.14.patch.volatile-malloc b/patches/chromium-gcc-463-glibc-2.14.patch.volatile-malloc
@@ -0,0 +1,83 @@
+Index: net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp
+===================================================================
+--- net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp	(revision 70801)
++++ net/third_party/mozilla_security_manager/nsNSSCertTrust.cpp	(working copy)
+@@ -102,7 +102,7 @@
+ {
+   mTrust.sslFlags = 0;
+   if (peer || tPeer)
+-    addTrust(&mTrust.sslFlags, CERTDB_VALID_PEER);
++    addTrust(&mTrust.sslFlags, CERTDB_TERMINAL_RECORD);
+   if (tPeer)
+     addTrust(&mTrust.sslFlags, CERTDB_TRUSTED);
+   if (ca || tCA)
+@@ -124,7 +124,7 @@
+ {
+   mTrust.emailFlags = 0;
+   if (peer || tPeer)
+-    addTrust(&mTrust.emailFlags, CERTDB_VALID_PEER);
++    addTrust(&mTrust.emailFlags, CERTDB_TERMINAL_RECORD);
+   if (tPeer)
+     addTrust(&mTrust.emailFlags, CERTDB_TRUSTED);
+   if (ca || tCA)
+@@ -146,7 +146,7 @@
+ {
+   mTrust.objectSigningFlags = 0;
+   if (peer || tPeer)
+-    addTrust(&mTrust.objectSigningFlags, CERTDB_VALID_PEER);
++    addTrust(&mTrust.objectSigningFlags, CERTDB_TERMINAL_RECORD);
+   if (tPeer)
+     addTrust(&mTrust.objectSigningFlags, CERTDB_TRUSTED);
+   if (ca || tCA)
+@@ -288,11 +288,11 @@
+                         PRBool checkEmail,  
+                         PRBool checkObjSign)
+ {
+-  if (checkSSL && !hasTrust(mTrust.sslFlags, CERTDB_VALID_PEER))
++  if (checkSSL && !hasTrust(mTrust.sslFlags, CERTDB_TERMINAL_RECORD))
+     return PR_FALSE;
+-  if (checkEmail && !hasTrust(mTrust.emailFlags, CERTDB_VALID_PEER))
++  if (checkEmail && !hasTrust(mTrust.emailFlags, CERTDB_TERMINAL_RECORD))
+     return PR_FALSE;
+-  if (checkObjSign && !hasTrust(mTrust.objectSigningFlags, CERTDB_VALID_PEER))
++  if (checkObjSign && !hasTrust(mTrust.objectSigningFlags, CERTDB_TERMINAL_RECORD))
+     return PR_FALSE;
+   return PR_TRUE;
+ }
+Index: third_party/tcmalloc/chromium/src/tcmalloc.cc
+===================================================================
+--- third_party/tcmalloc/chromium/src/tcmalloc.cc	(revision 70801)
++++ third_party/tcmalloc/chromium/src/tcmalloc.cc	(working copy)
+@@ -367,7 +367,7 @@
+   return tc_malloc(size);
+ }
+
+-void* (*__malloc_hook)(
++void* (*volatile __malloc_hook)(
+     size_t size, const void* caller) = tc_ptmalloc_malloc_hook;
+
+ static void* tc_ptmalloc_realloc_hook(
+@@ -375,14 +375,14 @@
+   return tc_realloc(ptr, size);
+ }
+
+-void* (*__realloc_hook)(
++void* (*volatile __realloc_hook)(
+     void* ptr, size_t size, const void* caller) = tc_ptmalloc_realloc_hook;
+
+ static void tc_ptmalloc_free_hook(void* ptr, const void* caller) {
+   tc_free(ptr);
+ }
+
+-void (*__free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook;
++void (*volatile __free_hook)(void* ptr, const void* caller) = tc_ptmalloc_free_hook;
+
+ #endif
+
+@@ -1562,5 +1562,5 @@
+   MallocHook::InvokeNewHook(result, size);
+   return result;
+ }
+-void *(*__memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
++void *(*volatile __memalign_hook)(size_t, size_t, const void *) = MemalignOverride;
+ #endif  // #ifndef TCMALLOC_FOR_DEBUGALLOCATION
diff --git a/patches/chromium-gcc-disable-warnings-as-errors.patch b/patches/chromium-gcc-disable-warnings-as-errors.patch
@@ -0,0 +1,21 @@
+Index: build/common.gypi
+===================================================================
+--- build/common.gypi	(revision 70801)
++++ build/common.gypi	(working copy)
+@@ -568,7 +568,6 @@
+             'cflags!': [
+               '-Wall',
+               '-Wextra',
+-              '-Werror',
+             ],
+           }],
+           [ 'OS=="win"', {
+@@ -846,7 +845,7 @@
+           # there is some 4.4 test infrastructure in place and existing
+           # aliasing issues have been fixed.
+           'no_strict_aliasing%': 1,
+-          'conditions': [['OS=="linux"', {'werror%': '-Werror',}],
++          'conditions': [['OS=="linux"', {'werror%': '',}],
+                          ['OS=="freebsd"', {'werror%': '',}],
+                          ['OS=="openbsd"', {'werror%': '',}],
+           ],
diff --git a/util/build-chromium.sh b/util/build-chromium.sh
@@ -415,6 +415,18 @@ elif [ x"${platform}" = x"Linux" ]; then
 	        GCC_46_FIX_CXXFLAGS=""
 	    fi
 	    if [ -e ${CHROMIUM_CHECKOUT_DIR} ]; then
+
+                # Some patches need to selectively applied. They have
+                # special extensions so the majority can just always
+                # be applied
+                VOLATILE_MALLOC=`grep volatile /usr/include/malloc.h`
+	        if [ x"$VOLATILE_MALLOC" != x ]; then
+	            for patch in "${CHROMIUM_PATCHES_DIR}"/*.patch.volatile-malloc; do
+	                careful_patch "${CHROMIUM_CHECKOUT_DIR}/src" "${patch}"
+	            done
+                fi
+
+                # The rest always get applied
 	        for patch in "${CHROMIUM_PATCHES_DIR}"/*.patch; do
 	            careful_patch "${CHROMIUM_CHECKOUT_DIR}/src" "${patch}"
 	        done &&