summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2015-09-02 14:27:14 +0000
committerdoko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>2015-09-02 14:27:14 +0000
commit7e62f84cfe17c68fe34e739c525aff78ecd07d90 (patch)
treee0d9e7c757fb03a10b7f7b0a072bc9d5d8a2ee63
parent67575efbe32e13ed52fa2c3e7e9ff1d531a97f9e (diff)
downloadgcc-5-7e62f84cfe17c68fe34e739c525aff78ecd07d90.tar.gz
* Apply proposed patch for PR target/67280 (ARM). LP: #1482320.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@8212 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/pr67280.diff27
-rw-r--r--debian/rules.patch1
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 20be06e..fee2d3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gcc-5 (5.2.1-16) UNRELEASED; urgency=medium
* Again, configure with --enable-targets=powerpcle-linux on ppc64el.
* Apply proposed patch for PR target/67211 (ppc64el).
* libgo-dev: Install libgolibbegin.a.
+ * Apply proposed patch for PR target/67280 (ARM). LP: #1482320.
-- Matthias Klose <doko@debian.org> Fri, 28 Aug 2015 16:20:22 +0200
diff --git a/debian/patches/pr67280.diff b/debian/patches/pr67280.diff
new file mode 100644
index 0000000..11b631e
--- /dev/null
+++ b/debian/patches/pr67280.diff
@@ -0,0 +1,27 @@
+# DP: Apply proposed patch for PR target/67280 (ARM).
+
+gcc/ChangeLog:
+
+<DATE> Charles Baylis <charles.baylis@linaro.org>
+
+ * cgraphunit.c (cgraph_node::create_wrapper): Set can_throw_external
+ in new callgraph edge.
+
+Change-Id: I13423872e37f3ca8e0bd61e8eac4a06e8e107a2c
+---
+ gcc/cgraphunit.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/gcc/cgraphunit.c
++++ b/src/gcc/cgraphunit.c
+@@ -2543,6 +2543,7 @@ cgraph_node::create_wrapper (cgraph_node *target)
+ memset (&thunk, 0, sizeof (cgraph_thunk_info));
+ thunk.thunk_p = true;
+ create_edge (target, NULL, count, CGRAPH_FREQ_BASE);
++ callees->can_throw_external = !TREE_NOTHROW (target->decl);
+
+ tree arguments = DECL_ARGUMENTS (decl);
+
+--
+1.9.1
+
diff --git a/debian/rules.patch b/debian/rules.patch
index 8bf488a..347502a 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -89,6 +89,7 @@ debian_patches += \
gccgo-sendfile-fix \
pr66368 \
gcc-sh-bootstrap-ignore \
+ pr67280 \
ifeq ($(libstdcxx_abi),new)
debian_patches += libstdc++-functexcept