summaryrefslogtreecommitdiff
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
commitff832d734b91e4a9f400102d4383d16d5f0b8c46 (patch)
treec2761a12c1273b7c952ea1e16d4845a3b140eb46
parent791297e94d8863ebca351090fe6c83e09e4f4fe4 (diff)
downloadlibdrm-ff832d734b91e4a9f400102d4383d16d5f0b8c46.tar.gz
libdrm-ff832d734b91e4a9f400102d4383d16d5f0b8c46.tar.bz2
libdrm-ff832d734b91e4a9f400102d4383d16d5f0b8c46.zip
etnaviv: convert to new symbols check
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
-rw-r--r--[-rwxr-xr-x]etnaviv/etnaviv-symbols.txt (renamed from etnaviv/etnaviv-symbol-check)19
-rw-r--r--etnaviv/meson.build11
2 files changed, 7 insertions, 23 deletions
diff --git a/etnaviv/etnaviv-symbol-check b/etnaviv/etnaviv-symbols.txt
index b3f3dda7..f48cecea 100755..100644
--- a/etnaviv/etnaviv-symbol-check
+++ b/etnaviv/etnaviv-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_ETNAVIV_H_FILES
-
-FUNCS=$(nm -D --format=bsd --defined-only ${1-.libs/libdrm_etnaviv.so} | awk '{print $3}'| while read func; do
-( grep -q "^$func$" || echo $func ) <<EOF
-__bss_start
-_edata
-_end
-_fini
-_init
etna_device_new
etna_device_new_dup
etna_device_ref
@@ -48,8 +34,3 @@ etna_perfmon_create
etna_perfmon_del
etna_perfmon_get_dom_by_name
etna_perfmon_get_sig_by_name
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"
diff --git a/etnaviv/meson.build b/etnaviv/meson.build
index 1ecf2940..6040cf63 100644
--- a/etnaviv/meson.build
+++ b/etnaviv/meson.build
@@ -53,8 +53,11 @@ ext_libdrm_etnaviv = declare_dependency(
)
test(
- 'etnaviv-symbol-check',
- find_program('etnaviv-symbol-check'),
- env : env_test,
- args : libdrm_etnaviv,
+ 'etnaviv-symbols-check',
+ symbols_check,
+ args : [
+ '--lib', libdrm_etnaviv,
+ '--symbols-file', files('etnaviv-symbols.txt'),
+ '--nm', prog_nm.path(),
+ ],
)