util: move u_cpu_detect to util

CC: vlee@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@vmware.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 72cf2ec..b60b25a 100644 (file)
--- 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 1b5eb4d..e149799 100644 (file)
--- 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 af2ad85..b4d2394 100644 (file)
--- 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 3b84f41..7caea27 100644 (file)
--- 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