From 791297e94d8863ebca351090fe6c83e09e4f4fe4 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] amdgpu: convert to new symbols check

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

diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbols.txt
old mode 100755
new mode 100644
similarity index 80%
rename from amdgpu/amdgpu-symbol-check
rename to amdgpu/amdgpu-symbols.txt
index c5085731..e3bafaab
--- a/amdgpu/amdgpu-symbol-check
+++ b/amdgpu/amdgpu-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.am/libdrm_amdgpuinclude_HEADERS
-
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_amdgpu.so} | awk '{print $3}' | while read func; do
-( grep -q "^$func$" || echo $func )  <<EOF
-__bss_start
-_edata
-_end
-_fini
-_init
 amdgpu_bo_alloc
 amdgpu_bo_cpu_map
 amdgpu_bo_cpu_unmap
@@ -86,8 +72,3 @@ amdgpu_va_range_free
 amdgpu_va_range_query
 amdgpu_vm_reserve_vmid
 amdgpu_vm_unreserve_vmid
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"
diff --git a/amdgpu/meson.build b/amdgpu/meson.build
index 8168993a..a1781f59 100644
--- a/amdgpu/meson.build
+++ b/amdgpu/meson.build
@@ -58,8 +58,11 @@ ext_libdrm_amdgpu = declare_dependency(
 )
 
 test(
-  'amdgpu-symbol-check',
-  find_program('amdgpu-symbol-check'),
-  env : env_test,
-  args : libdrm_amdgpu,
+  'amdgpu-symbols-check',
+  symbols_check,
+  args : [
+    '--lib', libdrm_amdgpu,
+    '--symbols-file', files('amdgpu-symbols.txt'),
+    '--nm', prog_nm.path(),
+  ],
 )
-- 
2.11.0