Skip to content
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.

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

Cleanup platform-specific ifdefs #65624

Merged
merged 3 commits into from
Feb 23, 2022
Merged

Cleanup platform-specific ifdefs #65624

merged 3 commits into from
Feb 23, 2022

Conversation

jkotas
Copy link
Member

@jkotas jkotas commented Feb 19, 2022

No description provided.

@dotnet-issue-labeler
Copy link

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@ghost ghost assigned jkotas Feb 19, 2022
@jkotas
Copy link
Member Author

jkotas commented Feb 19, 2022

Inspired by LoongArch64 PR reviews

@shushanhf
Copy link
Contributor

Hi @jkotas
You had cleaned the redundant defination liking IMAGE_FILE_XXX.

How about the relocation liking IMAGE_REL_ARM64_PAGEOFFSET_12A within the src/coreclr/inc/clrnt.h and src/coreclr/pal/inc/rt/ntimage.h ?

@jkotas
Copy link
Member Author

jkotas commented Feb 21, 2022

How about the relocation liking IMAGE_REL_ARM64_PAGEOFFSET_12A within the src/coreclr/inc/clrnt.h

I have pushed a commit to cleanup these as well.

Copy link
Member

@BruceForstall BruceForstall left a comment

Choose a reason for hiding this comment

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

LGTM

@jkotas jkotas merged commit 94c0a7c into dotnet:main Feb 23, 2022
@jkotas jkotas deleted the cleanup branch February 23, 2022 02:01
@AndyAyersMS
Copy link
Member

I am seeing a build break in CI in Build Cross OS Linux DAC for Windows ... could this be related?

C:\PROGRA~2\MICROS~1\2019\ENTERP~1\VC\Tools\MSVC\1429~1.301\bin\Hostx86\x64\cl.exe  /nologo -DCROSS_COMPILE -DDISABLE_CONTRACTS -DHAVE_CONFIG_H=1 -DHAVE_UNW_GET_ACCESSORS -DHAVE___THREAD=0 -DHOST_64BIT -DHOST_AMD64 -DHOST_WINDOWS -DNDEBUG -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_STRING=\"\" -DTARGET_64BIT -DTARGET_ARM64 -DTARGET_LINUX -DTARGET_UNIX -DUNW_REMOTE_ONLY -DURTBLDENV_FRIENDLY=Retail -D_CRT_SECURE_NO_WARNINGS -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D_Thread_local="" -D__aarch64__ -D__linux__ -Ipal\src\libunwind\src -ID:\a\_work\1\s\src\coreclr\pal\src\libunwind\src -ID:\a\_work\1\s\src\native -ID:\a\_work\1\s\src\coreclr\pal\src\libunwind\include\tdep -ID:\a\_work\1\s\src\coreclr\pal\src\libunwind\include -Ipal\src\libunwind\include\tdep -Ipal\src\libunwind\include -ID:\a\_work\1\s\src\coreclr\pal\src\libunwind\include\win /DWIN32 /D_WINDOWS  /guard:cf /guard:ehcont /O2 /Ob2 /DNDEBUG -MT   /Ox /nologo /W3 /WX /Oi /Oy- /Gm- /Zp8 /Gy /GS /fp:precise /FC /MP /Zm200 /Zc:strictStrings /Zc:wchar_t /Zc:inline /Zc:forScope /wd4065 /wd4100 /wd4127 /wd4189 /wd4200 /wd4201 /wd4245 /wd4291 /wd4456 /wd4457 /wd4458 /wd4733 /wd4838 /wd4960 /wd4961 /wd5105 /we4007 /we4013 /we4102 /we4551 /we4700 /we4640 /we4806 /w34092 /w34121 /w34125 /w34130 /w34132 /w34212 /w34530 /w35038 /w44177 /Zi /ZH:SHA_256 /source-charset:utf-8 /GL /TC /permissive- -wd4068 -wd4146 -wd4244 -wd4267 -wd4334 -wd4311 -wd4475 -wd4477 /showIncludes /Fopal\src\libunwind\src\CMakeFiles\libunwind_xdac.dir\dwarf\Gparser.c.obj /Fdpal\src\libunwind\src\CMakeFiles\libunwind_xdac.dir\ /FS -c D:\a\_work\1\s\src\coreclr\pal\src\libunwind\src\dwarf\Gparser.c
D:\a\_work\1\s\src\coreclr\pal\src\libunwind\include\libunwind-aarch64.h(198): error C2061: syntax error: identifier 'alignas'
D:\a\_work\1\s\src\coreclr\pal\src\libunwind\include\libunwind-aarch64.h(199): error C2059: syntax error: '}'
D:\a\_work\1\s\src\coreclr\pal\src\libunwind\include\libunwind-aarch64.h(215): error C2079: 'uc_mcontext' uses undefined struct 'unw_sigcontext'

@jkotas
Copy link
Member Author

jkotas commented Feb 23, 2022

I do not think that it is related.

We require VS 2022 for build https://github.com/dotnet/runtime/blob/main/docs/workflow/requirements/windows-requirements.md#visual-studio . The log that you have shared suggests that the CI machine is using VS 2019. I guess the CI machine is misconfigured. What is the job that is hitting this break?

@AndyAyersMS
Copy link
Member

AndyAyersMS commented Feb 23, 2022

https://github.com/dotnet/runtime/pull/65675/checks?check_run_id=5307915150

Looks like VS2019 indeed...

** Visual Studio 2019 Developer Command Prompt v16.11.10

@AndyAyersMS
Copy link
Member

Seems like this comes from eng\pipelines\common\xplat-setup.yml?

@ghost ghost locked as resolved and limited conversation to collaborators Mar 26, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants