summaryrefslogtreecommitdiff
path: root/amdgpu
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2019-10-23 23:32:54 +0100
committerEric Engestrom <eric@engestrom.ch>2019-11-11 22:57:14 +0000
commit791297e94d8863ebca351090fe6c83e09e4f4fe4 (patch)
treea7aa88641a2660ad93b363c971fe8bd07b6ebbc1 /amdgpu
parent303cf6bbf3522cfba19a5950198183b75d195beb (diff)
downloaddrm-791297e94d8863ebca351090fe6c83e09e4f4fe4.tar.gz
amdgpu: convert to new symbols check
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to 'amdgpu')
-rw-r--r--[-rwxr-xr-x]amdgpu/amdgpu-symbols.txt (renamed from amdgpu/amdgpu-symbol-check)19
-rw-r--r--amdgpu/meson.build11
2 files changed, 7 insertions, 23 deletions
diff --git a/amdgpu/amdgpu-symbol-check b/amdgpu/amdgpu-symbols.txt
index c5085731..e3bafaab 100755..100644
--- 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(),
+ ],
)