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

Commit ea852f6e authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags." 

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f6b670b7':
  Remove more always-true ARCH_ARM_HAVE_ flags.
parents d0fb6930 f6b670b7

core/combo/TARGET_linux-arm.mk

+1 −16
Original line number Diff line number Diff line
@@ -77,18 +77,11 @@ TARGET_arm_CFLAGS := -O2 \ 
                        -fstrict-aliasing    \

                        -funswitch-loops



# Modules can choose to compile some source as thumb. As

# non-thumb enabled targets are supported, this is treated

# as a 'hint'. If thumb is not enabled, these files are just

# compiled as ARM.

ifeq ($(ARCH_ARM_HAVE_THUMB_SUPPORT),true)

# Modules can choose to compile some source as thumb.

TARGET_thumb_CFLAGS :=  -mthumb \

                        -Os \

                        -fomit-frame-pointer \

                        -fno-strict-aliasing

else

TARGET_thumb_CFLAGS := $(TARGET_arm_CFLAGS)

endif



# Set FORCE_ARM_DEBUGGING to "true" in your buildspec.mk

# or in your environment to force a full arm build, even for
@@ -147,15 +140,7 @@ TARGET_GLOBAL_LDFLAGS += \ 
			-Wl,--icf=safe \

			$(arch_variant_ldflags)



# We only need thumb interworking in cases where thumb support

# is available in the architecture, and just to be sure, (and

# since sometimes thumb-interwork appears to be default), we

# specifically disable when thumb support is unavailable.

ifeq ($(ARCH_ARM_HAVE_THUMB_SUPPORT),true)

TARGET_GLOBAL_CFLAGS += -mthumb-interwork

else

TARGET_GLOBAL_CFLAGS += -mno-thumb-interwork

endif



TARGET_GLOBAL_CPPFLAGS += -fvisibility-inlines-hidden

core/combo/arch/arm/armv5te.mk

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

# Generating binaries for the ARMv5TE architecture and higher

#

ARCH_ARM_HAVE_THUMB_SUPPORT     := true

ARCH_ARM_HAVE_FAST_INTERWORKING := true

ARCH_ARM_HAVE_64BIT_DATA        := true

ARCH_ARM_HAVE_HALFWORD_MULTIPLY := true



# Note: Hard coding the 'tune' value here is probably not ideal,

# and a better solution should be found in the future.

core/combo/arch/arm/armv7-a-neon.mk

+0 −5
Original line number Diff line number Diff line 
# Configuration for Linux on ARM.

# Generating binaries for the ARMv7-a architecture and higher with NEON

#

ARCH_ARM_HAVE_THUMB_SUPPORT     := true

ARCH_ARM_HAVE_FAST_INTERWORKING := true

ARCH_ARM_HAVE_64BIT_DATA        := true

ARCH_ARM_HAVE_HALFWORD_MULTIPLY := true

ARCH_ARM_HAVE_ARMV7A            := true

ARCH_ARM_HAVE_TLS_REGISTER      := true

ARCH_ARM_HAVE_VFP               := true

ARCH_ARM_HAVE_VFP_D32           := true

ARCH_ARM_HAVE_NEON              := true

core/combo/arch/arm/armv7-a.mk

+0 −5
Original line number Diff line number Diff line 
# Configuration for Linux on ARM.

# Generating binaries for the ARMv7-a architecture and higher

#

ARCH_ARM_HAVE_THUMB_SUPPORT     := true

ARCH_ARM_HAVE_FAST_INTERWORKING := true

ARCH_ARM_HAVE_64BIT_DATA        := true

ARCH_ARM_HAVE_HALFWORD_MULTIPLY := true

ARCH_ARM_HAVE_ARMV7A            := true

ARCH_ARM_HAVE_TLS_REGISTER      := true

ARCH_ARM_HAVE_VFP               := true



# Note: Hard coding the 'tune' value here is probably not ideal,

target/board/generic/BoardConfig.mk

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ TARGET_ARCH := arm 
TARGET_ARCH_VARIANT := armv7-a

TARGET_CPU_ABI := armeabi-v7a

TARGET_CPU_ABI2 := armeabi

ARCH_ARM_HAVE_TLS_REGISTER := true



HAVE_HTC_AUDIO_DRIVER := true

BOARD_USES_GENERIC_AUDIO := true