From bcfbdd589b8d0c620d20f1065dfe04634b3b62e9 Mon Sep 17 00:00:00 2001 From: Steve MacLean Date: Fri, 17 Jan 2020 18:01:25 -0500 Subject: [PATCH] Remove unused/unnecessary defines (#1878) --- src/coreclr/configurecompiler.cmake | 7 ------- src/coreclr/src/vm/util.hpp | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/coreclr/configurecompiler.cmake b/src/coreclr/configurecompiler.cmake index aa37d10..e3436bf 100644 --- a/src/coreclr/configurecompiler.cmake +++ b/src/coreclr/configurecompiler.cmake @@ -373,16 +373,13 @@ endif(CLR_CMAKE_PLATFORM_FREEBSD) #----------------------------------- if (CLR_CMAKE_PLATFORM_ARCH_AMD64) add_definitions(-D_AMD64_) - add_definitions(-DAMD64) add_definitions(-DBIT64) elseif (CLR_CMAKE_PLATFORM_ARCH_I386) add_definitions(-D_X86_) elseif (CLR_CMAKE_PLATFORM_ARCH_ARM) add_definitions(-D_ARM_) - add_definitions(-DARM) elseif (CLR_CMAKE_PLATFORM_ARCH_ARM64) add_definitions(-D_ARM64_) - add_definitions(-DARM64) add_definitions(-DBIT64) else () clr_unknown_arch() @@ -392,16 +389,12 @@ if (CLR_CMAKE_PLATFORM_UNIX) if(CLR_CMAKE_PLATFORM_LINUX) if(CLR_CMAKE_PLATFORM_UNIX_AMD64) message("Detected Linux x86_64") - add_definitions(-DLINUX64) elseif(CLR_CMAKE_PLATFORM_UNIX_ARM) message("Detected Linux ARM") - add_definitions(-DLINUX32) elseif(CLR_CMAKE_PLATFORM_UNIX_ARM64) message("Detected Linux ARM64") - add_definitions(-DLINUX64) elseif(CLR_CMAKE_PLATFORM_UNIX_X86) message("Detected Linux i686") - add_definitions(-DLINUX32) else() clr_unknown_arch() endif() diff --git a/src/coreclr/src/vm/util.hpp b/src/coreclr/src/vm/util.hpp index df709e1..05e9b45 100644 --- a/src/coreclr/src/vm/util.hpp +++ b/src/coreclr/src/vm/util.hpp @@ -42,7 +42,7 @@ #define WszMessageBox __error("Use one of the EEMessageBox APIs (defined in eemessagebox.h) from inside the EE") // Hot cache lines need to be aligned to cache line size to improve performance -#if defined(ARM64) +#if defined(_ARM64_) #define MAX_CACHE_LINE_SIZE 128 #else #define MAX_CACHE_LINE_SIZE 64 -- 2.7.4