StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bce52ca5: Merge "Remove arm64 clang build warning"

Browse Source 
* commit 'bce52ca5fae5d0062e7622d758a3619f2279c666':
  Remove arm64 clang build warning
This commit is contained in:
Ying Wang
2014-03-18 16:03:24 -07:00
committed by Android Git Automerger
parent 023c286563 bce52ca5fa
commit 87a25ea72f
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/clang/TARGET_arm64.mk
View File

@@ -50,5 +50,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \
$(call convert-to-clang-flags,$(TARGET_GLOBAL_LDFLAGS)) \ $(call convert-to-clang-flags,$(TARGET_GLOBAL_LDFLAGS)) \
$(CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS) $(CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS)
$(warning Incorrect arm64 RS_TRIPLE, fix me!)
RS_TRIPLE := aarch64-linux-android RS_TRIPLE := aarch64-linux-android

10
core/clang/arm64.mk
View File

@@ -1,7 +1,5 @@
# Clang flags for arm64 arch, target or host. # Clang flags for arm64 arch, target or host.
$(warning Untested arm64 clang flags, fix me!)
CLANG_CONFIG_arm64_EXTRA_ASFLAGS := CLANG_CONFIG_arm64_EXTRA_ASFLAGS :=
CLANG_CONFIG_arm64_EXTRA_CFLAGS := \ CLANG_CONFIG_arm64_EXTRA_CFLAGS := \
@@ -12,18 +10,14 @@ CLANG_CONFIG_arm64_EXTRA_LDFLAGS :=
# Include common unknown flags # Include common unknown flags
CLANG_CONFIG_arm64_UNKNOWN_CFLAGS := \ CLANG_CONFIG_arm64_UNKNOWN_CFLAGS := \
$(CLANG_CONFIG_UNKNOWN_CFLAGS) \ $(CLANG_CONFIG_UNKNOWN_CFLAGS) \
-mthumb-interwork \
-fgcse-after-reload \ -fgcse-after-reload \
-frerun-cse-after-loop \ -frerun-cse-after-loop \
-frename-registers \ -frename-registers \
-fno-builtin-sin \
-fno-strict-volatile-bitfields \ -fno-strict-volatile-bitfields \
-fno-align-jumps \ -fno-align-jumps \
-Wa,--noexecstack -Wa,--noexecstack
# We don't have any arm64 flags to substitute yet.
define subst-clang-incompatible-arm64-flags define subst-clang-incompatible-arm64-flags
$(subst -march=armv5te,-march=armv5t,\ $(1)
$(subst -march=armv5e,-march=armv5,\
$(subst -mcpu=cortex-a15,-march=armv7-a,\
$(1))))
endef endef

3
core/combo/TARGET_linux-arm64.mk
View File

@@ -47,9 +47,6 @@ ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
$(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT)) $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT))
endif endif
# TODO: Enable Clang when aarch64 prebuilt is added
# WITHOUT_TARGET_CLANG := true
include $(TARGET_ARCH_SPECIFIC_MAKEFILE) include $(TARGET_ARCH_SPECIFIC_MAKEFILE)
# You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else # You can set TARGET_TOOLS_PREFIX to get gcc from somewhere else