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

Commit 77f27f1d authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Cleanup x86 and x86_64 flags"

parents bd10e2c0 f0a48555

core/combo/TARGET_linux-x86.mk

+0 −21
Original line number Diff line number Diff line
@@ -138,15 +138,7 @@ android_config_h := $(call select-android-config-h,target_linux-x86) 
TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))

TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)



# XXX: Not sure this is still needed. Must check with our toolchains.

TARGET_GLOBAL_CPPFLAGS += \

			-fno-use-cxa-atexit



TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags)

TARGET_GLOBAL_CFLAGS += -mmmx

TARGET_GLOBAL_CFLAGS += -msse

TARGET_GLOBAL_CFLAGS += -DUSE_SSE2 -msse2

TARGET_GLOBAL_CFLAGS += -msse3



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

    TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3
@@ -167,19 +159,6 @@ ifeq ($(ARCH_X86_HAVE_AES_NI),true) 
    TARGET_GLOBAL_CFLAGS += -maes

endif



# XXX: This flag is probably redundant. I believe our toolchain always sets

# it by default. Consider for removal.

#

TARGET_GLOBAL_CFLAGS += -mbionic



# XXX: This flag is probably redundant. The macro should be defined by our

# toolchain binaries automatically (as a compiler built-in).

# Check with: $BINPREFIX-gcc -dM -E < /dev/null

#

# Consider for removal.

#

TARGET_GLOBAL_CFLAGS += -D__ANDROID__



TARGET_GLOBAL_LDFLAGS += -m32



TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack

core/combo/TARGET_linux-x86_64.mk

+1 −20
Original line number Diff line number Diff line
@@ -138,13 +138,7 @@ android_config_h := $(call select-android-config-h,target_linux-x86) 
TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))

TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)



# XXX: Not sure this is still needed. Must check with our toolchains.

TARGET_GLOBAL_CPPFLAGS += \

			-fno-use-cxa-atexit



TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags) \

			-mstackrealign \

			-mfpmath=sse

TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags)



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

    TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3
@@ -165,19 +159,6 @@ ifeq ($(ARCH_X86_HAVE_AES_NI),true) 
    TARGET_GLOBAL_CFLAGS += -maes

endif



# XXX: This flag is probably redundant. I believe our toolchain always sets

# it by default. Consider for removal.

#

TARGET_GLOBAL_CFLAGS += -mbionic



# XXX: This flag is probably redundant. The macro should be defined by our

# toolchain binaries automatically (as a compiler built-in).

# Check with: $BINPREFIX-gcc -dM -E < /dev/null

#

# Consider for removal.

#

TARGET_GLOBAL_CFLAGS += -D__ANDROID__



TARGET_GLOBAL_LDFLAGS += -m64



TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack

core/llvm_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ ifeq ($(TARGET_ARCH),x86) 
  RS_TRIPLE := i686-unknown-linux

  CLANG_CONFIG_EXTRA_ASFLAGS += \

    -target i686-linux-android \

    -msse3 \

    -nostdlibinc \

    -B$(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin

  CLANG_CONFIG_EXTRA_CFLAGS += $(CLANG_CONFIG_EXTRA_ASFLAGS)