Skip to content

[Cygwin] Define LLVM_ABI for Cygwin #143222

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
Jun 13, 2025
Merged

Conversation

kikairoya
Copy link
Contributor

592243c should be also applied to LLVM_ABI.

592243c should be also applied to LLVM_ABI.
@llvmbot
Copy link
Member

llvmbot commented Jun 7, 2025

@llvm/pr-subscribers-llvm-support

Author: Tomohiro Kashiwada (kikairoya)

Changes

592243c should be also applied to LLVM_ABI.


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

1 Files Affected:

  • (modified) llvm/include/llvm/Support/Compiler.h (+1-1)
diff --git a/llvm/include/llvm/Support/Compiler.h b/llvm/include/llvm/Support/Compiler.h
index b4382057654ba..904ab88a5a51f 100644
--- a/llvm/include/llvm/Support/Compiler.h
+++ b/llvm/include/llvm/Support/Compiler.h
@@ -209,7 +209,7 @@
 #define LLVM_ABI_FRIEND LLVM_ABI
 #define LLVM_ABI_EXPORT __declspec(dllexport)
 #elif defined(__ELF__) || defined(__MINGW32__) || defined(_AIX) ||             \
-    defined(__MVS__)
+    defined(__MVS__) || defined(__CYGWIN__)
 #define LLVM_ABI LLVM_ATTRIBUTE_VISIBILITY_DEFAULT
 #define LLVM_ABI_FRIEND
 #define LLVM_TEMPLATE_ABI LLVM_ATTRIBUTE_VISIBILITY_DEFAULT

Copy link
Contributor

@jeremyd2019 jeremyd2019 left a comment

Choose a reason for hiding this comment

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

LGTM, probably just an oversight when @mati865 was splitting up his patches

@mati865
Copy link
Contributor

mati865 commented Jun 11, 2025

Indeed, it was present in #134458

Gonna have to check what else is missing.

@jeremyd2019 jeremyd2019 merged commit 60d0004 into llvm:main Jun 13, 2025
9 checks passed
@llvm-ci
Copy link
Collaborator

llvm-ci commented Jun 13, 2025

LLVM Buildbot has detected a new failure on builder flang-arm64-windows-msvc running on linaro-armv8-windows-msvc-01 while building llvm at step 5 "build-unified-tree".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/207/builds/2550

Here is the relevant piece of the build log for the reference
Step 5 (build-unified-tree) failure: build (failure)
...
349.233 [2601/10/4118] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/char-set.cpp.obj
349.657 [2600/10/4119] Building CXX object tools/flang/lib/Evaluate/CMakeFiles/FortranEvaluate.dir/cmake_pch.cxx.obj
350.902 [2599/10/4120] Building AArch64GenInstrInfo.inc...
351.803 [2598/10/4121] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/char-buffer.cpp.obj
352.846 [2597/10/4122] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/debug-parser.cpp.obj
352.883 [2596/10/4123] Building AArch64GenSubtargetInfo.inc...
353.119 [2595/10/4124] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/characters.cpp.obj
353.813 [2594/10/4125] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/instrumented-parser.cpp.obj
356.204 [2593/10/4126] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/message.cpp.obj
358.640 [2592/10/4127] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/preprocessor.cpp.obj
FAILED: tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/preprocessor.cpp.obj 
ccache C:\Users\tcwg\scoop\apps\llvm-arm64\current\bin\clang-cl.exe  /nologo -TP -DFLANG_INCLUDE_TESTS=1 -DGTEST_HAS_RTTI=0 -DUNICODE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_GLIBCXX_ASSERTIONS -D_HAS_EXCEPTIONS=0 -D_SCL_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -IC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/flang/lib/Parser -IC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/llvm-project/flang/lib/Parser -IC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/llvm-project/flang/include -IC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/flang/include -IC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/include -IC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/llvm-project/llvm/include -imsvcC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/llvm-project/flang/../mlir/include -imsvcC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/mlir/include -imsvcC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/clang/include -imsvcC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/llvm-project/llvm/../clang/include /DWIN32 /D_WINDOWS   /Zc:inline /Zc:__cplusplus /Oi /Brepro /bigobj /permissive- -Werror=unguarded-availability-new /W4  -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wmisleading-indentation -Wctad-maybe-unsupported /Gw -Wno-deprecated-copy -Wno-string-conversion -Wno-ctad-maybe-unsupported -Xclang -fno-pch-timestamp /O2 /Ob2  -std:c++17 -MD  /EHs-c- /GR- -UNDEBUG /YuC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/cmake_pch.hxx /FpC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/./cmake_pch.cxx.pch /FIC:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/cmake_pch.hxx /showIncludes /Fotools/flang/lib/Parser/CMakeFiles/FortranParser.dir/preprocessor.cpp.obj /Fdtools\flang\lib\Parser\CMakeFiles\FortranParser.dir\FortranParser.pdb -c -- C:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/llvm-project/flang/lib/Parser/preprocessor.cpp
fatal error: file 'C:\Users\tcwg\llvm-worker\flang-arm64-windows-msvc\llvm-project\llvm\include\llvm\Support\Compiler.h' has been modified since the precompiled header 'C:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/./cmake_pch.cxx.pch' was built: size changed (was 27102, now 27125)
note: please rebuild precompiled header 'C:/Users/tcwg/llvm-worker/flang-arm64-windows-msvc/build/tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/./cmake_pch.cxx.pch'
1 error generated.
362.302 [2592/9/4128] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/prescan.cpp.obj
363.549 [2592/8/4129] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/parsing.cpp.obj
364.042 [2592/7/4130] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/parse-tree.cpp.obj
366.546 [2592/6/4131] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/expr-parsers.cpp.obj
371.513 [2592/5/4132] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/io-parsers.cpp.obj
380.525 [2592/4/4133] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/openacc-parsers.cpp.obj
385.300 [2592/3/4134] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/executable-parsers.cpp.obj
397.391 [2592/2/4135] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/Fortran-parsers.cpp.obj
409.660 [2592/1/4136] Building CXX object tools/flang/lib/Parser/CMakeFiles/FortranParser.dir/openmp-parsers.cpp.obj
ninja: build stopped: subcommand failed.

@kikairoya kikairoya deleted the cygwin-llvm_abi branch June 14, 2025 01:31
kikairoya added a commit to kikairoya/llvm-project that referenced this pull request Jun 14, 2025
Flang Merge CI rejects changes to llvm/Support/Compiler.h because precompiled
headers aren't rebuilt when their dependencies change.

This reverts commit 60d0004.
@jeremyd2019
Copy link
Contributor

Indeed, it was present in #134458

Gonna have to check what else is missing.

Reconciling patches, it seems you had only done the clang commit and not gotten to the llvm commit

tomtor pushed a commit to tomtor/llvm-project that referenced this pull request Jun 14, 2025
akuhlens pushed a commit to akuhlens/llvm-project that referenced this pull request Jun 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants