From 8493cf922e109bc4d640175ff45d021dc8ebfbd2 Mon Sep 17 00:00:00 2001
From: Rail Aliiev <rail@mozilla.com>
Date: Fri, 12 Jul 2013 13:14:57 -0400
Subject: [PATCH] Bug 886842 - Add clang trunk builds for ASan. r=froydnj

---
 .../tooltool-manifests/linux32/asan.manifest       | 14 ++++-----
 .../tooltool-manifests/linux64/asan.manifest       | 34 +++++++++++-----------
 .../tooltool-manifests/macosx64/asan.manifest      | 18 ++++++------
 build/unix/build-clang/clang-trunk.json            | 11 +++++++
 4 files changed, 44 insertions(+), 33 deletions(-)
 rewrite browser/config/tooltool-manifests/linux64/asan.manifest (69%)
 create mode 100644 build/unix/build-clang/clang-trunk.json

diff --git a/browser/config/tooltool-manifests/linux32/asan.manifest b/browser/config/tooltool-manifests/linux32/asan.manifest
index 8ce74c6e79cb..304afbc13451 100644
--- a/browser/config/tooltool-manifests/linux32/asan.manifest
+++ b/browser/config/tooltool-manifests/linux32/asan.manifest
@@ -1,17 +1,17 @@
 [
 {
-"clang_version": "r170890"
+"clang_version": "r185949"
 }, 
 {
-"filename": "setup.sh", 
-"algorithm": "sha512", 
+"size": 47, 
 "digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa", 
-"size": 47
+"algorithm": "sha512", 
+"filename": "setup.sh"
 }, 
 {
-"filename": "clang.tar.bz2", 
+"size": 72573411, 
+"digest": "491753968f34d1bd3c58280688349499a92f31a118eb6f28e86746be62615004370394b8e1b10d48dc3fba4bc6d4fbb4ce6c7dbc4fadb39447de9aa55573c58e", 
 "algorithm": "sha512", 
-"digest": "0bcfc19f05cc0f042befb3823c7ecce9ba411b152921aa29e97e7adc846e0258fd7da521b1620cb1e61a19d2fcac9b60e6d613c922b6c153e01b9b0766651d09", 
-"size": 62708281
+"filename": "clang.tar.bz2"
 }
 ]
diff --git a/browser/config/tooltool-manifests/linux64/asan.manifest b/browser/config/tooltool-manifests/linux64/asan.manifest
dissimilarity index 69%
index 39ba55904656..a681f052c973 100644
--- a/browser/config/tooltool-manifests/linux64/asan.manifest
+++ b/browser/config/tooltool-manifests/linux64/asan.manifest
@@ -1,17 +1,17 @@
-[
-{
-"clang_version": "r170890"
-},
-{
-"filename": "setup.sh",
-"algorithm": "sha512",
-"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
-"size": 47
-},
-{
-"filename": "clang.tar.bz2",
-"algorithm": "sha512",
-"digest": "e14ccefd965372a57c540647b2b99e21a4aa82f81a8b9a9e18dac7cba4c3436181bef0dfab8c51bcb5c343f504a693fdcfbe7d609f10291b5dd65ab059979d29",
-"size": 63034761
-}
-]
+[
+{
+"clang_version": "r185949"
+}, 
+{
+"size": 47, 
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa", 
+"algorithm": "sha512", 
+"filename": "setup.sh"
+}, 
+{
+"size": 73050713, 
+"digest": "2c5c26a44402f974c2a4ccffb07ea1ac2d01d84dc3e4281fef6e047a62606811a16534d034477dfd9be055a07d931b17ca4e883c8edcd1f8d3a8c91b150e2288", 
+"algorithm": "sha512", 
+"filename": "clang.tar.bz2"
+}
+]
diff --git a/browser/config/tooltool-manifests/macosx64/asan.manifest b/browser/config/tooltool-manifests/macosx64/asan.manifest
index ede87d30e76d..adebc0d1a49c 100644
--- a/browser/config/tooltool-manifests/macosx64/asan.manifest
+++ b/browser/config/tooltool-manifests/macosx64/asan.manifest
@@ -1,17 +1,17 @@
 [
 {
-"clang_version": "r170890"
-},
+"clang_version": "r185949"
+}, 
 {
-"size": 47,
-"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa",
-"algorithm": "sha512",
+"size": 47, 
+"digest": "2005a41fe97a5e00997063705f39d42b6a43b1cf7ba306cbc7b1513de34cdcd050fc6326efa2107f19ba0cc67914745dbf13154fa748010a93cf072481ef4aaa", 
+"algorithm": "sha512", 
 "filename": "setup.sh"
-},
+}, 
 {
-"size": 56126352,
-"digest": "e156e2a39abd5bf272ee30748a6825f22ddd27565b097c66662a2a6f2e9892bc5b4bf30a3552dffbe867dbfc39e7ee086e0b2cd7935f6ea216c0cf936178a88f",
-"algorithm": "sha512",
+"size": 61779086, 
+"digest": "b2f2861da7583e859b4fb40e1304dd284df02466c909893684341b16e2f58c4c100891504938cf62f26ac82254b9e87135ba98f8196dd26e9b58d3242f1cf811", 
+"algorithm": "sha512", 
 "filename": "clang.tar.bz2"
 }
 ]
diff --git a/build/unix/build-clang/clang-trunk.json b/build/unix/build-clang/clang-trunk.json
new file mode 100644
index 000000000000..2d55ed74a9ec
--- /dev/null
+++ b/build/unix/build-clang/clang-trunk.json
@@ -0,0 +1,11 @@
+{
+    "llvm_revision": "185949",
+    "llvm_repo": "https://llvm.org/svn/llvm-project/llvm/trunk",
+    "clang_repo": "https://llvm.org/svn/llvm-project/cfe/trunk",
+    "compiler_repo": "https://llvm.org/svn/llvm-project/compiler-rt/trunk",
+    "patches": {
+        "macosx64": ["llvm-debug-frame.patch"],
+        "linux64": ["llvm-debug-frame.patch", "no-sse-on-linux.patch"],
+        "linux32": ["llvm-debug-frame.patch", "no-sse-on-linux.patch"]
+    }
+}
-- 
2.11.4.GIT