summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Gerus <arachnist@i.am-a.cat>2015-05-23 02:12:06 +0200
committerRobert Gerus <arachnist@i.am-a.cat>2015-05-23 02:12:06 +0200
commit4618fa1175b1f71eaff9e72774e7fabd01ebc866 (patch)
treefb64f8eb89e6d61ca5da650a23791c9696610ac2
parent4bc59cc200a6627eb9ccbfc5665e73bc2e8b6fee (diff)
downloadgentoo-overlay-4618fa1175b1f71eaff9e72774e7fabd01ebc866.tar.gz
gentoo-overlay-4618fa1175b1f71eaff9e72774e7fabd01ebc866.tar.bz2
gentoo-overlay-4618fa1175b1f71eaff9e72774e7fabd01ebc866.tar.xz
gentoo-overlay-4618fa1175b1f71eaff9e72774e7fabd01ebc866.zip
Update PR65873 workaround.
-rw-r--r--sys-devel/gcc/Manifest2
-rw-r--r--sys-devel/gcc/files/Work-around-PR65873.patch39
2 files changed, 14 insertions, 27 deletions
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 5be9170..2e254db 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,4 +1,4 @@
-AUX Work-around-PR65873.patch 6838 SHA256 fc1dc0a1799e8f4bcdc64041f83ef34786f7d48afb37e28a5bc4eaf033e25369 SHA512 c27aa676be6a771aae4aafceaf0fef168d09723385da363fa2ce95426f232e1d85fb9c796bf788dbd63c2280ace7b97cdd787c5302c7a97d75fe451e7ac79ee7 WHIRLPOOL 898f55e47e10634ce70fe0d04adff956d2a517989d9e583d005218e13514d4204a1783648d0d509699631ce8a9956e9515d3401ed79730a9d4cf3ca47113406d
+AUX Work-around-PR65873.patch 6169 SHA256 c586d6201354169dbbe000202a3f8fa3c5ce3cc69b7ad6a46f2cef7b50a0c339 SHA512 1724780475b1ca6b4d91e8c8da8c7758d8c984a245053ef6204ce6edf51bf7708c9326a00d9faa8ea7d050faf421b9b4ae89a1a431d928eafd0c11c2a1fbe11e WHIRLPOOL b49d48d9df1f3abfb261358faa109e4ccbf35cefea716a6a7a62a9cb050ae9d9f81ff35886b81dbdd62f6e7f563f98d430d070217101e9fbf387908e29b6ac95
AUX awk/fixlafiles.awk 7807 SHA256 3cae4890a295adef50c6cf8a7e14d1be4e7a2356479c073e5c29433c3cdf9c5c SHA512 a39e09db4f34d1358de9e929b4c1e10b677d7e8aeffd6afb36d42543b18f1dfa77e3e26331e3fa1b556bae3d8c75ab4bd5796c7ccf2dda4eb365edb307828bed WHIRLPOOL 0cb6e5e96460514c17f3242d8fe936dc2545c07ca08c03ceb34730935435fde24d197300da54d4a19de86067f9e4bbc14178da2f7c03f4be57c89c81307f5d82
AUX awk/fixlafiles.awk-no_gcc_la 8596 SHA256 91e36c29133b6ff854bc84acd6cd2e9d07be6eaa73ef9b23e4f7bc6371107fab SHA512 a970ade3e0b57b3280dd01036a95338c4a7f0c7ec45e7aeb7255197df43e13a5fad8c565b4b345e3a0c8326f71ae7ab598b804eaeaa9d59eda8683195bccfe45 WHIRLPOOL e3da866b8902fbf639af545b43c3b6ccaca0f5d543647007f02e0b8bfc16a675463b8681e9fad11d6ce29517e099636f43708f880ef7a433e4578ee408c3b099
AUX c89 412 SHA256 29ad5dd697135c2892067e780447894dc1cd071708157e46d21773ab99c5022c SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924 WHIRLPOOL d9707a2be8da7a709b54fcb1154cfa05e479f8c3bdd6173822ee1f1bc265b2a0d04741c0685bfb0db68e1e4297fb032d2f8ff94da88014575d947054474d8295
diff --git a/sys-devel/gcc/files/Work-around-PR65873.patch b/sys-devel/gcc/files/Work-around-PR65873.patch
index 653de21..296bca4 100644
--- a/sys-devel/gcc/files/Work-around-PR65873.patch
+++ b/sys-devel/gcc/files/Work-around-PR65873.patch
@@ -1,7 +1,6 @@
-diff -Naur gcc-5.1.0.orig/gcc/ipa-inline.c gcc-5.1.0/gcc/ipa-inline.c
---- gcc-5.1.0.orig/gcc/ipa-inline.c 2015-04-03 20:09:13.000000000 +0200
-+++ gcc-5.1.0/gcc/ipa-inline.c 2015-05-23 00:42:48.649818542 +0200
-@@ -427,49 +427,58 @@
+--- branches/gcc-5-branch/gcc/ipa-inline.c 2015/04/12 19:44:47 222025
++++ branches/gcc-5-branch/gcc/ipa-inline.c 2015/05/17 17:43:04 223270
+@@ -427,49 +427,55 @@
&& lookup_attribute ("always_inline",
DECL_ATTRIBUTES (callee->decl)));
@@ -63,9 +62,6 @@ diff -Naur gcc-5.1.0.orig/gcc/ipa-inline.c gcc-5.1.0/gcc/ipa-inline.c
+ == !opt_for_fn (callee->decl, optimize) || !always_inline))
+ || check_match (flag_wrapv)
+ || check_match (flag_trapv)
-+ /* Strictly speaking only when the callee contains memory
-+ accesses that are not using alias-set zero anyway. */
-+ || check_maybe_down (flag_strict_aliasing)
+ /* Strictly speaking only when the callee uses FP math. */
+ || check_maybe_up (flag_rounding_math)
+ || check_maybe_up (flag_trapping_math)
@@ -98,7 +94,7 @@ diff -Naur gcc-5.1.0.orig/gcc/ipa-inline.c gcc-5.1.0/gcc/ipa-inline.c
{
e->inline_failed = CIF_OPTIMIZATION_MISMATCH;
inlinable = false;
-@@ -484,6 +493,17 @@
+@@ -484,6 +490,17 @@
e->inline_failed = CIF_OPTIMIZATION_MISMATCH;
inlinable = false;
}
@@ -116,21 +112,12 @@ diff -Naur gcc-5.1.0.orig/gcc/ipa-inline.c gcc-5.1.0/gcc/ipa-inline.c
/* If mismatch is caused by merging two LTO units with different
optimizationflags we want to be bit nicer. However never inline
if one of functions is not optimized at all. */
-diff -Naur gcc-5.1.0.orig/gcc/testsuite/gcc.c-torture/compile/pr65873.c gcc-5.1.0/gcc/testsuite/gcc.c-torture/compile/pr65873.c
---- gcc-5.1.0.orig/gcc/testsuite/gcc.c-torture/compile/pr65873.c 1970-01-01 01:00:00.000000000 +0100
-+++ gcc-5.1.0/gcc/testsuite/gcc.c-torture/compile/pr65873.c 2015-05-23 00:30:54.869819620 +0200
-@@ -0,0 +1,14 @@
-+typedef __SIZE_TYPE__ size_t;
-+
-+extern inline __attribute__ ((__always_inline__, __gnu_inline__, __artificial__, __nothrow__, __leaf__)) void *
-+memcpy (void *__restrict __dest, const void *__restrict __src, size_t __len)
-+{
-+ return __builtin___memcpy_chk (__dest, __src, __len, __builtin_object_size (__dest, 0));
-+}
-+
-+__attribute__((optimize ("Ofast"))) void
-+bar (void *d, void *s, size_t l)
-+{
-+ memcpy (d, s, l);
-+}
-+
+@@ -515,7 +532,7 @@
+ else if (opt_for_fn (callee->decl, optimize_size)
+ < opt_for_fn (caller->decl, optimize_size)
+ || (opt_for_fn (callee->decl, optimize)
+- >= opt_for_fn (caller->decl, optimize)))
++ > opt_for_fn (caller->decl, optimize)))
+ {
+ if (estimate_edge_time (e)
+ >= 20 + inline_edge_summary (e)->call_stmt_time)