aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2020-06-29 23:49:20 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-06-29 23:49:20 +0000
commitb2b0e28a45941b560b6f945d6d293ce92cdd4235 (patch)
tree5e249900be52fe45190db89337ff7e2fadcc45f5
parentd6296e3a9f09fb288f93a82cf54e4a25d2dd9faa (diff)
parent4a565bd88896944bf5f457f7bd6b148151fbf4dc (diff)
downloadtrusted-firmware-a-b2b0e28a45941b560b6f945d6d293ce92cdd4235.tar.gz
Merge "Fix makefile to build on a Windows host PC" into integration
-rw-r--r--Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 160cd44cc..becbf0341 100644
--- a/Makefile
+++ b/Makefile
@@ -197,10 +197,8 @@ endif
# Memory tagging is supported in architecture Armv8.5-A AArch64 and onwards
ifeq ($(ARCH), aarch64)
-ifeq ($(shell test $(ARM_ARCH_MAJOR) -gt 8; echo $$?),0)
-mem_tag_arch_support = yes
-else ifeq ($(shell test $(ARM_ARCH_MAJOR) -eq 8 -a $(ARM_ARCH_MINOR) -ge 5; \
- echo $$?),0)
+# Check if revision is greater than or equal to 8.5
+ifeq "8.5" "$(word 1, $(sort 8.5 $(ARM_ARCH_MAJOR).$(ARM_ARCH_MINOR)))"
mem_tag_arch_support = yes
endif
endif