From 6e5696561610bcde8f0fe63c967b8a96d70dbf2b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 7 Feb 2020 12:01:58 -0800 Subject: [PATCH] unique.exp: Update contains_unique_symbol Since commit 9fc0b501af78b changed symbols from a/b to a_val/b_val, contains_unique_symbol needs adjustment. * testsuite/ld-unique/unique.exp (contains_unique_symbol): Updated. --- ld/ChangeLog | 4 ++++ ld/testsuite/ld-unique/unique.exp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 44a6887980..c3b5541b96 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2020-02-07 H.J. Lu + + * testsuite/ld-unique/unique.exp (contains_unique_symbol): Updated. + 2020-02-07 Sergey Belyashov PR 25469 diff --git a/ld/testsuite/ld-unique/unique.exp b/ld/testsuite/ld-unique/unique.exp index 1f80b39c05..0775c7d64a 100644 --- a/ld/testsuite/ld-unique/unique.exp +++ b/ld/testsuite/ld-unique/unique.exp @@ -92,7 +92,7 @@ proc contains_unique_symbol { binary_file } { # Look for a line like this: # 54: 0000000000400474 4 OBJECT UNIQUE DEFAULT 13 a - if { ![regexp ".*\[ \]*OBJECT\[ \]+UNIQUE\[ \]+DEFAULT\[ \]+\[UND0-9\]+\[ \]+\[ab\]\n" [file_contents readelf.out]] } { + if { ![regexp ".*\[ \]*OBJECT\[ \]+UNIQUE\[ \]+DEFAULT\[ \]+\[UND0-9\]+\[ \]+\[ab\]_val\n" [file_contents readelf.out]] } { return 0 } -- 2.34.1