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

Fix for #3365 on armel tizen#3424

Merged
jkotas merged 5 commits intodotnet:masterfrom
sergign60:arm_build
Apr 25, 2017
Merged

Fix for #3365 on armel tizen#3424
jkotas merged 5 commits intodotnet:masterfrom
sergign60:arm_build

Conversation

@sergign60
Copy link
Contributor

No description provided.

@sergign60
Copy link
Contributor Author

CC: @Dmitri-Botcharnikov

@sergign60
Copy link
Contributor Author

#3365

<DefineConstants>ARM;$(DefineConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)' == 'armel'">
<DefineConstants>ARMEL;$(DefineConstants)</DefineConstants>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In CoreCLR, we are defining ARM for armel. We should do the same here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or maybe even rewrite armel to arm at the top like it is done for CoreCLR: https://github.com/dotnet/coreclr/blob/master/src/mscorlib/System.Private.CoreLib.csproj#L16

return 0x8664; // AMD64
TargetArchitecture arch = _compilation.TypeSystemContext.Target.Architecture;

if (arch == TargetArchitecture.X86)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use switch?

@jkotas jkotas merged commit 8482b00 into dotnet:master Apr 25, 2017
@jkotas
Copy link
Member

jkotas commented Apr 25, 2017

Thanks!

@sergign60 sergign60 deleted the arm_build branch April 25, 2017 17:59
MichalStrehovsky added a commit to MichalStrehovsky/corert that referenced this pull request Apr 26, 2017
The way we were setting common defines (such as `AMD64`, `BIT64`, `ARM`)
was extremely fragile and invited partial fixes such as dotnet#3414 and dotnet#3424.
This really needs to be centralized.
jkotas pushed a commit that referenced this pull request Apr 26, 2017
The way we were setting common defines (such as `AMD64`, `BIT64`, `ARM`)
was extremely fragile and invited partial fixes such as #3414 and #3424.
This really needs to be centralized.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants