Update flo blobs to 6.0, finish Marshmallow gcc5 patchset

Change-Id: Icf8d8e7fd1a86331d1ca843368de9cb47127e5c6
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

2 files changed, 20 insertions, 3 deletions

diff --git a/get-flo-blobs b/get-flo-blobs
index d2328d6..9860214 100755
--- a/get-flo-blobs
+++ b/get-flo-blobs
@@ -1,8 +1,8 @@
 #!/bin/sh
 # https://developers.google.com/android/nexus/drivers
-wget https://dl.google.com/dl/android/aosp/asus-flo-lmy48i-8146d0f6.tgz
-wget https://dl.google.com/dl/android/aosp/broadcom-flo-lmy48i-908efbcf.tgz
-wget https://dl.google.com/dl/android/aosp/qcom-flo-lmy48i-0e765cdb.tgz
+wget https://dl.google.com/dl/android/aosp/asus-flo-mra58k-87448153.tgz
+wget https://dl.google.com/dl/android/aosp/broadcom-flo-mra58k-b07af3c3.tgz
+wget https://dl.google.com/dl/android/aosp/qcom-flo-mra58k-c1fa7908.tgz
 for i in *-flo-*.tgz; do
 	tar xf $i
 done
diff --git a/marshmallow-gcc5-patchset b/marshmallow-gcc5-patchset
index 233d13d..b2a1f82 100755
--- a/marshmallow-gcc5-patchset
+++ b/marshmallow-gcc5-patchset
@@ -16,4 +16,21 @@ if ! [ -d "$AOSP" ] && ! [ -d "$AOSP/bionic" ] && [ -d "$AOSP"/build ]; then
 fi
 
 # Fix libatomic.a detection with gcc 5+
+# Not submitted upstream yet, looking for a cleaner solution.
+# (But this one works without drawbacks)
 apply --linaro build 16156/1
+# Fix uchar.h for use with gcc 5+
+# Accepted upstream, already on master
+apply --linaro bionic 16161/1
+# Fix gcc 5+ compiler warning in code built with -Werror
+# Submitted upstream, not yet accepted
+# https://android-review.googlesource.com/175288
+apply frameworks/base 175288/1
+# Fix build with gcc 5+
+# Not yet submitted upstream, need to check if it breaks gcc 4.x
+apply --linaro external/compiler-rt 16187/1
+
+# Optional components -- let's fix them only if they're checked out
+if [ -d "$AOSP/external/powerdebug" ]; then
+	apply --linaro external/powerdebug 16185/1
+fi