From 8078ed945c2a0a42b8220a6ca74e1882a1a5717f Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
Date: Fri, 24 Jun 2016 13:44:52 -0700
Subject: [PATCH] gcc: update to 5.4.0

---
 packages/lang/gcc/package.mk                  |  2 +-
 ...-instructions-as-unconditional-69135.patch | 81 -------------------
 2 files changed, 1 insertion(+), 82 deletions(-)
 delete mode 100644 packages/lang/gcc/patches/gcc-mark-armv8-vcvt-instructions-as-unconditional-69135.patch

diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index 4b58261ba0..022c359970 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="gcc"
-PKG_VERSION="5.3.0"
+PKG_VERSION="5.4.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/lang/gcc/patches/gcc-mark-armv8-vcvt-instructions-as-unconditional-69135.patch b/packages/lang/gcc/patches/gcc-mark-armv8-vcvt-instructions-as-unconditional-69135.patch
deleted file mode 100644
index 5802850f15..0000000000
--- a/packages/lang/gcc/patches/gcc-mark-armv8-vcvt-instructions-as-unconditional-69135.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit 885cc3ea9e4ae1f95589a33eb811c4bebb0dc487
-Author: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date:   Tue Jan 19 14:30:23 2016 +0000
-
-    [ARM] PR target/69135: Mark ARMv8 vcvt instructions as unconditional
-    
-    	PR target/69135
-    	* config/arm/vfp.md (l<vrint_pattern><su_optab><mode>si2): Set "conds"
-    	attribute to unconditional.  Remove %? from output template.
-    
-    	* gcc.target/arm/pr69135_1.c: New test.
-    
-    
-    
-    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232566 138bc75d-0d04-0410-961f-82ee72b054a4
-
-diff --git a/gcc/config/arm/vfp.md b/gcc/config/arm/vfp.md
-index cf3b202..ac5f3b8 100644
---- a/gcc/config/arm/vfp.md
-+++ b/gcc/config/arm/vfp.md
-@@ -1334,8 +1334,9 @@
-                         [(match_operand:SDF 1
-                            "register_operand" "<F_constraint>")] VCVT)))]
-   "TARGET_HARD_FLOAT && TARGET_FPU_ARMV8 <vfp_double_cond>"
--  "vcvt<vrint_variant>%?.<su>32.<V_if_elem>\\t%0, %<V_reg>1"
-+  "vcvt<vrint_variant>.<su>32.<V_if_elem>\\t%0, %<V_reg>1"
-   [(set_attr "predicable" "no")
-+   (set_attr "conds" "unconditional")
-    (set_attr "type" "f_cvtf2i")]
- )
- 
-diff --git a/gcc/testsuite/gcc.target/arm/pr69135_1.c b/gcc/testsuite/gcc.target/arm/pr69135_1.c
-new file mode 100644
-index 0000000..6fb9e06
---- /dev/null
-+++ b/gcc/testsuite/gcc.target/arm/pr69135_1.c
-@@ -0,0 +1,44 @@
-+/* { dg-do assemble } */
-+/* { dg-require-effective-target arm_v8_vfp_ok } */
-+/* { dg-require-effective-target arm_arch_v8a_ok } */
-+/* { dg-options "-O2 -ffast-math" } */
-+/* { dg-add-options arm_v8_vfp } */
-+/* { dg-add-options arm_arch_v8a } */
-+
-+int global;
-+
-+void
-+lceil_float (float x, int b)
-+{
-+  if (b) global = __builtin_lceilf (x);
-+}
-+
-+void
-+lceil_double (double x, int b)
-+{
-+  if (b) global = __builtin_lceil (x);
-+}
-+
-+void
-+lfloor_float (float x, int b)
-+{
-+  if (b) global =  __builtin_lfloorf (x);
-+}
-+
-+void
-+lfloor_double (double x, int b)
-+{
-+  if (b) global = __builtin_lfloor (x);
-+}
-+
-+void
-+lround_float (float x, int b)
-+{
-+  if (b) global = __builtin_lroundf (x);
-+}
-+
-+void
-+lround_double (double x, int b)
-+{
-+  if (b) global = __builtin_lround (x);
-+}