Skip to content

List other architectures in dotnet --info #70403

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
elinor-fung merged 8 commits into from
Jun 14, 2022
Merged

List other architectures in dotnet --info #70403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b45857a
List other architectures in dotnet --info
elinor-fung Jun 2, 2022
6236744
List DOTNET_ROOT environment variables
elinor-fung Jun 7, 2022
6e05c22
Rename get_arch
elinor-fung Jun 7, 2022
c9ca1b4
PR feedback
elinor-fung Jun 8, 2022
7c8d759
Update order and section headings
elinor-fung Jun 9, 2022
6455cb9
Update test
elinor-fung Jun 10, 2022
b16aba0
Merge remote-tracking branch 'upstream/main' into archInfo
elinor-fung Jun 13, 2022
41d67ce
Update link
elinor-fung Jun 13, 2022
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main' into archInfo
  • Loading branch information
@elinor-fung
elinor-fung committed Jun 13, 2022
commit b16aba0487ec27a033754f50522050edd475844d
1 change: 1 addition & 0 deletions src/native/corehost/hostmisc/pal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ namespace pal
arm64,
armv6,
loongarch64,
ppc64le,
s390X,
x64,
x86,
Expand Down
4 changes: 3 additions & 1 deletion src/native/corehost/hostmisc/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,13 @@ pal::string_t get_replaced_char(const pal::string_t& path, pal::char_t match, pa

namespace
{

const pal::char_t* s_all_architectures[] =
{
_X("arm"),
_X("arm64"),
_X("armv6"),
_X("loongarch64"),
_X("ppc64le"),
_X("s390x"),
_X("x64"),
_X("x86")
Expand All @@ -226,6 +226,8 @@ pal::architecture get_current_arch()
return pal::architecture::loongarch64;
#elif defined(TARGET_S390X)
return pal::architecture::s390X;
#elif defined(TARGET_POWERPC64)
return pal::architecture::ppc64le;
#else
#error "Unknown target"
#endif
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.