From 0cfa21d55ec78eafc544d502e2e52ba4a196c4ae 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] omap: convert to new symbols check

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
 omap/meson.build       | 11 +++++++----
 omap/omap-symbol-check | 37 -------------------------------------
 omap/omap-symbols.txt  | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+), 41 deletions(-)
 delete mode 100755 omap/omap-symbol-check
 create mode 100644 omap/omap-symbols.txt

diff --git a/omap/meson.build b/omap/meson.build
index f3ea36db..53330b61 100644
--- a/omap/meson.build
+++ b/omap/meson.build
@@ -47,8 +47,11 @@ pkg.generate(
 )
 
 test(
-  'omap-symbol-check',
-  find_program('omap-symbol-check'),
-  env : env_test,
-  args : libdrm_omap,
+  'omap-symbols-check',
+  symbols_check,
+  args : [
+    '--lib', libdrm_omap,
+    '--symbols-file', files('omap-symbols.txt'),
+    '--nm', prog_nm.path(),
+  ],
 )
diff --git a/omap/omap-symbol-check b/omap/omap-symbol-check
deleted file mode 100755
index 21522ba0..00000000
--- a/omap/omap-symbol-check
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/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_omap*HEADERS
-
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_omap.so} | awk '{print $3}'| while read func; do
-( grep -q "^$func$" || echo $func )  <<EOF
-__bss_start
-_edata
-_end
-_fini
-_init
-omap_bo_cpu_fini
-omap_bo_cpu_prep
-omap_bo_del
-omap_bo_dmabuf
-omap_bo_from_dmabuf
-omap_bo_from_name
-omap_bo_get_name
-omap_bo_handle
-omap_bo_map
-omap_bo_new
-omap_bo_new_tiled
-omap_bo_ref
-omap_bo_size
-omap_device_del
-omap_device_new
-omap_device_ref
-omap_get_param
-omap_set_param
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"
diff --git a/omap/omap-symbols.txt b/omap/omap-symbols.txt
new file mode 100644
index 00000000..749d0f7c
--- /dev/null
+++ b/omap/omap-symbols.txt
@@ -0,0 +1,18 @@
+omap_bo_cpu_fini
+omap_bo_cpu_prep
+omap_bo_del
+omap_bo_dmabuf
+omap_bo_from_dmabuf
+omap_bo_from_name
+omap_bo_get_name
+omap_bo_handle
+omap_bo_map
+omap_bo_new
+omap_bo_new_tiled
+omap_bo_ref
+omap_bo_size
+omap_device_del
+omap_device_new
+omap_device_ref
+omap_get_param
+omap_set_param