Import libdrm 2.4.71

4 files changed, 4 insertions, 20 deletions

diff --git a/lib/libdrm/etnaviv/Makefile.am b/lib/libdrm/etnaviv/Makefile.am
index 648e3c5b3..be96ba868 100644
--- a/lib/libdrm/etnaviv/Makefile.am
+++ b/lib/libdrm/etnaviv/Makefile.am
@@ -2,7 +2,6 @@ include Makefile.sources
 
 AM_CFLAGS = \
 	$(WARN_CFLAGS) \
-	-fvisibility=hidden \
 	-I$(top_srcdir) \
 	$(PTHREADSTUBS_CFLAGS) \
 	-I$(top_srcdir)/include/drm
@@ -23,6 +22,5 @@ libdrm_etnavivinclude_HEADERS = $(LIBDRM_ETNAVIV_H_FILES)
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libdrm_etnaviv.pc
 
-AM_TESTS_ENVIRONMENT = NM='$(NM)'
 TESTS = etnaviv-symbol-check
 EXTRA_DIST = $(TESTS)
diff --git a/lib/libdrm/etnaviv/etnaviv-symbol-check b/lib/libdrm/etnaviv/etnaviv-symbol-check
index b3f3dda7f..77c94c6ed 100755
--- a/lib/libdrm/etnaviv/etnaviv-symbol-check
+++ b/lib/libdrm/etnaviv/etnaviv-symbol-check
@@ -1,6 +1,4 @@
-#!/bin/sh
-
-set -u
+#!/bin/bash
 
 # The following symbols (past the first five) are taken from the public headers.
 # A list of the latter should be available Makefile.sources/LIBDRM_ETNAVIV_H_FILES
@@ -13,18 +11,16 @@ _end
 _fini
 _init
 etna_device_new
-etna_device_new_dup
 etna_device_ref
 etna_device_del
-etna_device_fd
 etna_gpu_new
 etna_gpu_del
 etna_gpu_get_param
 etna_pipe_new
 etna_pipe_del
 etna_pipe_wait
-etna_pipe_wait_ns
 etna_bo_new
+etna_bo_from_handle
 etna_bo_from_name
 etna_bo_from_dmabuf
 etna_bo_ref
@@ -40,14 +36,8 @@ etna_cmd_stream_new
 etna_cmd_stream_del
 etna_cmd_stream_timestamp
 etna_cmd_stream_flush
-etna_cmd_stream_flush2
 etna_cmd_stream_finish
-etna_cmd_stream_perf
 etna_cmd_stream_reloc
-etna_perfmon_create
-etna_perfmon_del
-etna_perfmon_get_dom_by_name
-etna_perfmon_get_sig_by_name
 EOF
 done)
 
diff --git a/lib/libdrm/radeon/radeon-symbol-check b/lib/libdrm/radeon/radeon-symbol-check
index 7b69f9a48..0bf2ffcbe 100755
--- a/lib/libdrm/radeon/radeon-symbol-check
+++ b/lib/libdrm/radeon/radeon-symbol-check
@@ -1,11 +1,9 @@
-#!/bin/sh
-
-set -u
+#!/bin/bash
 
 # 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
+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
diff --git a/lib/libdrm/tests/etnaviv/Makefile.am b/lib/libdrm/tests/etnaviv/Makefile.am
index 3e0c6120c..06318643e 100644
--- a/lib/libdrm/tests/etnaviv/Makefile.am
+++ b/lib/libdrm/tests/etnaviv/Makefile.am
@@ -1,5 +1,4 @@
 AM_CFLAGS = \
-	-fvisibility=hidden \
 	-I $(top_srcdir)/include/drm \
 	-I $(top_srcdir)/etnaviv \
 	-I $(top_srcdir)
@@ -29,7 +28,6 @@ etnaviv_2d_test_SOURCES = \
 	write_bmp.h
 
 etnaviv_cmd_stream_test_LDADD = \
-	$(top_builddir)/libdrm.la \
 	$(top_builddir)/etnaviv/libdrm_etnaviv.la
 
 etnaviv_cmd_stream_test_SOURCES = \