Rediff patches to current 6.0 codebase

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

5 files changed, 7 insertions, 79 deletions

diff --git a/6.0/0017-Use-eh_frame_hdr-for-static-linking.patch b/6.0/0017-Use-eh_frame_hdr-for-static-linking.patch
index 1720e59..da6f734 100644
--- a/6.0/0017-Use-eh_frame_hdr-for-static-linking.patch
+++ b/6.0/0017-Use-eh_frame_hdr-for-static-linking.patch
@@ -143,8 +143,8 @@
  enable_gnu_unique_object
 +enable_eh_frame_hdr_for_static
  enable_linker_build_id
+ enable_default_ssp
  with_long_double_128
- with_gc
 @@ -1651,6 +1652,9 @@ Optional Features:
    --enable-gnu-unique-object
                            enable the use of the @gnu_unique_object ELF
@@ -154,7 +154,7 @@
 +                          executable
    --enable-linker-build-id
                            compiler will always pass --build-id to linker
-   --enable-maintainer-mode
+   --enable-default-ssp    enable Stack Smashing Protection as default
 @@ -26959,6 +26963,38 @@ if test x"$gcc_cv_ld_eh_frame_hdr" = xye
  
  $as_echo "#define HAVE_LD_EH_FRAME_HDR 1" >>confdefs.h
diff --git a/6.0/0018-use-android-specs-on-aarch64.patch b/6.0/0018-use-android-specs-on-aarch64.patch
index 59f1b81..a09fbc1 100644
--- a/6.0/0018-use-android-specs-on-aarch64.patch
+++ b/6.0/0018-use-android-specs-on-aarch64.patch
@@ -1,11 +1,14 @@
 --- gcc-5.0/gcc/config/aarch64/aarch64-linux.h.omv~	2015-01-03 13:09:08.974824478 +0100
 +++ gcc-5.0/gcc/config/aarch64/aarch64-linux.h	2015-01-03 13:14:47.643252366 +0100
-@@ -22,12 +22,26 @@
+@@ -22,15 +22,29 @@
  #define GCC_AARCH64_LINUX_H
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
 +#define BIONIC_DYNAMIC_LINKER "/system/bin/linker64"
  
+ #undef MUSL_DYNAMIC_LINKER
+ #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+
  #undef  ASAN_CC1_SPEC
  #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
  
diff --git a/6.0/0019-aarch64-bionic-linker-path.patch b/6.0/0019-aarch64-bionic-linker-path.patch
index 1e0ea5a..c4fb252 100644
--- a/6.0/0019-aarch64-bionic-linker-path.patch
+++ b/6.0/0019-aarch64-bionic-linker-path.patch
@@ -7,4 +7,4 @@
 +#undef BIONIC_DYNAMIC_LINKER
  #define BIONIC_DYNAMIC_LINKER "/system/bin/linker64"
  
- #undef  ASAN_CC1_SPEC
+ #undef MUSL_DYNAMIC_LINKER
diff --git a/6.0/0022-isl-0.14.patch b/6.0/0022-isl-0.14.patch
deleted file mode 100644
index 685d6a6..0000000
--- a/6.0/0022-isl-0.14.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- gcc-5.0/gcc/graphite-interchange.c.omv~	2015-01-04 01:27:45.630147199 +0100
-+++ gcc-5.0/gcc/graphite-interchange.c	2015-01-04 01:28:08.640319385 +0100
-@@ -32,11 +32,11 @@ along with GCC; see the file COPYING3.
- #include <isl/val.h>
- 
- /* Since ISL-0.13, the extern is in val_gmp.h.  */
--#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-+#if 0 && !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
- extern "C" {
- #endif
- #include <isl/val_gmp.h>
--#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-+#if 0 && !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
- }
- #endif
- #endif
---- gcc-5.0/gcc/graphite-isl-ast-to-gimple.c.omv~	2015-01-04 01:27:09.036539971 +0100
-+++ gcc-5.0/gcc/graphite-isl-ast-to-gimple.c	2015-01-04 01:27:24.336654498 +0100
-@@ -27,11 +27,11 @@ along with GCC; see the file COPYING3.
- #include <isl/ast_build.h>
- 
- /* Since ISL-0.13, the extern is in val_gmp.h.  */
--#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-+#if 0 && !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
- extern "C" {
- #endif
- #include <isl/val_gmp.h>
--#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-+#if 0 && !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
- }
- #endif
- #endif
---- gcc-5.0/gcc/graphite-optimize-isl.c.omv~	2015-01-04 01:28:37.220533213 +0100
-+++ gcc-5.0/gcc/graphite-optimize-isl.c	2015-01-04 01:29:08.980770781 +0100
-@@ -460,7 +460,7 @@ getScheduleForBandList (isl_band_list *B
- 	      if (flag_loop_unroll_jam && (i != (ScheduleDimensions - depth)))
- 		continue;
- 
--#ifdef HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE
-+#if 1 || defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE)
- 	      if (isl_band_member_is_coincident (Band, i))
- #else
- 	      if (isl_band_member_is_zero_distance (Band, i))
---- gcc-5.0/gcc/graphite-poly.c.omv~	2015-01-04 01:29:27.760911230 +0100
-+++ gcc-5.0/gcc/graphite-poly.c	2015-01-04 01:29:38.414324228 +0100
-@@ -31,11 +31,11 @@ along with GCC; see the file COPYING3.
- #include <isl/val.h>
- 
- /* Since ISL-0.13, the extern is in val_gmp.h.  */
--#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-+#if 0 && !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
- extern "C" {
- #endif
- #include <isl/val_gmp.h>
--#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-+#if 0 && !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
- }
- #endif
- #endif
---- gcc-5.0/gcc/graphite-sese-to-poly.c.omv~	2015-01-04 01:29:55.821121042 +0100
-+++ gcc-5.0/gcc/graphite-sese-to-poly.c	2015-01-04 01:30:06.581194740 +0100
-@@ -29,11 +29,11 @@ along with GCC; see the file COPYING3.
- #include <isl/val.h>
- 
- /* Since ISL-0.13, the extern is in val_gmp.h.  */
--#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-+#if 0 && !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
- extern "C" {
- #endif
- #include <isl/val_gmp.h>
--#if !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
-+#if 0 && !defined(HAVE_ISL_SCHED_CONSTRAINTS_COMPUTE_SCHEDULE) && defined(__cplusplus)
- }
- #endif
- #endif
diff --git a/6.0/0023-libgomp-compile-on-android.patch b/6.0/0022-libgomp-compile-on-android.patch
index 2f9df5d..2f9df5d 100644
--- a/6.0/0023-libgomp-compile-on-android.patch
+++ b/6.0/0022-libgomp-compile-on-android.patch