- backport from 11.4.1-2.2: guard the bit test merging code in if-combine (RHEL-6068) - backport from 11.4.1-2.1: fix ICE on pr96024.f90 on big-endian hosts (PR fortran/96024, #2213211) - backport from 11.4.1-2.1: use -fno-stack-protector to fix bit-field aarch64 tests (#2213221) - backport from 11.4.1-2.1: fix ICE on pr96024.f90 on big-endian hosts (PR fortran/96024, #2213211) - backport from 11.4.1-2: update from releases/gcc-11-branch (#2193180) - GCC 11.4 releaseepel9
Robert Scheck
1 year ago
parent
a182f14beb
commit
c70922a453
@ -0,0 +1,108 @@
|
|||||||
|
commit 506d5f399bef7f2d8c48fd83d853c6ff7811a226
|
||||||
|
Author: Jason Merrill <jason@redhat.com>
|
||||||
|
Date: Wed Jul 26 10:39:34 2023 -0400
|
||||||
|
|
||||||
|
c++: member vs global template [PR106310]
|
||||||
|
|
||||||
|
For backward compatibility we still want to allow patterns like
|
||||||
|
this->A<T>::foo, but the template keyword in a qualified name is
|
||||||
|
specifically to specify that a dependent name is a template, so don't look
|
||||||
|
in the enclosing scope at all.
|
||||||
|
|
||||||
|
Also fix handling of dependent bases: if member lookup in the current
|
||||||
|
instantiation fails and we have dependent bases, the lookup is dependent.
|
||||||
|
We were already handling that for the case where lookup in the enclosing
|
||||||
|
scope also fails, but we also want it to affect that lookup itself.
|
||||||
|
|
||||||
|
PR c++/106310
|
||||||
|
|
||||||
|
gcc/cp/ChangeLog:
|
||||||
|
|
||||||
|
* parser.c (cp_parser_template_name): Skip non-member
|
||||||
|
lookup after the template keyword.
|
||||||
|
(cp_parser_lookup_name): Pass down template_keyword_p.
|
||||||
|
|
||||||
|
gcc/testsuite/ChangeLog:
|
||||||
|
|
||||||
|
* g++.dg/template/template-keyword4.C: New test.
|
||||||
|
|
||||||
|
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
|
||||||
|
index 8287934a679..8df715596eb 100644
|
||||||
|
--- a/gcc/cp/parser.c
|
||||||
|
+++ b/gcc/cp/parser.c
|
||||||
|
@@ -2610,7 +2610,7 @@ static tree cp_parser_objc_struct_declaration
|
||||||
|
/* Utility Routines */
|
||||||
|
|
||||||
|
static cp_expr cp_parser_lookup_name
|
||||||
|
- (cp_parser *, tree, enum tag_types, bool, bool, bool, tree *, location_t);
|
||||||
|
+ (cp_parser *, tree, enum tag_types, int, bool, bool, tree *, location_t);
|
||||||
|
static tree cp_parser_lookup_name_simple
|
||||||
|
(cp_parser *, tree, location_t);
|
||||||
|
static tree cp_parser_maybe_treat_template_as_class
|
||||||
|
@@ -17748,7 +17748,7 @@ cp_parser_template_name (cp_parser* parser,
|
||||||
|
/* Look up the name. */
|
||||||
|
decl = cp_parser_lookup_name (parser, identifier,
|
||||||
|
tag_type,
|
||||||
|
- /*is_template=*/true,
|
||||||
|
+ /*is_template=*/1 + template_keyword_p,
|
||||||
|
/*is_namespace=*/false,
|
||||||
|
check_dependency_p,
|
||||||
|
/*ambiguous_decls=*/NULL,
|
||||||
|
@@ -29254,7 +29254,7 @@ prefer_type_arg (tag_types tag_type)
|
||||||
|
refer to types are ignored.
|
||||||
|
|
||||||
|
If IS_TEMPLATE is TRUE, bindings that do not refer to templates are
|
||||||
|
- ignored.
|
||||||
|
+ ignored. If IS_TEMPLATE IS 2, the 'template' keyword was specified.
|
||||||
|
|
||||||
|
If IS_NAMESPACE is TRUE, bindings that do not refer to namespaces
|
||||||
|
are ignored.
|
||||||
|
@@ -29269,7 +29269,7 @@ prefer_type_arg (tag_types tag_type)
|
||||||
|
static cp_expr
|
||||||
|
cp_parser_lookup_name (cp_parser *parser, tree name,
|
||||||
|
enum tag_types tag_type,
|
||||||
|
- bool is_template,
|
||||||
|
+ int is_template,
|
||||||
|
bool is_namespace,
|
||||||
|
bool check_dependency,
|
||||||
|
tree *ambiguous_decls,
|
||||||
|
@@ -29454,7 +29454,14 @@ cp_parser_lookup_name (cp_parser *parser, tree name,
|
||||||
|
else
|
||||||
|
decl = NULL_TREE;
|
||||||
|
|
||||||
|
- if (!decl)
|
||||||
|
+ /* If we didn't find a member and have dependent bases, the member lookup
|
||||||
|
+ is now dependent. */
|
||||||
|
+ if (!dep && !decl && any_dependent_bases_p (object_type))
|
||||||
|
+ dep = true;
|
||||||
|
+
|
||||||
|
+ if (dep && is_template == 2)
|
||||||
|
+ /* The template keyword specifies a dependent template. */;
|
||||||
|
+ else if (!decl)
|
||||||
|
/* Look it up in the enclosing context. DR 141: When looking for a
|
||||||
|
template-name after -> or ., only consider class templates. */
|
||||||
|
decl = lookup_name (name, is_namespace ? LOOK_want::NAMESPACE
|
||||||
|
diff --git a/gcc/testsuite/g++.dg/template/template-keyword4.C b/gcc/testsuite/g++.dg/template/template-keyword4.C
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..a7ab9bb8ca6
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/gcc/testsuite/g++.dg/template/template-keyword4.C
|
||||||
|
@@ -0,0 +1,18 @@
|
||||||
|
+// PR c++/106310
|
||||||
|
+
|
||||||
|
+template <class T>
|
||||||
|
+struct set{};
|
||||||
|
+
|
||||||
|
+template< typename T >
|
||||||
|
+struct Base
|
||||||
|
+{
|
||||||
|
+ template< int > int set(T const &);
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+template< typename T >
|
||||||
|
+struct Derived : Base< T >
|
||||||
|
+{
|
||||||
|
+ void f(T const &arg) {
|
||||||
|
+ this->template set< 0 >(arg);
|
||||||
|
+ }
|
||||||
|
+};
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
commit 482551a79a3d3f107f6239679ee74655cfe8707e
|
||||||
|
Author: Richard Biener <rguenther@suse.de>
|
||||||
|
Date: Thu Aug 17 13:10:14 2023 +0200
|
||||||
|
|
||||||
|
tree-optimization/111039 - abnormals and bit test merging
|
||||||
|
|
||||||
|
The following guards the bit test merging code in if-combine against
|
||||||
|
the appearance of SSA names used in abnormal PHIs.
|
||||||
|
|
||||||
|
PR tree-optimization/111039
|
||||||
|
* tree-ssa-ifcombine.cc (ifcombine_ifandif): Check for
|
||||||
|
SSA_NAME_OCCURS_IN_ABNORMAL_PHI.
|
||||||
|
|
||||||
|
* gcc.dg/pr111039.c: New testcase.
|
||||||
|
|
||||||
|
diff --git a/gcc/testsuite/gcc.dg/pr111039.c b/gcc/testsuite/gcc.dg/pr111039.c
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..bec9983b35f
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/gcc/testsuite/gcc.dg/pr111039.c
|
||||||
|
@@ -0,0 +1,15 @@
|
||||||
|
+/* { dg-do compile } */
|
||||||
|
+/* { dg-options "-O" } */
|
||||||
|
+
|
||||||
|
+int _setjmp ();
|
||||||
|
+void abcd ();
|
||||||
|
+void abcde ();
|
||||||
|
+void compiler_corruption_function(int flags)
|
||||||
|
+{
|
||||||
|
+ int nowait = flags & 1048576, isexpand = flags & 8388608;
|
||||||
|
+ abcd();
|
||||||
|
+ _setjmp(flags);
|
||||||
|
+ if (nowait && isexpand)
|
||||||
|
+ flags &= 0;
|
||||||
|
+ abcde();
|
||||||
|
+}
|
||||||
|
--- a/gcc/tree-ssa-ifcombine.c
|
||||||
|
+++ b/gcc/tree-ssa-ifcombine.c
|
||||||
|
@@ -430,6 +430,9 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv,
|
||||||
|
{
|
||||||
|
tree t, t2;
|
||||||
|
|
||||||
|
+ if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1))
|
||||||
|
+ return false;
|
||||||
|
+
|
||||||
|
/* Do it. */
|
||||||
|
gsi = gsi_for_stmt (inner_cond);
|
||||||
|
t = fold_build2 (LSHIFT_EXPR, TREE_TYPE (name1),
|
||||||
|
@@ -486,6 +489,10 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv,
|
||||||
|
gimple_stmt_iterator gsi;
|
||||||
|
tree t;
|
||||||
|
|
||||||
|
+ if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)
|
||||||
|
+ || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2))
|
||||||
|
+ return false;
|
||||||
|
+
|
||||||
|
/* Find the common name which is bit-tested. */
|
||||||
|
if (name1 == name2)
|
||||||
|
;
|
||||||
@ -0,0 +1,66 @@
|
|||||||
|
commit 966b0a96523fb7adbf498ac71df5e033c70dc546
|
||||||
|
Author: Richard Biener <rguenther@suse.de>
|
||||||
|
Date: Mon Aug 21 09:01:00 2023 +0200
|
||||||
|
|
||||||
|
tree-optimization/111070 - fix ICE with recent ifcombine fix
|
||||||
|
|
||||||
|
We now got test coverage for non-SSA name bits so the following amends
|
||||||
|
the SSA_NAME_OCCURS_IN_ABNORMAL_PHI checks.
|
||||||
|
|
||||||
|
PR tree-optimization/111070
|
||||||
|
* tree-ssa-ifcombine.cc (ifcombine_ifandif): Check we have
|
||||||
|
an SSA name before checking SSA_NAME_OCCURS_IN_ABNORMAL_PHI.
|
||||||
|
|
||||||
|
* gcc.dg/pr111070.c: New testcase.
|
||||||
|
|
||||||
|
diff --git a/gcc/testsuite/gcc.dg/pr111070.c b/gcc/testsuite/gcc.dg/pr111070.c
|
||||||
|
new file mode 100644
|
||||||
|
index 00000000000..1ebc7adf782
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/gcc/testsuite/gcc.dg/pr111070.c
|
||||||
|
@@ -0,0 +1,20 @@
|
||||||
|
+/* { dg-do compile } */
|
||||||
|
+/* { dg-options "-O" } */
|
||||||
|
+
|
||||||
|
+/* common */
|
||||||
|
+char c;
|
||||||
|
+/* arrays must be 8 byte aligned, regardless of size */
|
||||||
|
+char c_ary[1];
|
||||||
|
+
|
||||||
|
+/* data */
|
||||||
|
+char d = 1;
|
||||||
|
+char d_ary[1] = {1};
|
||||||
|
+
|
||||||
|
+int main ()
|
||||||
|
+{
|
||||||
|
+ if (((unsigned long)&c_ary[0] & 7) != 0)
|
||||||
|
+ return 1;
|
||||||
|
+ if (((unsigned long)&d_ary[0] & 7) != 0)
|
||||||
|
+ return 1;
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
--- a/gcc/tree-ssa-ifcombine.c
|
||||||
|
+++ b/gcc/tree-ssa-ifcombine.c
|
||||||
|
@@ -430,7 +430,8 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv,
|
||||||
|
{
|
||||||
|
tree t, t2;
|
||||||
|
|
||||||
|
- if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1))
|
||||||
|
+ if (TREE_CODE (name1) == SSA_NAME
|
||||||
|
+ && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
/* Do it. */
|
||||||
|
@@ -489,8 +490,10 @@ ifcombine_ifandif (basic_block inner_cond_bb, bool inner_inv,
|
||||||
|
gimple_stmt_iterator gsi;
|
||||||
|
tree t;
|
||||||
|
|
||||||
|
- if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1)
|
||||||
|
- || SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2))
|
||||||
|
+ if ((TREE_CODE (name1) == SSA_NAME
|
||||||
|
+ && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name1))
|
||||||
|
+ || (TREE_CODE (name2) == SSA_NAME
|
||||||
|
+ && SSA_NAME_OCCURS_IN_ABNORMAL_PHI (name2)))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
/* Find the common name which is bit-tested. */
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
commit 7f875e435b23dfb439bc7784cade4aebbd5d4a69
|
||||||
|
Author: Jakub Jelinek <jakub@redhat.com>
|
||||||
|
Date: Fri Jun 9 09:10:29 2023 +0200
|
||||||
|
|
||||||
|
fortran: Fix ICE on pr96024.f90 on big-endian hosts [PR96024]
|
||||||
|
|
||||||
|
The pr96024.f90 testcase ICEs on big-endian hosts. The problem is
|
||||||
|
that length->val.integer is accessed after checking
|
||||||
|
length->expr_type == EXPR_CONSTANT, but it is a CHARACTER constant
|
||||||
|
which uses length->val.character union member instead and on big-endian
|
||||||
|
we end up reading constant 0x100000000 rather than some small number
|
||||||
|
on little-endian and if target doesn't have enough memory for 4 times
|
||||||
|
that (i.e. 16GB allocation), it ICEs.
|
||||||
|
|
||||||
|
2023-06-09 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
|
PR fortran/96024
|
||||||
|
* primary.c (gfc_convert_to_structure_constructor): Only do
|
||||||
|
constant string ctor length verification and truncation/padding
|
||||||
|
if constant length has INTEGER type.
|
||||||
|
|
||||||
|
(cherry picked from commit 4cf6e322adc19f927859e0a5edfa93cec4b8c844)
|
||||||
|
|
||||||
|
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c
|
||||||
|
index 1b93f96367f..5cad2d2682b 100644
|
||||||
|
--- a/gcc/fortran/primary.c
|
||||||
|
+++ b/gcc/fortran/primary.c
|
||||||
|
@@ -3188,10 +3188,11 @@ gfc_convert_to_structure_constructor (gfc_expr *e, gfc_symbol *sym, gfc_expr **c
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
/* For a constant string constructor, make sure the length is
|
||||||
|
- correct; truncate of fill with blanks if needed. */
|
||||||
|
+ correct; truncate or fill with blanks if needed. */
|
||||||
|
if (this_comp->ts.type == BT_CHARACTER && !this_comp->attr.allocatable
|
||||||
|
&& this_comp->ts.u.cl && this_comp->ts.u.cl->length
|
||||||
|
&& this_comp->ts.u.cl->length->expr_type == EXPR_CONSTANT
|
||||||
|
+ && this_comp->ts.u.cl->length->ts.type == BT_INTEGER
|
||||||
|
&& actual->expr->ts.type == BT_CHARACTER
|
||||||
|
&& actual->expr->expr_type == EXPR_CONSTANT)
|
||||||
|
{
|
||||||
@ -0,0 +1,134 @@
|
|||||||
|
commit 74833b3165865a9373506f447720cf20f29c20c8
|
||||||
|
Author: Christophe Lyon <christophe.lyon@arm.com>
|
||||||
|
Date: Tue Jan 17 13:10:10 2023 +0000
|
||||||
|
|
||||||
|
aarch64: add -fno-stack-protector to some tests [PR108411]
|
||||||
|
|
||||||
|
As discussed in the PR, these recently added tests fail when the
|
||||||
|
testsuite is executed with -fstack-protector-strong. To avoid this,
|
||||||
|
this patch adds -fno-stack-protector to dg-options.
|
||||||
|
|
||||||
|
PR target/108411
|
||||||
|
gcc/testsuite
|
||||||
|
* g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C: Add
|
||||||
|
-fno-stack-protector.
|
||||||
|
* g++.target/aarch64/bitfield-abi-warning-align16-O2.C: Likewise.
|
||||||
|
* g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C: Likewise.
|
||||||
|
* g++.target/aarch64/bitfield-abi-warning-align32-O2.C: Likewise.
|
||||||
|
* g++.target/aarch64/bitfield-abi-warning-align8-O2.C: Likewise.
|
||||||
|
* gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c: Likewise.
|
||||||
|
* gcc.target/aarch64/bitfield-abi-warning-align16-O2.c: Likewise.
|
||||||
|
* gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c: Likewise.
|
||||||
|
* gcc.target/aarch64/bitfield-abi-warning-align32-O2.c: Likewise.
|
||||||
|
* gcc.target/aarch64/bitfield-abi-warning-align8-O2.c: Likewise.
|
||||||
|
|
||||||
|
diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C
|
||||||
|
index 443cd458b4c..52f9cdd1ee9 100644
|
||||||
|
--- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C
|
||||||
|
+++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2-extra.C
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* { dg-do compile } */
|
||||||
|
-/* { dg-options "-O2 -save-temps -Wno-narrowing" } */
|
||||||
|
+/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */
|
||||||
|
|
||||||
|
#define ALIGN 16
|
||||||
|
//#define EXTRA
|
||||||
|
diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C
|
||||||
|
index 76a7e3d0ad4..9ff4e46645b 100644
|
||||||
|
--- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C
|
||||||
|
+++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align16-O2.C
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* { dg-do compile } */
|
||||||
|
-/* { dg-options "-O2 -save-temps -Wno-narrowing" } */
|
||||||
|
+/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */
|
||||||
|
|
||||||
|
#define ALIGN 16
|
||||||
|
#define EXTRA
|
||||||
|
diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C
|
||||||
|
index 6f8f54f41ff..55dcbfe4b7c 100644
|
||||||
|
--- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C
|
||||||
|
+++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2-extra.C
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* { dg-do compile } */
|
||||||
|
-/* { dg-options "-O2 -save-temps -Wno-narrowing" } */
|
||||||
|
+/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */
|
||||||
|
|
||||||
|
#define ALIGN 32
|
||||||
|
//#define EXTRA
|
||||||
|
diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C
|
||||||
|
index 6b8ad5fbea1..6bb8778ee90 100644
|
||||||
|
--- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C
|
||||||
|
+++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align32-O2.C
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* { dg-do compile } */
|
||||||
|
-/* { dg-options "-O2 -save-temps -Wno-narrowing" } */
|
||||||
|
+/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */
|
||||||
|
|
||||||
|
#define ALIGN 32
|
||||||
|
#define EXTRA
|
||||||
|
diff --git a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C
|
||||||
|
index b1764d97ea0..41bcc894a2b 100644
|
||||||
|
--- a/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C
|
||||||
|
+++ b/gcc/testsuite/g++.target/aarch64/bitfield-abi-warning-align8-O2.C
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* { dg-do compile } */
|
||||||
|
-/* { dg-options "-O2 -save-temps -Wno-narrowing" } */
|
||||||
|
+/* { dg-options "-O2 -fno-stack-protector -save-temps -Wno-narrowing" } */
|
||||||
|
|
||||||
|
#define ALIGN 8
|
||||||
|
#define EXTRA
|
||||||
|
diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c
|
||||||
|
index f248a129509..3b2c932ac23 100644
|
||||||
|
--- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c
|
||||||
|
+++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2-extra.c
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* { dg-do compile } */
|
||||||
|
-/* { dg-options "-O2 -save-temps" } */
|
||||||
|
+/* { dg-options "-O2 -fno-stack-protector -save-temps" } */
|
||||||
|
|
||||||
|
#define ALIGN 16
|
||||||
|
//#define EXTRA
|
||||||
|
diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c
|
||||||
|
index 22ee5ec4c92..ee5d6faa428 100644
|
||||||
|
--- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c
|
||||||
|
+++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align16-O2.c
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* { dg-do compile } */
|
||||||
|
-/* { dg-options "-O2 -save-temps" } */
|
||||||
|
+/* { dg-options "-O2 -fno-stack-protector -save-temps" } */
|
||||||
|
|
||||||
|
#define ALIGN 16
|
||||||
|
#define EXTRA
|
||||||
|
diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c
|
||||||
|
index a8a50b35e8e..6d4a883a96e 100644
|
||||||
|
--- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c
|
||||||
|
+++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2-extra.c
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* { dg-do compile } */
|
||||||
|
-/* { dg-options "-O2 -save-temps" } */
|
||||||
|
+/* { dg-options "-O2 -fno-stack-protector -save-temps" } */
|
||||||
|
|
||||||
|
#define ALIGN 32
|
||||||
|
//#define EXTRA
|
||||||
|
diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c
|
||||||
|
index e872de3dbe0..331daba354c 100644
|
||||||
|
--- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c
|
||||||
|
+++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align32-O2.c
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* { dg-do compile } */
|
||||||
|
-/* { dg-options "-O2 -save-temps" } */
|
||||||
|
+/* { dg-options "-O2 -fno-stack-protector -save-temps" } */
|
||||||
|
|
||||||
|
#define ALIGN 32
|
||||||
|
#define EXTRA
|
||||||
|
diff --git a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c
|
||||||
|
index cb2a945a819..e6d45f5dd5c 100644
|
||||||
|
--- a/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c
|
||||||
|
+++ b/gcc/testsuite/gcc.target/aarch64/bitfield-abi-warning-align8-O2.c
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/* { dg-do compile } */
|
||||||
|
-/* { dg-options "-O2 -save-temps" } */
|
||||||
|
+/* { dg-options "-O2 -fno-stack-protector -save-temps" } */
|
||||||
|
|
||||||
|
#define ALIGN 8
|
||||||
|
#define EXTRA
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc b/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc
|
||||||
|
index b0277b3f4d1..425daff317a 100644
|
||||||
|
--- a/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc
|
||||||
|
+++ b/libstdc++-v3/testsuite/26_numerics/gcd/gcd_neg.cc
|
||||||
|
@@ -53,3 +53,6 @@ test01()
|
||||||
|
// { dg-prune-output "does not have integral type" }
|
||||||
|
// { dg-prune-output "non-integral type" }
|
||||||
|
// { dg-prune-output "invalid specialization" }
|
||||||
|
+// These show up with -Wp,-D_GLIBCXX_ASSERTIONS.
|
||||||
|
+// { dg-prune-output "invalid operands" }
|
||||||
|
+// { dg-prune-output "wrong type argument" }
|
||||||
|
diff --git a/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc b/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc
|
||||||
|
index 8cabfe2ea2f..a14d373c461 100644
|
||||||
|
--- a/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc
|
||||||
|
+++ b/libstdc++-v3/testsuite/26_numerics/lcm/lcm_neg.cc
|
||||||
|
@@ -53,3 +53,6 @@ test01()
|
||||||
|
// { dg-prune-output "does not have integral type" }
|
||||||
|
// { dg-prune-output "non-integral type" }
|
||||||
|
// { dg-prune-output "invalid specialization" }
|
||||||
|
+// These show up with -Wp,-D_GLIBCXX_ASSERTIONS.
|
||||||
|
+// { dg-prune-output "invalid operands" }
|
||||||
|
+// { dg-prune-output "wrong type argument" }
|
||||||
Loading…
Reference in new issue