amdgpu: convert to new symbols check

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>

diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbols.txt
old mode 100755 (executable)
new mode 100644 (file)
similarity index 80%
rename from amdgpu/amdgpu-symbol-check
rename to amdgpu/amdgpu-symbols.txt
index c508573..e3bafaa
--- 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 8168993..a1781f5 100644 (file)
--- 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(),
+  ],
 )