Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Compiling Arm again #887

Merged
merged 2 commits into from
Feb 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions src/Native/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,10 @@ if (CLR_CMAKE_PLATFORM_UNIX)
add_compile_options(-Wno-null-arithmetic)
add_compile_options(-Wno-null-conversion)

# Allow 16 byte compare-exchange
add_compile_options(-mcx16)
if (CLR_CMAKE_PLATFORM_UNIX_TARGET_AMD64)
# Allow 16 byte compare-exchange
add_compile_options(-mcx16)
endif()

# Disable strict warning on unused functions.
add_compile_options(-Wno-unused-function)
Expand Down
7 changes: 7 additions & 0 deletions src/Native/Runtime/arm/StubDispatch.S
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#include <unixasmmacros.inc>

// TODO: Implement Arm support
7 changes: 7 additions & 0 deletions src/Native/Runtime/arm64/StubDispatch.S
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#include <unixasmmacros.inc>

// TODO: Implement Arm64 support
2 changes: 1 addition & 1 deletion src/Native/Runtime/portable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ COOP_PINVOKE_HELPER(Array *, RhpNewArray, (EEType * pArrayEEType, int numElement
{
// Perform the size computation using 64-bit integeres to detect overflow
uint64_t size64 = (uint64_t)pArrayEEType->get_BaseSize() + ((uint64_t)numElements * (uint64_t)pArrayEEType->get_ComponentSize());
size64 = ALIGN_UP(size, sizeof(UIntNative));
size64 = ALIGN_UP(size64, sizeof(UIntNative));

size = (size_t)size64;
if (size != size64)
Expand Down