[Mesa-dev] [PATCH 11/11] util: move u_cpu_detect to util

[Dylan Baker]

CC: vlee at freedesktop.org
CC: Roland Scheidegger <sroland at vmware.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107870
Fixes: 80825abb5d1a7491035880253ffd531c55acae6b
       ("move u_math to src/util")
---

Roland, you noticed that the previous attempt to fix this issue broke windows.
I've run scons with mingw cross compilation on Linux, but if you could test that
this doesn't break the build on windows I'd appreciate it.

 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(-)
 rename src/{gallium/auxiliary => }/util/u_cpu_detect.c (100%)
 rename src/{gallium/auxiliary => }/util/u_cpu_detect.h (100%)

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 72cf2ec6443..b60b25a0e4c 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 1b5eb4d155d..e1497992b17 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 af2ad85da19..b4d23947ab7 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 3b84f411112..7caea27d660 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
-- 
2.19.1