Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1303aa28 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Remove useless x86 options that were always hardcoded on."

parents 9a788285 d3f00c16

core/combo/TARGET_linux-x86.mk

+4 −30
Original line number Diff line number Diff line
@@ -143,19 +143,11 @@ TARGET_GLOBAL_CPPFLAGS += \ 
			-fno-use-cxa-atexit



TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags)



ifeq ($(ARCH_X86_HAVE_MMX),true)

    TARGET_GLOBAL_CFLAGS += -DUSE_MMX -mmmx

endif

ifeq ($(ARCH_X86_HAVE_SSE),true)

    TARGET_GLOBAL_CFLAGS += -DUSE_SSE -msse

endif

ifeq ($(ARCH_X86_HAVE_SSE2),true)

TARGET_GLOBAL_CFLAGS += -mmmx

TARGET_GLOBAL_CFLAGS += -msse

TARGET_GLOBAL_CFLAGS += -DUSE_SSE2 -msse2

endif

ifeq ($(ARCH_X86_HAVE_SSE3),true)

    TARGET_GLOBAL_CFLAGS += -DUSE_SSE3 -msse3

endif

TARGET_GLOBAL_CFLAGS += -msse3



ifeq ($(ARCH_X86_HAVE_SSSE3),true)   # yes, really SSSE3, not SSE3!

    TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3

endif
@@ -285,21 +277,3 @@ $(hide) $(PRIVATE_CXX) \ 
	-Wl,--end-group \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef
 


# Special check for x86 NDK ABI compatibility.

# The TARGET_CPU_ABI variable should be defined in BoardConfig.mk to 'x86'

# *only* if the platform image is compatible with the NDK x86 ABI.

#

# We perform a small check here to ensure that nothing bad can happen.

#

ifeq ($(TARGET_CPU_ABI),x86)

  ifneq (true-true-true-true,$(ARCH_X86_HAVE_MMX)-$(ARCH_X86_HAVE_SSE)-$(ARCH_X86_HAVE_SSE2)-$(ARCH_X86_HAVE_SSE3))

    $(info ERROR: Your x86 platform image is not compatible with the NDK x86 ABI)

    $(info As such, you should *not* define TARGET_CPU_ABI to 'x86' in your BoardConfig.mk)

    $(info to ensure that your device will not be mistakenly listed as compatible by

    $(info the Android Market. Also, it is likely that the image will fail the CTS tests)

    $(info Please undefine TARGET_CPU_ABI in your BoardConfig.mk, or select the value 'none')

    $(info The corresponding image will still be able to run Dalvik-based Android applications)

    $(error Aborting build! Please fix your BoardConfig.mk)

  endif

endif

core/combo/TARGET_linux-x86_64.mk

+0 −5
Original line number Diff line number Diff line
@@ -146,11 +146,6 @@ TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags) \ 
			-mstackrealign \

			-mfpmath=sse



ARCH_X86_HAVE_MMX  := true

ARCH_X86_HAVE_SSE  := true

ARCH_X86_HAVE_SSE2 := true

ARCH_X86_HAVE_SSE3 := true



ifeq ($(ARCH_X86_HAVE_SSSE3),true)   # yes, really SSSE3, not SSE3!

    TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3

endif

core/combo/arch/x86/haswell.mk

+0 −4
Original line number Diff line number Diff line 
# Configuration for Linux on x86.

# Generating binaries for Haswell processors.

#

ARCH_X86_HAVE_MMX    := true

ARCH_X86_HAVE_SSE    := true

ARCH_X86_HAVE_SSE2   := true

ARCH_X86_HAVE_SSE3   := true

ARCH_X86_HAVE_SSSE3  := true

ARCH_X86_HAVE_SSE4   := true

ARCH_X86_HAVE_SSE4_1 := true

core/combo/arch/x86/ivybridge.mk

+0 −4
Original line number Diff line number Diff line 
# Configuration for Linux on x86.

# Generating binaries for Ivy Bridge processors.

#

ARCH_X86_HAVE_MMX    := true

ARCH_X86_HAVE_SSE    := true

ARCH_X86_HAVE_SSE2   := true

ARCH_X86_HAVE_SSE3   := true

ARCH_X86_HAVE_SSSE3  := true

ARCH_X86_HAVE_SSE4   := true

ARCH_X86_HAVE_SSE4_1 := true

core/combo/arch/x86/sandybridge.mk

+0 −4
Original line number Diff line number Diff line 
# Configuration for Linux on x86.

# Generating binaries for SandyBridge processors.

#

ARCH_X86_HAVE_MMX    := true

ARCH_X86_HAVE_SSE    := true

ARCH_X86_HAVE_SSE2   := true

ARCH_X86_HAVE_SSE3   := true

ARCH_X86_HAVE_SSSE3  := true

ARCH_X86_HAVE_SSE4_1 := true

ARCH_X86_HAVE_SSE4_2 := true