From 383208838bbdf4ca481096c69fd13f2f4d5b4285 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Date: Wed, 15 Aug 2012 15:18:29 +0200
Subject: manifests: (All) Use linaro branch of clang

Change-Id: I37a30baefb7c7ebd3283d26a49935aa08dd9bd51
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
---
 default.xml                   |  4 +++-
 landing-snowball.xml          |  2 +-
 linaro-default.xml            |  2 +-
 staging-galaxynexus.xml       | 19 +++++++++++++------
 staging-origen.xml            |  2 +-
 staging-panda.xml             |  2 +-
 staging-vexpress-rtsm-isw.xml |  2 +-
 staging-vexpress-rtsm.xml     |  2 +-
 staging-vexpress.xml          |  2 +-
 tracking-panda.xml            |  2 +-
 tracking-vexpress.xml         |  2 +-
 11 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/default.xml b/default.xml
index 4dc6d2f..99484eb 100644
--- a/default.xml
+++ b/default.xml
@@ -102,7 +102,9 @@
   <project path="libcore" name="platform/libcore" revision="refs/tags/android-4.1.1_r4"/>
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="refs/tags/android-4.1.1_r4"/>
   <project path="external/llvm" name="platform/external/llvm" revision="refs/tags/android-4.1.1_r4"/>
-  <project path="external/clang" name="platform/external/clang" revision="refs/tags/android-4.1.1_r4"/>
+  <!-- Linaro modifications: Use -fno-strict-aliasing -->
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
+  <!-- Linaro modifications: need to be restored -->
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="refs/tags/android-4.1.1_r4"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/>
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
diff --git a/landing-snowball.xml b/landing-snowball.xml
index aaf96d9..0e4aaff 100644
--- a/landing-snowball.xml
+++ b/landing-snowball.xml
@@ -115,7 +115,7 @@
   <project path="libcore" name="platform/libcore" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
-  <project path="external/clang" name="platform/external/clang" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
diff --git a/linaro-default.xml b/linaro-default.xml
index 625d9f1..04b5e7c 100644
--- a/linaro-default.xml
+++ b/linaro-default.xml
@@ -114,7 +114,7 @@
   <project path="libcore" name="platform/libcore" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
-  <project path="external/clang" name="platform/external/clang" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
diff --git a/staging-galaxynexus.xml b/staging-galaxynexus.xml
index 4a5e20f..b4e0d34 100644
--- a/staging-galaxynexus.xml
+++ b/staging-galaxynexus.xml
@@ -73,23 +73,30 @@
   <project path="bionic" name="platform/bionic" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: need porting -->
   <project path="external/srec" name="platform/external/srec" revision="refs/tags/android-4.1.1_r4"/>
-  <!-- Linaro modifications: gcc 4.7 support -->
+  <!-- Linaro modifications: gcc 4.7 support, fix aliasing violations -->
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_4.1.1"/>
+  <!-- Linaro modifications: gcc 4.7 support -->
   <project path="frameworks/rs" name="platform/frameworks/rs" revision="linaro_android_4.1.1"/>
   <project path="frameworks/av" name="platform/frameworks/av" revision="linaro_android_4.1.1"/>
   <project path="frameworks/native" name="platform/frameworks/native" revision="linaro_android_4.1.1"/>
   <project path="system/security" name="platform/system/security" revision="linaro_android_4.1.1" />
   <!-- Linaro modifications: support for non-prebuilt toolchain -->
   <project path="external/oprofile" name="platform/external/oprofile" revision="linaro_android_4.1.1" />
+  <!-- Linaro modifications: Fix aliasing violations, fix WiFi module loading on Origen -->
+  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_4.1.1"/>
+  <!-- Linaro modifications: Use -fno-strict-aliasing, don't force -O2 -->
+  <project path="external/freetype" name="platform/external/freetype" revision="linaro_android_4.1.1"/>
+  <!-- Linaro modifications: Fix aliasing violations -->
+  <project path="external/sonivox" name="platform/external/sonivox" revision="linaro_android_4.1.1"/>
+  <!-- Linaro modifications: Use -fno-strict-aliasing -->
+  <project path="external/openssl" name="platform/external/openssl" revision="linaro_android_4.1.1"/>
   <!-- Linaro modifications: need to be restored -->
