diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-10-23 23:32:54 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2019-11-11 22:57:14 +0000 |
| commit | 574778100e5a3320216120512b8adbf1ea76fd8a (patch) | |
| tree | 9546a4c531ab92e199386fccfec02912b9d2979d /nouveau | |
| parent | 35fa20f1fd477b600c756dbeee1008c6a929a368 (diff) | |
nouveau: convert to new symbols check
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to 'nouveau')
| -rw-r--r-- | nouveau/meson.build | 11 | ||||
| -rw-r--r--[-rwxr-xr-x] | nouveau/nouveau-symbols.txt (renamed from nouveau/nouveau-symbol-check) | 19 |
2 files changed, 7 insertions, 23 deletions
diff --git a/nouveau/meson.build b/nouveau/meson.build index 56e952ca..9bd58fca 100644 --- a/nouveau/meson.build +++ b/nouveau/meson.build @@ -52,8 +52,11 @@ pkg.generate( ) test( - 'nouveau-symbol-check', - find_program('nouveau-symbol-check'), - env : env_test, - args : libdrm_nouveau, + 'nouveau-symbols-check', + symbols_check, + args : [ + '--lib', libdrm_nouveau, + '--symbols-file', files('nouveau-symbols.txt'), + '--nm', prog_nm.path(), + ], ) diff --git a/nouveau/nouveau-symbol-check b/nouveau/nouveau-symbols.txt index 36703a3e..ef8032f2 100755..100644 --- a/nouveau/nouveau-symbol-check +++ b/nouveau/nouveau-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_NOUVEAU_H_FILES - -FUNCS=$($NM -D --format=bsd --defined-only ${1-.libs/libdrm_nouveau.so} | awk '{print $3}'| while read func; do -( grep -q "^$func$" || echo $func ) <<EOF -__bss_start -_edata -_end -_fini -_init nouveau_bo_map nouveau_bo_name_get nouveau_bo_name_ref @@ -53,8 +39,3 @@ nouveau_pushbuf_reloc nouveau_pushbuf_space nouveau_pushbuf_validate nouveau_setparam -EOF -done) - -test ! -n "$FUNCS" || echo $FUNCS -test ! -n "$FUNCS" |