') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Fix build with the new MacOS SDK. (define UNW_AARCH64 aliases conditionally) by VSadov · Pull Request #84591 · dotnet/runtime · GitHub
Skip to content

Fix build with the new MacOS SDK. (define UNW_AARCH64 aliases conditionally) - #84591

Merged
VSadov merged 1 commit into
dotnet:mainfrom
VSadov:osxBuild
Apr 11, 2023
Merged

Fix build with the new MacOS SDK. (define UNW_AARCH64 aliases conditionally)#84591
VSadov merged 1 commit into
dotnet:mainfrom
VSadov:osxBuild

Conversation

@VSadov

@VSadovVSadov commented Apr 11, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Fixes: #84557

It looks like libunwind.h that comes with the new MacOS SDK now has the enum for things like UNW_AARCH64_X19, so the workaround for not having those constants

runtime/src/coreclr/pal/src/exception/seh-unwind.cpp

Line 58 in 4ece8f0

// MacOS uses ARM64 instead of AARCH64 to describe these registers

now causes build failures due to duplicate definition.

Since this is an enum (not a define), we can't do simple #ifndef and need to do a configure test.

@ghostghost added the area-PAL-coreclr only for closed issues label Apr 11, 2023
@ghostghost assigned VSadovApr 11, 2023
@VSadov
VSadov requested a review from janvorliApril 11, 2023 00:14
@VSadov

VSadov commented Apr 11, 2023

Copy link
Copy Markdown
MemberAuthor

The libunwind change seems have been introduced in this change: https://reviews.llvm.org/D107996

@sbomersbomer mentioned this pull request Apr 11, 2023
Merged
@runfoapprunfoappBot mentioned this pull request Apr 11, 2023
Closed
janvorli
janvorli reviewed Apr 11, 2023
View reviewed changes
Comment threadsrc/coreclr/pal/src/configure.cmake
check_cxx_source_compiles("
#include <libunwind.h>

int main(int argc, char **argv)

@janvorlijanvorliApr 11, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It would be better to not to use compilation check, as it would require adding this HAVE_UNW_AARCH64_X19 to tryrun.cmake. We should use check_symbol_exists instead (I hope it will work for this symbol on both mac and Linux) which cmake can perform against target frame headers even in cross build.

@VSadovVSadovApr 11, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I think I tried, but check_symbol_exists did not work for some reason. I concluded it does not work for enum elements, but perhaps I just used it incorrectly.

@VSadovVSadovApr 11, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I basically just did:
check_symbol_exists(UNW_AARCH64_X19 libunwind.h HAVE_UNW_AARCH64_X19)

similar to the other checks above, but maybe this is not the way for enums?

check_cxx_source_compiles works though.

@janvorlijanvorliApr 11, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah, I guess this is the reason:

CheckSymbolExists
Provides a macro to check if a symbol exists as a function, variable, or macro in C

Actually, I was wrong, the check_cxx_source_compiles is actually still performed dynamically in cross build, the one that is not is the CheckCXXSourceRuns. So this is ok.

janvorli
janvorli approved these changes Apr 11, 2023
View reviewed changes

@janvorlijanvorli left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thank you!

@VSadov

VSadov commented Apr 11, 2023

Copy link
Copy Markdown
MemberAuthor

Thanks!!

@VSadov
VSadov merged commit b014ab8 into dotnet:mainApr 11, 2023
@VSadov
VSadov deleted the osxBuild branch April 11, 2023 18:52
UnityAlex pushed a commit to Unity-Technologies/runtime that referenced this pull request Apr 14, 2023
@VSadov@UnityAlex
define UNW_AARCH64 aliases conditionally (dotnet#84591)
b587814
UnityAlex added a commit to Unity-Technologies/runtime that referenced this pull request Apr 14, 2023
@UnityAlex
Merge pull request#164from Unity-Technologies/fix-mac-build
90fb864
define UNW_AARCH64 aliases conditionally (dotnet#84591)
@vcsjones

vcsjones commented Apr 15, 2023

Copy link
Copy Markdown
Member

Can we considering back porting this to release/7.0 and release/6.0? I'm unable to build those branches without this change.

@VSadov

VSadov commented Apr 15, 2023

Copy link
Copy Markdown
MemberAuthor

yes, I will start backporting PRs

@VSadov

VSadov commented Apr 15, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to release/7.0-staging

@github-actions

github-actionsBot commented Apr 15, 2023

Copy link
Copy Markdown
Contributor

Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/4705256183

@VSadov

VSadov commented Apr 15, 2023

Copy link
Copy Markdown
MemberAuthor

/backport to release/6.0-staging

@github-actions

github-actionsBot commented Apr 15, 2023

Copy link
Copy Markdown
Contributor

Started backporting to release/6.0-staging: https://github.com/dotnet/runtime/actions/runs/4705265354

@github-actions

github-actionsBot commented Apr 15, 2023

Copy link
Copy Markdown
Contributor

@VSadov backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: define UNW_AARCH64 aliases conditionally
Using index info to reconstruct a base tree...
M	src/coreclr/pal/src/config.h.in
M	src/coreclr/pal/src/configure.cmake
M	src/coreclr/pal/src/exception/seh-unwind.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/pal/src/exception/seh-unwind.cpp
CONFLICT (content): Merge conflict in src/coreclr/pal/src/exception/seh-unwind.cpp
Auto-merging src/coreclr/pal/src/configure.cmake
Auto-merging src/coreclr/pal/src/config.h.in
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 define UNW_AARCH64 aliases conditionally
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions

github-actionsBot commented Apr 15, 2023

Copy link
Copy Markdown
Contributor

@VSadov an error occurred while backporting to release/7.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@github-actions

github-actionsBot commented Apr 15, 2023

Copy link
Copy Markdown
Contributor

@VSadov backporting to release/6.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: define UNW_AARCH64 aliases conditionally
Using index info to reconstruct a base tree...
M	src/coreclr/pal/src/config.h.in
M	src/coreclr/pal/src/configure.cmake
M	src/coreclr/pal/src/exception/seh-unwind.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/pal/src/exception/seh-unwind.cpp
CONFLICT (content): Merge conflict in src/coreclr/pal/src/exception/seh-unwind.cpp
Auto-merging src/coreclr/pal/src/configure.cmake
Auto-merging src/coreclr/pal/src/config.h.in
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 define UNW_AARCH64 aliases conditionally
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions

github-actionsBot commented Apr 15, 2023

Copy link
Copy Markdown
Contributor

@VSadov an error occurred while backporting to release/6.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@VSadov

VSadov commented Apr 15, 2023

Copy link
Copy Markdown
MemberAuthor

uh oh, will need to backport manually

This was referenced Apr 15, 2023
Merged
Merged
@ghostghost locked as resolved and limited conversation to collaborators May 15, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@janvorlijanvorlijanvorli approved these changes

Assignees

@VSadovVSadov

Labels

area-PAL-coreclronly for closed issues

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Can't build with the new Apple SDK

3 participants

@VSadov@vcsjones@janvorli