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

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
 tegra/meson.build        | 11 +++++++----
 tegra/tegra-symbol-check | 35 -----------------------------------
 tegra/tegra-symbols.txt  | 13 +++++++++++++
 3 files changed, 20 insertions(+), 39 deletions(-)
 delete mode 100755 tegra/tegra-symbol-check
 create mode 100644 tegra/tegra-symbols.txt

diff --git a/tegra/meson.build b/tegra/meson.build
index ce56ddcf..88613b9c 100644
--- a/tegra/meson.build
+++ b/tegra/meson.build
@@ -46,8 +46,11 @@ pkg.generate(
 )
 
 test(
-  'tegra-symbol-check',
-  find_program('tegra-symbol-check'),
-  env : env_test,
-  args : libdrm_tegra,
+  'tegra-symbols-check',
+  symbols_check,
+  args : [
+    '--lib', libdrm_tegra,
+    '--symbols-file', files('tegra-symbols.txt'),
+    '--nm', prog_nm.path(),
+  ],
 )
diff --git a/tegra/tegra-symbol-check b/tegra/tegra-symbol-check
deleted file mode 100755
index a74d9749..00000000
--- a/tegra/tegra-symbol-check
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -u
-
-# The following symbols (past the first nine) are taken from tegra.h.
-
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_tegra.so} | awk '{print $3}'| while read func; do
-( grep -q "^$func$" || echo $func )  <<EOF
-__bss_end__
-__bss_start__
-__bss_start
-__end__
-_bss_end__
-_edata
-_end
-_fini
-_init
-drm_tegra_bo_get_flags
-drm_tegra_bo_get_handle
-drm_tegra_bo_get_tiling
-drm_tegra_bo_map
-drm_tegra_bo_new
-drm_tegra_bo_ref
-drm_tegra_bo_set_flags
-drm_tegra_bo_set_tiling
-drm_tegra_bo_unmap
-drm_tegra_bo_unref
-drm_tegra_bo_wrap
-drm_tegra_close
-drm_tegra_new
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"
diff --git a/tegra/tegra-symbols.txt b/tegra/tegra-symbols.txt
new file mode 100644
index 00000000..5e3e955f
--- /dev/null
+++ b/tegra/tegra-symbols.txt
@@ -0,0 +1,13 @@
+drm_tegra_bo_get_flags
+drm_tegra_bo_get_handle
+drm_tegra_bo_get_tiling
+drm_tegra_bo_map
+drm_tegra_bo_new
+drm_tegra_bo_ref
+drm_tegra_bo_set_flags
+drm_tegra_bo_set_tiling
+drm_tegra_bo_unmap
+drm_tegra_bo_unref
+drm_tegra_bo_wrap
+drm_tegra_close
+drm_tegra_new