From 1386b99027bd6af26a6149f32dc6f2e2c1476f1a 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] intel: convert to new symbols check

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---
 .../{intel-symbol-check => intel-symbols.txt} | 19 -------------------
 intel/meson.build                             | 12 ++++++++----
 2 files changed, 8 insertions(+), 23 deletions(-)
 rename intel/{intel-symbol-check => intel-symbols.txt} (84%)
 mode change 100755 => 100644

diff --git a/intel/intel-symbol-check b/intel/intel-symbols.txt
old mode 100755
new mode 100644
similarity index 84%
rename from intel/intel-symbol-check
rename to intel/intel-symbols.txt
index 2f355321..132df96a
--- a/intel/intel-symbol-check
+++ b/intel/intel-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_INTEL_H_FILES
-
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_intel.so} | awk '{print $3}' | while read func; do
-( grep -q "^$func$" || echo $func )  <<EOF
-__bss_start
-_edata
-_end
-_fini
-_init
 drm_intel_bo_alloc
 drm_intel_bo_alloc_for_render
 drm_intel_bo_alloc_tiled
@@ -95,8 +81,3 @@ drm_intel_get_pooled_eu
 drm_intel_get_reset_stats
 drm_intel_get_subslice_total
 drm_intel_reg_read
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"
diff --git a/intel/meson.build b/intel/meson.build
index 355bf35d..4d3f1ebd 100644
--- a/intel/meson.build
+++ b/intel/meson.build
@@ -92,9 +92,13 @@ test(
   find_program('tests/gen7-2d-copy.batch.sh'),
   workdir : meson.current_build_dir(),
 )
+
 test(
-  'intel-symbol-check',
-  find_program('intel-symbol-check'),
-  env : env_test,
-  args : libdrm_intel,
+  'intel-symbols-check',
+  symbols_check,
+  args : [
+    '--lib', libdrm_intel,
+    '--symbols-file', files('intel-symbols.txt'),
+    '--nm', prog_nm.path(),
+  ],
 )