Android: fix x86 gallium builds
Builds with gallium enabled fail on x86 with linker error: external/mesa3d/src/mesa/vbo/vbo_exec_array.c:127: error: undefined reference to '_mesa_uint_array_min_max' The problem is sse_minmax.c is not included in the libmesa_st_mesa library. Since the SSE4.1 files are needed for both libmesa_st_mesa and libmesa_dricore, move SSE4.1 files into a separate static library that can be used by both. Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
cdf7c6b83d
commit
2d9e0f24e1
|
@ -48,9 +48,8 @@ endif # x86
|
|||
endif # MESA_ENABLE_ASM
|
||||
|
||||
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
|
||||
LOCAL_SRC_FILES += \
|
||||
main/streaming-load-memcpy.c \
|
||||
main/sse_minmax.c
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
||||
libmesa_sse41
|
||||
LOCAL_CFLAGS := \
|
||||
-msse4.1 \
|
||||
-DUSE_SSE41
|
||||
|
@ -63,7 +62,7 @@ LOCAL_C_INCLUDES := \
|
|||
$(MESA_TOP)/src/gallium/include \
|
||||
$(MESA_TOP)/src/gallium/auxiliary
|
||||
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += \
|
||||
libmesa_program
|
||||
|
||||
include $(LOCAL_PATH)/Android.gen.mk
|
||||
|
|
|
@ -0,0 +1,44 @@
|
|||
# Copyright 2012 Intel Corporation
|
||||
# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com>
|
||||
# Copyright (C) 2010-2011 LunarG Inc.
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||
# copy of this software and associated documentation files (the "Software"),
|
||||
# to deal in the Software without restriction, including without limitation
|
||||
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
# and/or sell copies of the Software, and to permit persons to whom the
|
||||
# Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included
|
||||
# in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
# DEALINGS IN THE SOFTWARE.
|
||||
|
||||
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
include $(LOCAL_PATH)/Makefile.sources
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := libmesa_sse41
|
||||
|
||||
LOCAL_SRC_FILES += \
|
||||
$(X86_SSE41_FILES)
|
||||
|
||||
LOCAL_C_INCLUDES := \
|
||||
$(MESA_TOP)/src/mapi \
|
||||
$(MESA_TOP)/src/gallium/include \
|
||||
$(MESA_TOP)/src/gallium/auxiliary
|
||||
|
||||
include $(MESA_COMMON_MK)
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
||||
endif
|
|
@ -47,6 +47,8 @@ endif # x86
|
|||
endif # MESA_ENABLE_ASM
|
||||
|
||||
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
||||
libmesa_sse41
|
||||
LOCAL_CFLAGS := \
|
||||
-DUSE_SSE41
|
||||
endif
|
||||
|
@ -58,7 +60,7 @@ LOCAL_C_INCLUDES := \
|
|||
$(MESA_TOP)/src/gallium/auxiliary \
|
||||
$(MESA_TOP)/src/gallium/include
|
||||
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := \
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += \
|
||||
libmesa_program
|
||||
|
||||
include $(LOCAL_PATH)/Android.gen.mk
|
||||
|
|
|
@ -24,5 +24,6 @@ include $(LOCAL_PATH)/Android.mesa_gen_matypes.mk
|
|||
include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk
|
||||
include $(LOCAL_PATH)/Android.libmesa_dricore.mk
|
||||
include $(LOCAL_PATH)/Android.libmesa_st_mesa.mk
|
||||
include $(LOCAL_PATH)/Android.libmesa_sse41.mk
|
||||
|
||||
include $(LOCAL_PATH)/program/Android.mk
|
||||
|
|
|
@ -587,6 +587,10 @@ X86_64_FILES = \
|
|||
x86-64/x86-64.h \
|
||||
x86-64/xform4.S
|
||||
|
||||
X86_SSE41_FILES = \
|
||||
main/streaming-load-memcpy.c \
|
||||
main/sse_minmax.c
|
||||
|
||||
SPARC_FILES = \
|
||||
sparc/sparc.h \
|
||||
sparc/sparc_clip.S \
|
||||
|
|
Loading…
Reference in New Issue