From fa48bba673b274cc08a77599123a8add77fbb8b8 Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Sun, 16 Aug 2020 01:54:49 +0200
Subject: [PATCH] Fix scope tests wrt binutils 2.35

The output of nm has changed to include ABI tags.
---
 src/test/scope/out0.log.match | 32 ++++++++++++++++----------------
 src/test/scope/out5.log.match | 30 +++++++++++++++---------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/test/scope/out0.log.match b/src/test/scope/out0.log.match
index 0bab485d2..a567a41f0 100644
--- a/src/test/scope/out0.log.match
+++ b/src/test/scope/out0.log.match
@@ -1,17 +1,17 @@
 $(*)
-vmem_aligned_alloc
-vmem_calloc
-vmem_check
-vmem_check_version
-vmem_create
-vmem_create_in_region
-vmem_delete
-vmem_errormsg
-vmem_free
-vmem_malloc
-vmem_malloc_usable_size
-vmem_realloc
-vmem_set_funcs
-vmem_stats_print
-vmem_strdup
-vmem_wcsdup
+vmem_aligned_alloc$(nW)
+vmem_calloc$(nW)
+vmem_check$(nW)
+vmem_check_version$(nW)
+vmem_create$(nW)
+vmem_create_in_region$(nW)
+vmem_delete$(nW)
+vmem_errormsg$(nW)
+vmem_free$(nW)
+vmem_malloc$(nW)
+vmem_malloc_usable_size$(nW)
+vmem_realloc$(nW)
+vmem_set_funcs$(nW)
+vmem_stats_print$(nW)
+vmem_strdup$(nW)
+vmem_wcsdup$(nW)
diff --git a/src/test/scope/out5.log.match b/src/test/scope/out5.log.match
index c1f11d08d..6c13be86b 100644
--- a/src/test/scope/out5.log.match
+++ b/src/test/scope/out5.log.match
@@ -1,16 +1,16 @@
 $(*)
-$(OPT)_malloc_postfork
-$(OPT)_malloc_prefork
-$(OPT)_malloc_thread_cleanup
-aligned_alloc
-calloc
-cfree
-free
-malloc
-malloc_usable_size
-memalign
-posix_memalign
-$(OPT)pthread_create
-pvalloc
-realloc
-valloc
+$(OPT)_malloc_postfork$(nW)
+$(OPT)_malloc_prefork$(nW)
+$(OPT)_malloc_thread_cleanup$(nW)
+aligned_alloc$(nW)
+calloc$(nW)
+cfree$(nW)
+free$(nW)
+malloc$(nW)
+malloc_usable_size$(nW)
+memalign$(nW)
+posix_memalign$(nW)
+$(OPT)pthread_create$(nW)
+pvalloc$(nW)
+realloc$(nW)
+valloc$(nW)
-- 
2.28.0