Mesa (master): util: move u_cpu_detect to util

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: fb02bd3d1cbfdacabc6403f2da7b5d0a9aa527e6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb02bd3d1cbfdacabc6403f2da7b5d0a9aa527e6

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Mon Oct  1 11:59:21 2018 -0700

util: move u_cpu_detect to util

CC: vlee at freedesktop.org
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107870
Fixes: 80825abb5d1a7491035880253ffd531c55acae6b
       ("move u_math to src/util")
Tested-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/auxiliary/Makefile.sources          | 2 --
 src/gallium/auxiliary/meson.build               | 2 --
 src/util/Makefile.sources                       | 2 ++
 src/util/meson.build                            | 2 ++
 src/{gallium/auxiliary => }/util/u_cpu_detect.c | 0
 src/{gallium/auxiliary => }/util/u_cpu_detect.h | 0
 6 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 72cf2ec644..b60b25a0e4 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -222,8 +222,6 @@ C_SOURCES := \
 	util/u_box.h \
 	util/u_cache.c \
 	util/u_cache.h \
-	util/u_cpu_detect.c \
-	util/u_cpu_detect.h \
 	util/u_debug_gallium.h \
 	util/u_debug_gallium.c \
 	util/u_debug_describe.c \
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index 1b5eb4d155..e1497992b1 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -242,8 +242,6 @@ files_libgallium = files(
   'util/u_box.h',
   'util/u_cache.c',
   'util/u_cache.h',
-  'util/u_cpu_detect.c',
-  'util/u_cpu_detect.h',
   'util/u_debug_gallium.h',
   'util/u_debug_gallium.c',
   'util/u_debug_describe.c',
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index af2ad85da1..b4d23947ab 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -70,6 +70,8 @@ MESA_UTIL_FILES := \
 	u_vector.h \
 	u_debug.c \
 	u_debug.h \
+	u_cpu_detect.c \
+	u_cpu_detect.h \
 	vma.c \
 	vma.h
 
diff --git a/src/util/meson.build b/src/util/meson.build
index 3b84f41111..7caea27d66 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -94,6 +94,8 @@ files_mesa_util = files(
   'u_math.h',
   'u_debug.c',
   'u_debug.h',
+  'u_cpu_detect.c',
+  'u_cpu_detect.h',
   'vma.c',
   'vma.h',
 )
diff --git a/src/gallium/auxiliary/util/u_cpu_detect.c b/src/util/u_cpu_detect.c
similarity index 100%
rename from src/gallium/auxiliary/util/u_cpu_detect.c
rename to src/util/u_cpu_detect.c
diff --git a/src/gallium/auxiliary/util/u_cpu_detect.h b/src/util/u_cpu_detect.h
similarity index 100%
rename from src/gallium/auxiliary/util/u_cpu_detect.h
rename to src/util/u_cpu_detect.h