Skip to content

Libraries native renames #31668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdmaclea merged 1 commit into from
Feb 3, 2020
Merged

Libraries native renames #31668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/libraries/Native/Unix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@ else()
endif(CMAKE_SYSTEM_NAME STREQUAL Emscripten)

if (CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64)
add_definitions(-DBIT64=1)
add_definitions(-D_AMD64_)
add_definitions(-DTARGET_64BIT=1)
add_definitions(-DTARGET_AMD64)
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL x86 OR CMAKE_SYSTEM_PROCESSOR STREQUAL i686)
add_definitions(-DBIT32=1)
add_definitions(-D_X86_)
add_definitions(-DTARGET_32BIT=1)
add_definitions(-DTARGET_X86)
add_definitions(-D_FILE_OFFSET_BITS=64)
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
add_definitions(-DBIT64=1)
add_definitions(-D_ARM64_)
add_definitions(-DTARGET_64BIT=1)
add_definitions(-DTARGET_ARM64)
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)
add_definitions(-DBIT32=1)
add_definitions(-D_ARM_)
add_definitions(-DTARGET_32BIT=1)
add_definitions(-DTARGET_ARM)
add_definitions(-D_FILE_OFFSET_BITS=64)
if(ARM_SOFTFP)
add_compile_options(-mfloat-abi=softfp)
Expand All @@ -85,8 +85,8 @@ elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)

add_compile_options(-march=armv7-a)
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL arm)
add_definitions(-DBIT32=1)
add_definitions(-D_ARM_)
add_definitions(-DTARGET_32BIT=1)
add_definitions(-DTARGET_ARM)
add_definitions(-D_FILE_OFFSET_BITS=64)
endif ()

Expand Down
16 changes: 8 additions & 8 deletions src/libraries/Native/Unix/System.Native/pal_runtimeinformation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ int32_t SystemNative_GetUnixVersion(char* version, int* capacity)
3 - ARM64 */
int32_t SystemNative_GetOSArchitecture()
{
#if defined(_ARM_)
#if defined(TARGET_ARM)
return ARCH_ARM;
#elif defined(_ARM64_)
#elif defined(TARGET_ARM64)
return ARCH_ARM64;
#elif defined(_AMD64_)
#elif defined(TARGET_AMD64)
return ARCH_X64;
#elif defined(_X86_)
#elif defined(TARGET_X86)
return ARCH_X86;
#else
#error Unidentified Architecture
Expand All @@ -65,13 +65,13 @@ int32_t SystemNative_GetOSArchitecture()
3 - ARM64 */
int32_t SystemNative_GetProcessArchitecture()
{
#if defined(_ARM_)
#if defined(TARGET_ARM)
return ARCH_ARM;
#elif defined(_ARM64_)
#elif defined(TARGET_ARM64)
return ARCH_ARM64;
#elif defined(_AMD64_)
#elif defined(TARGET_AMD64)
return ARCH_X64;
#elif defined(_X86_)
#elif defined(TARGET_X86)
return ARCH_X86;
#else
#error Unidentified Architecture
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Native/Windows/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ else()
endif()

if ($ENV{__BuildArch} STREQUAL "x86_64" OR $ENV{__BuildArch} STREQUAL "amd64")
add_definitions(-DBIT64=1)
add_definitions(-DTARGET_64BIT=1)
endif ()

if (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Native/Windows/clrcompression/zlib-intel/deflate_quick.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ local inline long compare258(z_const unsigned char *z_const src0,
"cmp $256 + 16, %[ax]\n\t"
"jb 1b\n\t"

#ifdef X86
#ifdef TARGET_X86
"movzwl -16(%[src0], %[ax]), %[dx]\n\t"
#else
"movzwq -16(%[src0], %[ax]), %[dx]\n\t"
Expand Down