Skip to content

[BOLT] Fix conditional compilation of hugify.cpp #135880

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

Merged
merged 1 commit into from
Apr 15, 2025
Merged

Conversation

maksfb
Copy link
Contributor

@maksfb maksfb commented Apr 15, 2025

Fix builds after #117158: do not build hugify.cpp on Apple platforms.

Fix builds after llvm#117158: do not build hugify.cpp on Apple platforms.
@llvmbot
Copy link
Member

llvmbot commented Apr 15, 2025

@llvm/pr-subscribers-bolt

Author: Maksim Panchenko (maksfb)

Changes

Fix builds after #117158: do not build hugify.cpp on Apple platforms.


Full diff: https://github.com/llvm/llvm-project/pull/135880.diff

1 Files Affected:

  • (modified) bolt/runtime/hugify.cpp (+2-2)
diff --git a/bolt/runtime/hugify.cpp b/bolt/runtime/hugify.cpp
index 67d5fa26007d2..672b04247dfa4 100644
--- a/bolt/runtime/hugify.cpp
+++ b/bolt/runtime/hugify.cpp
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#if defined(__x86_64__) ||                                                     \
-    (defined(__aarch64__) || defined(__arm64__)) && !defined(__APPLE__)
+#if (defined(__x86_64__) || defined(__aarch64__) || defined(__arm64__)) &&     \
+    !defined(__APPLE__)
 
 #include "common.h"
 

Copy link
Contributor

@ilovepi ilovepi left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for the fix.

@maksfb maksfb merged commit 0b8f817 into llvm:main Apr 15, 2025
10 of 11 checks passed
@maksfb
Copy link
Contributor Author

maksfb commented Apr 16, 2025

LGTM. Thanks for the fix.

No worries, Paul! I didn't verify the fix since I don't build on Mac, but that macro is the most likely cause.

@ilovepi
Copy link
Contributor

ilovepi commented Apr 16, 2025

https://ci.chromium.org/ui/p/fuchsia/builders/toolchain.ci/clang-host-mac-x64/b8717478536472658465/overview is our CI w/ your patch.

var-const pushed a commit to ldionne/llvm-project that referenced this pull request Apr 17, 2025
Fix builds after llvm#117158: do not build hugify.cpp on Apple platforms.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants