From 2520ad57a5e68310562d39cd1d465404ea8497d6 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Wed, 21 Mar 2018 22:19:59 +0000 Subject: [PATCH] common: Use ARCHITECTURE_x86_64 instead of ARCHITECTURE_X64 --- src/common/memory_util.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/memory_util.cpp b/src/common/memory_util.cpp index 759ad02ca..5855e50eb 100644 --- a/src/common/memory_util.cpp +++ b/src/common/memory_util.cpp @@ -16,7 +16,7 @@ #include #endif -#if !defined(_WIN32) && defined(ARCHITECTURE_X64) && !defined(MAP_32BIT) +#if !defined(_WIN32) && defined(ARCHITECTURE_x86_64) && !defined(MAP_32BIT) #include #define PAGE_MASK (getpagesize() - 1) #define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) @@ -30,7 +30,7 @@ void* AllocateExecutableMemory(size_t size, bool low) { void* ptr = VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE); #else static char* map_hint = nullptr; -#if defined(ARCHITECTURE_X64) && !defined(MAP_32BIT) +#if defined(ARCHITECTURE_x86_64) && !defined(MAP_32BIT) // This OS has no flag to enforce allocation below the 4 GB boundary, // but if we hint that we want a low address it is very likely we will // get one. @@ -42,7 +42,7 @@ void* AllocateExecutableMemory(size_t size, bool low) { #endif void* ptr = mmap(map_hint, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_ANON | MAP_PRIVATE -#if defined(ARCHITECTURE_X64) && defined(MAP_32BIT) +#if defined(ARCHITECTURE_x86_64) && defined(MAP_32BIT) | (low ? MAP_32BIT : 0) #endif , @@ -57,7 +57,7 @@ void* AllocateExecutableMemory(size_t size, bool low) { #endif LOG_ERROR(Common_Memory, "Failed to allocate executable memory"); } -#if !defined(_WIN32) && defined(ARCHITECTURE_X64) && !defined(MAP_32BIT) +#if !defined(_WIN32) && defined(ARCHITECTURE_x86_64) && !defined(MAP_32BIT) else { if (low) { map_hint += size;