From: Eric Engestrom <eric.engestrom@intel.com>
Date: Wed, 23 Oct 2019 22:32:54 +0000 (+0100)
Subject: radeon: convert to new symbols check
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=451e0543280c6cfcea4d9a53cb018999fe94de9c;p=android-x86%2Fexternal-libdrm.git

radeon: convert to new symbols check

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/radeon/meson.build b/radeon/meson.build
index 662b5bce..ca128329 100644
--- a/radeon/meson.build
+++ b/radeon/meson.build
@@ -57,8 +57,11 @@ pkg.generate(
 )
 
 test(
-  'radeon-symbol-check',
-  find_program('radeon-symbol-check'),
-  env : env_test,
-  args : libdrm_radeon,
+  'radeon-symbols-check',
+  symbols_check,
+  args : [
+    '--lib', libdrm_radeon,
+    '--symbols-file', files('radeon-symbols.txt'),
+    '--nm', prog_nm.path(),
+  ],
 )
diff --git a/radeon/radeon-symbol-check b/radeon/radeon-symbols.txt
old mode 100755
new mode 100644
similarity index 68%
rename from radeon/radeon-symbol-check
rename to radeon/radeon-symbols.txt
index 7b69f9a4..5a532d83
--- a/radeon/radeon-symbol-check
+++ b/radeon/radeon-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_RADEON_H_FILES
-
-FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_radeon.so} | awk '{print $3}'| while read func; do
-( grep -q "^$func$" || echo $func )  <<EOF
-__bss_start
-_edata
-_end
-_fini
-_init
 radeon_bo_debug
 radeon_bo_get_handle
 radeon_bo_get_src_domain
@@ -56,8 +42,3 @@ radeon_surface_best
 radeon_surface_init
 radeon_surface_manager_free
 radeon_surface_manager_new
-EOF
-done)
-
-test ! -n "$FUNCS" || echo $FUNCS
-test ! -n "$FUNCS"