[arch-commits] Commit in gcc/trunk (5 files)

Frederik Schwan freswa at gemini.archlinux.org
Thu Feb 10 18:53:39 UTC 2022


    Date: Thursday, February 10, 2022 @ 18:53:39
  Author: freswa
Revision: 436892

cleanup

* remove unused patches
* add zstd to makedepends
* format fixes

Modified:
  gcc/trunk/PKGBUILD
Deleted:
  gcc/trunk/fs64270.patch
  gcc/trunk/gcc11-Wno-format-security.patch
  gcc/trunk/ipa-fix-ICE-in-get_default_value.patch
  gcc/trunk/ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch

-----------------------------------------------------+
 PKGBUILD                                            |   21 --
 fs64270.patch                                       |   26 ---
 gcc11-Wno-format-security.patch                     |   27 ---
 ipa-fix-ICE-in-get_default_value.patch              |   80 ---------
 ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch |  147 ------------------
 5 files changed, 7 insertions(+), 294 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-10 18:49:28 UTC (rev 436891)
+++ PKGBUILD	2022-02-10 18:53:39 UTC (rev 436892)
@@ -16,9 +16,9 @@
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
 url='https://gcc.gnu.org'
-makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python git libxcrypt)
-checkdepends=(dejagnu inetutils)
-options=(!emptydirs !lto)
+makedepends=(binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python git libxcrypt zstd)
+checkdepends=(dejagnu inetutils tcl expect python-pytest)
+options=(!emptydirs)
 _libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
 # _commit=6beb39ee6c465c21d0cc547fd66b445100cdcc35
 # source=(git://gcc.gnu.org/git/gcc.git#commit=$_commit
@@ -26,11 +26,7 @@
         https://libisl.sourceforge.io/isl-${_islver}.tar.xz
         c89 c99
         gdc_phobos_path.patch
-        fs64270.patch
-        ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch
-        ipa-fix-ICE-in-get_default_value.patch
         gcc-ada-repro.patch
-        gcc11-Wno-format-security.patch
 )
 validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski at archlinux.org
               86CFFCA918CF3AF47147588051E8B148A9999C34  # evangelos at foutrelis.com
@@ -65,14 +61,11 @@
   sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
 
   # D hacks
-  patch -p1 -i "$srcdir/gdc_phobos_path.patch"
+  patch -Np1 -i "$srcdir/gdc_phobos_path.patch"
 
   # Reproducible gcc-ada
   patch -Np0 < "$srcdir/gcc-ada-repro.patch"
 
-  # configure.ac: When adding -Wno-format, also add -Wno-format-security
-  patch -Np0 < "$srcdir/gcc11-Wno-format-security.patch"
-
   mkdir -p "$srcdir/gcc-build"
 }
 
@@ -125,8 +118,8 @@
 check() {
   cd gcc-build
 
-  # disable libphobos test to avoid segfaults and other unfunny ways to waste my time  
-  sed -i '/maybe-check-target-libphobos \\/d' Makefile 
+  # disable libphobos test to avoid segfaults and other unfunny ways to waste my time
+  sed -i '/maybe-check-target-libphobos \\/d' Makefile
 
   # do not abort on error as some are "expected"
   make -O -k check || true
@@ -180,7 +173,7 @@
 
 package_gcc() {
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc)
+  depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc zstd)
   groups=('base-devel')
   optdepends=('lib32-gcc-libs: for generating code for 32-bit ABI')
   provides=($pkgname-multilib)

Deleted: fs64270.patch
===================================================================
--- fs64270.patch	2022-02-10 18:49:28 UTC (rev 436891)
+++ fs64270.patch	2022-02-10 18:53:39 UTC (rev 436892)
@@ -1,26 +0,0 @@
-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:\

Deleted: gcc11-Wno-format-security.patch
===================================================================
--- gcc11-Wno-format-security.patch	2022-02-10 18:49:28 UTC (rev 436891)
+++ gcc11-Wno-format-security.patch	2022-02-10 18:53:39 UTC (rev 436892)
@@ -1,27 +0,0 @@
-2017-02-25  Jakub Jelinek  <jakub at redhat.com>
-
-	* configure.ac: When adding -Wno-format, also add -Wno-format-security.
-	* configure: Regenerated.
-
---- gcc/configure.ac.jj	2017-02-13 12:20:53.000000000 +0100
-+++ gcc/configure.ac	2017-02-25 12:42:32.859175403 +0100
-@@ -480,7 +480,7 @@ AC_ARG_ENABLE(build-format-warnings,
-   AS_HELP_STRING([--disable-build-format-warnings],[don't use -Wformat while building GCC]),
-   [],[enable_build_format_warnings=yes])
- AS_IF([test $enable_build_format_warnings = no],
--      [wf_opt=-Wno-format],[wf_opt=])
-+      [wf_opt="-Wno-format -Wno-format-security"],[wf_opt=])
- ACX_PROG_CXX_WARNING_OPTS(
- 	m4_quote(m4_do([-W -Wall -Wno-narrowing -Wwrite-strings ],
- 		       [-Wcast-qual -Wno-error=format-diag $wf_opt])),
---- gcc/configure.jj	2017-02-13 12:20:52.000000000 +0100
-+++ gcc/configure	2017-02-25 12:42:50.041946391 +0100
-@@ -6647,7 +6647,7 @@ else
- fi
- 
- if test $enable_build_format_warnings = no; then :
--  wf_opt=-Wno-format
-+  wf_opt="-Wno-format -Wno-format-security"
- else
-   wf_opt=
- fi

Deleted: ipa-fix-ICE-in-get_default_value.patch
===================================================================
--- ipa-fix-ICE-in-get_default_value.patch	2022-02-10 18:49:28 UTC (rev 436891)
+++ ipa-fix-ICE-in-get_default_value.patch	2022-02-10 18:53:39 UTC (rev 436892)
@@ -1,80 +0,0 @@
-From f91770216eade83f068528c1e4f00e2ac3b23044 Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska at 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
-

Deleted: ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch
===================================================================
--- ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch	2022-02-10 18:49:28 UTC (rev 436891)
+++ ipa-fix-bit-CPP-when-combined-with-IPA-bit-CP.patch	2022-02-10 18:53:39 UTC (rev 436892)
@@ -1,147 +0,0 @@
-From d58f078ce2d53e5dab6b3d0d5f960504268e1894 Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska at 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
-



More information about the arch-commits mailing list