From 8443f42f05f9026dadad1236b9e44ec294c70337 Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Tue, 28 Mar 2023 10:40:05 +0200
Subject: [PATCH] testsuite: Fix weak_undefined handling on Darwin
The patch that introduced the weak_undefined effective-target keyword
and corresponding dg-add-options support
commit 378ec7b87a5265dbe2d489c245fac98ef37fa638
Author: Alexandre Oliva <oliva@adacore.com>
Date: Thu Mar 23 00:45:05 2023 -0300
[testsuite] test for weak_undefined support and add options
badly broke the affected tests on macOS like so:
ERROR: gcc.dg/addr_equal-1.c: unknown dg option: 89 for " dg-add-options 5 weak_undefined "
ERROR: gcc.dg/addr_equal-1.c: unknown dg option: 89 for " dg-add-options 5 weak_undefined "
add_options_for_weak_undefined tries to call an non-existant proc "89".
Even after fixing this by escaping the brackets, two tests still failed to
link since they lacked the corresponding calls do dg-add-options
weak_undefined.
Tested on x86_64-apple-darwin20.6.0 and i386-pc-solaris2.11.
2023-03-27 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
gcc/testsuite:
* lib/target-supports.exp (add_options_for_weak_undefined): Escape
brackets.
* gcc.dg/visibility-22.c: Add weak_undefined options.
libgomp:
* testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c: Add
weak_undefined options.
---
gcc/testsuite/gcc.dg/visibility-22.c | 1 +
gcc/testsuite/lib/target-supports.exp | 2 +-
libgomp/testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/gcc/testsuite/gcc.dg/visibility-22.c b/gcc/testsuite/gcc.dg/visibility-22.c
index e2b78d1c7fde..9123b350b2e4 100644
--- a/gcc/testsuite/gcc.dg/visibility-22.c
+++ b/gcc/testsuite/gcc.dg/visibility-22.c
@@ -3,6 +3,7 @@
/* { dg-require-visibility "" } */
/* { dg-require-effective-target weak_undefined } */
/* { dg-options "-O2 -fPIC" { target fpic } } */
+/* { dg-add-options weak_undefined } */
extern void foo () __attribute__((weak,visibility("hidden")));
int
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 8a110f2d3bd1..1d6cc6f8d88c 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -361,7 +361,7 @@ proc check_weak_available { } {
proc add_options_for_weak_undefined { flags } {
if { [istarget *-*-darwin*] } {
lappend flags "-Wl,-undefined,dynamic_lookup"
- if { [istarget *-*-darwin[89]*] } {
+ if { [istarget *-*-darwin\[89\]*] } {
lappend flags "-Wl,-flat_namespace"
}
}
diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c
index 20c420d7757a..525e3bff0f1e 100644
--- a/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c
+++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/routine-nohost-2.c
@@ -8,6 +8,7 @@
/* { dg-additional-sources routine-nohost-2_2.c } */
/* { dg-additional-options "-fno-inline" } for stable results regarding OpenACC 'routine'. */
+/* { dg-add-options weak_undefined } */
#include <assert.h>
#include <openacc.h>
--
GitLab