From 6c819350af20df1c4a0182934036faf8ad4c8b9e Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@intel.com>
Date: Wed, 23 Oct 2019 23:32:54 +0100
Subject: [PATCH] freedreno: convert to new symbols check

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
 ...eno-symbol-check => freedreno-symbols.txt} | 19 -------------------
 freedreno/meson.build                         | 11 +++++++----
 2 files changed, 7 insertions(+), 23 deletions(-)
 rename freedreno/{freedreno-symbol-check => freedreno-symbols.txt} (63%)
 mode change 100755 => 100644

diff --git a/freedreno/freedreno-symbol-check b/freedreno/freedreno-symbols.txt
old mode 100755
new mode 100644
similarity index 63%
rename from freedreno/freedreno-symbol-check
rename to freedreno/freedreno-symbols.txt
index 18eb8bdc..471ca997
--- a/freedreno/freedreno-symbol-check
+++ b/freedreno/freedreno-symbols.txt
@@ -1,17 +1,3 @@
-#!/bin/sh
-
-set -u
-
-# The following symbols (past the first five) are taken from the public headers.
-# A list of the latter should be available Makefile.sources/LIBDRM_FREEDRENO_H_FILES
-
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_freedreno.so} | awk '{print $3}'| while read func; do
-( grep -q "^$func$" || echo $func )  <<EOF
-__bss_start
-_edata
-_end
-_fini
-_init
 fd_bo_cpu_fini
 fd_bo_cpu_prep
 fd_bo_del
@@ -57,8 +43,3 @@ fd_ringbuffer_set_parent
 fd_ringbuffer_size
 fd_ringbuffer_timestamp
 fd_ringbuffer_flush2
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"
diff --git a/freedreno/meson.build b/freedreno/meson.build
index 5d8d8e9b..63b84fc9 100644
--- a/freedreno/meson.build
+++ b/freedreno/meson.build
@@ -70,8 +70,11 @@ pkg.generate(
 )
 
 test(
-  'freedreno-symbol-check',
-  find_program('freedreno-symbol-check'),
-  env : env_test,
-  args : libdrm_freedreno,
+  'freedreno-symbols-check',
+  symbols_check,
+  args : [
+    '--lib', libdrm_freedreno,
+    '--symbols-file', files('freedreno-symbols.txt'),
+    '--nm', prog_nm.path(),
+  ],
 )