Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcc 10.2.0

Browse Source
This commit is contained in:
Idris Kalp
2020-10-21 03:23:39 +03:00
parent 1eaf726617
commit 1407ccf67b
5 changed files with 274 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/devel/gcc/actions.py
+3 -3
View File
@@ -58,9 +58,9 @@ def setup():
pisitools.dosed("libiberty/configure", "^(ac_cpp='\$CPP\s\$CPPFLAGS)", r"\1 -O2")
shelltools.move("isl-0.21", "isl")
shelltools.move("mpfr-4.0.2", "mpfr")
shelltools.move("mpc-1.1.0", "mpc")
#shelltools.move("gmp-6.1.2", "gmp")
shelltools.move("mpfr-4.1.0", "mpfr")
shelltools.move("mpc-1.2.0", "mpc")
shelltools.move("gmp-6.2.0", "gmp")
shelltools.cd("../")
shelltools.makedirs("build")
system/devel/gcc/files/archlinux/fs64270.patch
+26
View File
@@ -0,0 +1,26 @@
Disable ssp on -nostdlib, -nodefaultlibs and -ffreestanding
--- a/gcc/gcc.c 2017-07-04 09:15:57.740793000 +0200
+++ b/gcc/gcc.c 2018-03-02 13:58:44.387741114 +0100
@@ -857,6 +857,12 @@ proper position among the other output f
#define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
#endif
+#ifdef ENABLE_DEFAULT_SSP
+#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} "
+#else
+#define NO_SSP_SPEC ""
+#endif
+
#ifndef LINK_SSP_SPEC
#ifdef TARGET_LIBC_PROVIDES_SSP
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
@@ -1131,7 +1148,7 @@ static const char *cc1_options =
%{-version:--version}\
%{-help=*:--help=%*}\
%{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
- %{fsyntax-only:-o %j} %{-param*}\
+ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\
%{coverage:-fprofile-arcs -ftest-coverage}\
%{fprofile-arcs|fprofile-generate*|coverage:\
%{!fprofile-update=singel:\
system/devel/gcc/files/archlinux/ipa-fix-ICE-in-get_default_value.patch
+80
View File
@@ -0,0 +1,80 @@
From f91770216eade83f068528c1e4f00e2ac3b23044 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Thu, 13 Aug 2020 09:38:41 +0200
Subject: [PATCH] ipa: fix ICE in get_default_value
The patch aligns code with ipcp_bits_lattice::set_to_constant
where we properly mask m_value with m_mask. The same should
be done here.
gcc/ChangeLog:
PR ipa/96482
* ipa-cp.c (ipcp_bits_lattice::meet_with_1): Mask m_value
with m_mask.
gcc/testsuite/ChangeLog:
PR ipa/96482
* gcc.dg/ipa/pr96482-2.c: New test.
---
gcc/ipa-cp.c | 2 +-
gcc/testsuite/gcc.dg/ipa/pr96482-2.c | 33 ++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.dg/ipa/pr96482-2.c
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 2b21280d919..e4910a04ffa 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -1048,7 +1048,7 @@ ipcp_bits_lattice::meet_with_1 (widest_int value, widest_int mask,
widest_int old_mask = m_mask;
m_mask = (m_mask | mask) | (m_value ^ value);
- m_value &= value;
+ m_value &= ~m_mask;
if (wi::sext (m_mask, precision) == -1)
return set_to_bottom ();
diff --git a/gcc/testsuite/gcc.dg/ipa/pr96482-2.c b/gcc/testsuite/gcc.dg/ipa/pr96482-2.c
new file mode 100644
index 00000000000..54b71ac4fc0
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/ipa/pr96482-2.c
@@ -0,0 +1,33 @@
+/* PR ipa/96482 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int i2c_transfer();
+void _dev_err();
+
+struct i2c_msg {
+ char bufaddr;
+ int adapterdev;
+} wdt87xx_i2c_xfer_client;
+
+int wdt87xx_i2c_xfer_client_0, wdt87xx_i2c_xfer_rxdata, wdt87xx_get_string_str_idx;
+
+void
+static wdt87xx_i2c_xfer(void *txdata, unsigned rxlen) {
+ struct i2c_msg msgs[] = {wdt87xx_i2c_xfer_client_0, rxlen,
+ wdt87xx_i2c_xfer_rxdata};
+ int error = i2c_transfer(wdt87xx_i2c_xfer_client, msgs);
+ _dev_err("", __func__, error);
+}
+static void wdt87xx_get_string(unsigned len) {
+ char tx_buf[] = {wdt87xx_get_string_str_idx, 3};
+ int rx_len = len + 2;
+ wdt87xx_i2c_xfer(tx_buf, rx_len);
+}
+
+void
+wdt87xx_ts_probe_tx_buf() {
+ wdt87xx_get_string(34);
+ wdt87xx_get_string(8);
+ wdt87xx_i2c_xfer(wdt87xx_ts_probe_tx_buf, 2);
+}
--
2.28.0
system/devel/gcc/files/archlinux/ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch
+147
View File
@@ -0,0 +1,147 @@
From d58f078ce2d53e5dab6b3d0d5f960504268e1894 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Wed, 12 Aug 2020 09:21:51 +0200
Subject: [PATCH] ipa: fix bit CPP when combined with IPA bit CP
As mentioned in the PR, let's consider the following example:
int
__attribute__((noinline))
foo(int arg)
{
if (arg == 3)
return 1;
if (arg == 4)
return 123;
__builtin_unreachable ();
}
during WPA we find all calls of the function
(yes the call with value 5 is UBSAN):
Node: foo/0:
param [0]: 5 [loc_time: 4, loc_size: 2, prop_time: 0, prop_size: 0]
3 [loc_time: 3, loc_size: 3, prop_time: 0, prop_size: 0]
ctxs: VARIABLE
Bits: value = 0x5, mask = 0x6
in LTRANS we have the following VRP info:
# RANGE [3, 3] NONZERO 3
when we AND masks in get_default_value we end up with 6 & 3 = 2 (0x010).
That means the only second (least significant bit) is unknown and
value (5 = 0x101) & ~mask gives us either 7 (0x111) or 5 (0x101).
That's why if (arg_2(D) == 3) gets optimized to false.
gcc/ChangeLog:
PR ipa/96482
* ipa-cp.c (ipcp_bits_lattice::meet_with_1): Drop value bits
for bits that are unknown.
(ipcp_bits_lattice::set_to_constant): Likewise.
* tree-ssa-ccp.c (get_default_value): Add sanity check that
IPA CP bit info has all bits set to zero in bits that
are unknown.
gcc/testsuite/ChangeLog:
PR ipa/96482
* gcc.dg/ipa/pr96482.c: New test.
---
gcc/ipa-cp.c | 3 +-
gcc/testsuite/gcc.dg/ipa/pr96482.c | 44 ++++++++++++++++++++++++++++++
gcc/tree-ssa-ccp.c | 3 ++
3 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.dg/ipa/pr96482.c
diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 945a69977f3..2b21280d919 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -1011,7 +1011,7 @@ ipcp_bits_lattice::set_to_constant (widest_int value, widest_int mask)
{
gcc_assert (top_p ());
m_lattice_val = IPA_BITS_CONSTANT;
- m_value = value;
+ m_value = wi::bit_and (wi::bit_not (mask), value);
m_mask = mask;
return true;
}
@@ -1048,6 +1048,7 @@ ipcp_bits_lattice::meet_with_1 (widest_int value, widest_int mask,
widest_int old_mask = m_mask;
m_mask = (m_mask | mask) | (m_value ^ value);
+ m_value &= value;
if (wi::sext (m_mask, precision) == -1)
return set_to_bottom ();
diff --git a/gcc/testsuite/gcc.dg/ipa/pr96482.c b/gcc/testsuite/gcc.dg/ipa/pr96482.c
new file mode 100644
index 00000000000..68ead798d28
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/ipa/pr96482.c
@@ -0,0 +1,44 @@
+/* PR ipa/96482 */
+/* { dg-do run } */
+/* { dg-options "-O2 -flto" } */
+/* { dg-require-effective-target lto } */
+
+int
+__attribute__((noinline))
+foo(int arg)
+{
+ if (arg == 3)
+ return 1;
+ if (arg == 4)
+ return 123;
+
+ __builtin_unreachable ();
+}
+
+int
+__attribute__((noinline))
+baz(int x)
+{
+ if (x != 0)
+ return foo(3); /* called */
+
+ return 1;
+}
+
+int
+__attribute__((noinline))
+bar(int x)
+{
+ if (x == 0)
+ return foo(5); /* not executed */
+
+ return 1;
+}
+
+int main(int argc, char **argv)
+{
+ if (bar(argc) != baz(argc))
+ __builtin_abort ();
+
+ return 0;
+}
diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c
index 7e3921869b8..65dffe06530 100644
--- a/gcc/tree-ssa-ccp.c
+++ b/gcc/tree-ssa-ccp.c
@@ -306,6 +306,9 @@ get_default_value (tree var)
{
val.lattice_val = CONSTANT;
val.value = value;
+ widest_int ipa_value = wi::to_widest (value);
+ /* Unknown bits from IPA CP must be equal to zero. */
+ gcc_assert (wi::bit_and (ipa_value, mask) == 0);
val.mask = mask;
if (nonzero_bits != -1)
val.mask &= extend_mask (nonzero_bits,
--
2.28.0
system/devel/gcc/pspec.xml
+18 -6
View File
@@ -14,13 +14,13 @@
<IsA>library</IsA>
<Summary>The GNU Compiler Collection, includes C, C++, Objective-C and Fortran compilers</Summary>
<Description>The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, as well as libraries for these languages</Description>
<Archive sha1sum="d5f97cd4239dac0f7608f0f3e830a812c6e49fe4" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/gcc-9.2.1.tar.xz</Archive>
<Archive sha1sum="52c1f2a4c9a202f46cf3275a8d46b562aa584208" target="gcc-9.2.1" type="tarxz">https://ftp.gnu.org/gnu/mpfr/mpfr-4.0.2.tar.xz</Archive>
<Archive sha1sum="b019d9e1d27ec5fb99497159d43a3164995de2d0" target="gcc-9.2.1" type="targz">ftp://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz</Archive>
<Archive sha1sum="33e366d59d32330432b5c7f2d0c2fb6664eff224" target="gcc-9.2.1" type="tarbz2">http://isl.gforge.inria.fr/isl-0.21.tar.bz2</Archive>
<!-- <Archive sha1sum="9dc6981197a7d92f339192eea974f5eca48fcffe" target="gcc-9.2.1" type="tarxz">mirrors://gnu/gmp/gmp-6.1.2.tar.xz</Archive> -->
<Archive sha1sum="8de0aecd3a52bb92b43082df8a9256356d1f03be" type="tarxz">http://ftp.gnu.org/gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz</Archive>
<Archive sha1sum="159c3a58705662bfde4dc93f2617f3660855ead6" target="gcc-10.2.0" type="tarxz">http://ftp.gnu.org/gnu/mpfr/mpfr-4.1.0.tar.xz</Archive>
<Archive sha1sum="0abdc94acab0c9bfdaa391347cdfd7bbdb1cf017" target="gcc-10.2.0" type="targz">http://ftp.gnu.org/gnu/mpc/mpc-1.2.0.tar.gz</Archive>
<Archive sha1sum="33e366d59d32330432b5c7f2d0c2fb6664eff224" target="gcc-10.2.0" type="tarbz2">http://isl.gforge.inria.fr/isl-0.21.tar.bz2</Archive>
<Archive sha1sum="052a5411dc74054240eec58132d2cf41211d0ff6" target="gcc-10.2.0" type="tarxz">mirrors://gnu/gmp/gmp-6.2.0.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="2.33.1">binutils</Dependency>
<Dependency versionFrom="2.35.1">binutils</Dependency>
<Dependency>bison</Dependency>
<Dependency>gettext</Dependency>
<Dependency>ncurses</Dependency>
@@ -37,6 +37,11 @@
<!-- Fix paths in 64bit -->
<Patch level="1">pisilinux/64.patch</Patch>
<Patch level="1">pisilinux/gcc_47_based-record_gcc_options.patch</Patch>
<!-- Arch Linux patches -->
<Patch level="1">archlinux/fs64270.patch</Patch>
<!-- <Patch level="1">archlinux/ipa-fix-ICE-in-get_default_value.patch</Patch> -->
<Patch level="1">archlinux/ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch </Patch>
</Patches>
</Source>
@@ -143,6 +148,13 @@
</Package>
<History>
<Update release="8">
<Date>2020-10-21</Date>
<Version>10.2.0</Version>
<Comment>Version bump</Comment>
<Name>Idris Kalp</Name>
<Email>idriskalp@gmail.com</Email>
</Update>
<Update release="7">
<Date>2020-10-01</Date>
<Version>9.2.1</Version>