summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2021-11-15 13:02:26 +1030
committerAlan Modra <amodra@gmail.com>2021-11-15 13:26:17 +1030
commitdaad0428f27f8379948fa85c951c72ffc16b27d4 (patch)
tree485acac2b17774be456e808fce73216611403715
parent7aba54da426b9999085d8f84e7896b8afdbb9ca6 (diff)
downloadbinutils-gdb-daad0428f27f8379948fa85c951c72ffc16b27d4.tar.gz
-Waddress fixes for gold testsuite
Current mainline gcc. common_test_1.c: In function 'main': common_test_1.c:56:14: error: comparison between two arrays [-Werror=array-compare] 56 | assert (c5 > c4); | ^ common_test_1.c:56:14: note: use '&c5[0] > &c4[0]' to compare the addresses * testsuite/common_test_1.c: Avoid -Waddress warnings. * testsuite/common_test_1_v1.c: Likewise. * testsuite/common_test_1_v2.c: Likewise. * testsuite/script_test_2.cc: Likewise.
-rw-r--r--gold/testsuite/common_test_1.c16
-rw-r--r--gold/testsuite/common_test_1_v1.c16
-rw-r--r--gold/testsuite/common_test_1_v2.c16
-rw-r--r--gold/testsuite/script_test_2.cc8
4 files changed, 28 insertions, 28 deletions
diff --git a/gold/testsuite/common_test_1.c b/gold/testsuite/common_test_1.c
index 148b875e010..59d7bc32e4c 100644
--- a/gold/testsuite/common_test_1.c
+++ b/gold/testsuite/common_test_1.c
@@ -53,14 +53,14 @@ int a9 __attribute__ ((aligned (1 << 5)));
int
main (int argc __attribute__ ((unused)), char** argv __attribute__ ((unused)))
{
- assert (c5 > c4);
- assert (c4 > c3);
- assert (c3 > c2);
- assert (c2 > c1);
- assert (c1 > c6);
- assert (c6 > c7);
- assert (c7 > c8);
- assert (c8 > c9);
+ assert (&c5[0] > &c4[0]);
+ assert (&c4[0] > &c3[0]);
+ assert (&c3[0] > &c2[0]);
+ assert (&c2[0] > &c1[0]);
+ assert (&c1[0] > &c6[0]);
+ assert (&c6[0] > &c7[0]);
+ assert (&c7[0] > &c8[0]);
+ assert (&c8[0] > &c9[0]);
assert (&a1 < &a2);
assert (&a2 < &a3);
diff --git a/gold/testsuite/common_test_1_v1.c b/gold/testsuite/common_test_1_v1.c
index 99a530860e9..ea52286536c 100644
--- a/gold/testsuite/common_test_1_v1.c
+++ b/gold/testsuite/common_test_1_v1.c
@@ -57,14 +57,14 @@ int
main (int argc __attribute__ ((unused)), char** argv __attribute__ ((unused)))
{
/* These tests are deliberately incorrect. */
- assert (c5 < c4);
- assert (c4 < c3);
- assert (c3 < c2);
- assert (c2 < c1);
- assert (c1 < c6);
- assert (c6 < c7);
- assert (c7 < c8);
- assert (c8 < c9);
+ assert (&c5[0] < &c4[0]);
+ assert (&c4[0] < &c3[0]);
+ assert (&c3[0] < &c2[0]);
+ assert (&c2[0] < &c1[0]);
+ assert (&c1[0] < &c6[0]);
+ assert (&c6[0] < &c7[0]);
+ assert (&c7[0] < &c8[0]);
+ assert (&c8[0] < &c9[0]);
assert (&a1 > &a2);
assert (&a2 > &a3);
diff --git a/gold/testsuite/common_test_1_v2.c b/gold/testsuite/common_test_1_v2.c
index a049036a197..0b116270c71 100644
--- a/gold/testsuite/common_test_1_v2.c
+++ b/gold/testsuite/common_test_1_v2.c
@@ -55,14 +55,14 @@ main (int argc __attribute__ ((unused)), char** argv __attribute__ ((unused)))
{
// After an incremental update, all guarantees about ordering
// are null.
- assert (c5 != c4);
- assert (c4 != c3);
- assert (c3 != c2);
- assert (c2 != c1);
- assert (c1 != c6);
- assert (c6 != c7);
- assert (c7 != c8);
- assert (c8 != c9);
+ assert (&c5[0] != &c4[0]);
+ assert (&c4[0] != &c3[0]);
+ assert (&c3[0] != &c2[0]);
+ assert (&c2[0] != &c1[0]);
+ assert (&c1[0] != &c6[0]);
+ assert (&c6[0] != &c7[0]);
+ assert (&c7[0] != &c8[0]);
+ assert (&c8[0] != &c9[0]);
assert (&a1 != &a2);
assert (&a2 != &a3);
diff --git a/gold/testsuite/script_test_2.cc b/gold/testsuite/script_test_2.cc
index 9025e63fdbd..48b79d2c481 100644
--- a/gold/testsuite/script_test_2.cc
+++ b/gold/testsuite/script_test_2.cc
@@ -61,12 +61,12 @@ main(int, char**)
assert(end_data == start_data + 15);
// Check that FILL works as expected.
- assert(start_fill == end_data);
+ assert(&start_fill[0] == &end_data[0]);
assert(memcmp(start_fill, "\x12\x34\x56\x78\x12\x34\x56\0", 8) == 0);
assert(end_fill == start_fill + 8);
- assert(end_test_area == end_fill);
+ assert(&end_test_area[0] == &end_fill[0]);
- assert(test_addr == start_test_area_1);
- assert(test_addr_alias == test_addr);
+ assert(&test_addr[0] == &start_test_area_1[0]);
+ assert(&test_addr_alias[0] == &test_addr[0]);
}