-  <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="refs/tags/android-4.1.1_r4"/>
-  <project path="external/freetype" name="platform/external/freetype" revision="refs/tags/android-4.1.1_r4"/>
-  <project path="external/sonivox" name="platform/external/sonivox" revision="refs/tags/android-4.1.1_r4"/>
-  <project path="external/openssl" name="platform/external/openssl" revision="refs/tags/android-4.1.1_r4"/>
   <project path="libcore" name="platform/libcore" revision="refs/tags/android-4.1.1_r4"/>
   <project path="frameworks/ex" name="platform/frameworks/ex" revision="refs/tags/android-4.1.1_r4"/>
   <project path="external/llvm" name="platform/external/llvm" revision="refs/tags/android-4.1.1_r4"/>
-  <project path="external/clang" name="platform/external/clang" revision="refs/tags/android-4.1.1_r4"/>
+  <!-- Linaro modifications: Use -fno-strict-aliasing -->
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1"/>
+  <!-- Linaro modifications: need to be restored -->
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" revision="refs/tags/android-4.1.1_r4"/>
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" revision="refs/tags/android-4.1.1_r4"/>
   <!-- Linaro modifications: Replaced traditional libjpeg with libjpeg-turbo -->
diff --git a/staging-origen.xml b/staging-origen.xml
index 4317fe5..8697d34 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -114,7 +114,7 @@
   <project path="libcore" name="platform/libcore" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
-  <project path="external/clang" name="platform/external/clang" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 422192e..57b40a2 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -112,7 +112,7 @@
   <project path="libcore" name="platform/libcore" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
-  <project path="external/clang" name="platform/external/clang" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
diff --git a/staging-vexpress-rtsm-isw.xml b/staging-vexpress-rtsm-isw.xml
index b4c615b..a3dbaef 100644
--- a/staging-vexpress-rtsm-isw.xml
+++ b/staging-vexpress-rtsm-isw.xml
@@ -125,7 +125,7 @@
   <project path="libcore" name="platform/libcore" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
-  <project path="external/clang" name="platform/external/clang" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
diff --git a/staging-vexpress-rtsm.xml b/staging-vexpress-rtsm.xml
index 10cbf1d..1fac77a 100644
--- a/staging-vexpress-rtsm.xml
+++ b/staging-vexpress-rtsm.xml
@@ -124,7 +124,7 @@
   <project path="libcore" name="platform/libcore" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
-  <project path="external/clang" name="platform/external/clang" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
diff --git a/staging-vexpress.xml b/staging-vexpress.xml
index 56b1e12..3192f75 100644
--- a/staging-vexpress.xml
+++ b/staging-vexpress.xml
@@ -115,7 +115,7 @@
   <project path="libcore" name="platform/libcore" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
-  <project path="external/clang" name="platform/external/clang" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index acb498a..ade7ce8 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -111,7 +111,7 @@
   <project path="libcore" name="platform/libcore" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
-  <project path="external/clang" name="platform/external/clang" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
diff --git a/tracking-vexpress.xml b/tracking-vexpress.xml
index 55755f1..a6d1e0d 100644
--- a/tracking-vexpress.xml
+++ b/tracking-vexpress.xml
@@ -114,7 +114,7 @@
   <project path="libcore" name="platform/libcore" />
   <project path="frameworks/ex" name="platform/frameworks/ex" />
   <project path="external/llvm" name="platform/external/llvm" />
-  <project path="external/clang" name="platform/external/clang" />
+  <project path="external/clang" name="platform/external/clang" revision="linaro_android_4.1.1" />
   <project path="external/bluetooth/bluez" name="platform/external/bluetooth/bluez" />
   <project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" />
   <project path="external/tremolo" name="platform/external/tremolo" />
-- 
cgit v1.2.3