Skip to content

Go back to LLVM 18.1.6 #33

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
merged 4 commits into from
Aug 26, 2024
Merged

Go back to LLVM 18.1.6 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cefdb5
Revert "Bump to LLVM 18.1.7 (#29)"
grendello Aug 26, 2024
3fd4688
Revert "Bump to LLVM 18.1.7 (#29)"
grendello Aug 26, 2024
6636318
Go back to LLVM 18.1.6
grendello Aug 26, 2024
fdc02b6
GDN suppression
grendello Aug 26, 2024
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
2 changes: 0 additions & 2 deletions build-common.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@ set HOST_ARTIFACTS_DIR=%ARTIFACTS_DIR%\%HOST%
set HOST_ARTIFACTS_BIN_DIR=%HOST_ARTIFACTS_DIR%\bin
set CMAKE_VS_GENERATOR=Visual Studio 17 2022
set MSVC_RUNTIME_LIBRARY="MultiThreaded"
set CXXFLAGS=/Qspectre /sdl /guard:cf
set CFLAGS=/Qspectre /sdl /guard:cf

mkdir %HOST_ARTIFACTS_BIN_DIR%
3 changes: 1 addition & 2 deletions build-llvm.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ set HOST_BUILD_DIR=%BUILD_DIR%\%HOST%\llvm
set HOST_BIN_DIR=%HOST_BUILD_DIR%\Release\bin

set LLVM_VERSION_FILE=%HOST_ARTIFACTS_DIR%\llvm-version.txt
set CXXFLAGS="/Qspectre /sdl /guard:cf"

if exist %HOST_BUILD_DIR% (rmdir /S /Q %HOST_BUILD_DIR%)
mkdir %HOST_BUILD_DIR%
Expand Down Expand Up @@ -43,8 +44,6 @@ cmake -G "%CMAKE_VS_GENERATOR%" -A x64 ^
-DLLVM_ENABLE_TERMINFO=OFF ^
-DLLVM_ENABLE_THREADS=OFF ^
-DLLVM_ENABLE_ZLIB=OFF ^
-DLLVM_ENABLE_ZSTD=OFF ^
-DLLVM_USE_STATIC_ZSTD=ON ^
-DLLVM_INCLUDE_BENCHMARKS=OFF ^
-DLLVM_INCLUDE_EXAMPLES=OFF ^
-DLLVM_INCLUDE_TESTS=OFF ^
Expand Down
1 change: 0 additions & 1 deletion build-llvm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ function configure()
-DLLVM_ENABLE_THREADS=OFF \
-DLLVM_ENABLE_ZLIB=OFF \
-DLLVM_ENABLE_ZSTD=OFF \
-DLLVM_USE_STATIC_ZSTD=ON \
-DLLVM_INCLUDE_BENCHMARKS=OFF \
-DLLVM_INCLUDE_EXAMPLES=OFF \
-DLLVM_INCLUDE_TESTS=OFF \
Expand Down
4 changes: 2 additions & 2 deletions build-tools/automation/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ extends:
lsb-release patchutils diffstat xz-utils python3-dev libedit-dev libncurses5-dev swig
python3-six python3-sphinx binutils-dev libxml2-dev libjsoncpp-dev pkg-config lcov
procps help2man zlib1g-dev g++-multilib libjs-mathjax python3-recommonmark libpfm4-dev
python3-setuptools libz3-dev ccache libzstd-dev
python3-setuptools libz3-dev ccache
displayName: Install LLVM build dependencies

- script: sudo apt-get -f -u install mingw-w64 libz-mingw-w64-dev
Expand Down Expand Up @@ -171,7 +171,7 @@ extends:
export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install cmake ninja ccache
displayName: Install LLVM build dependencies

- script: export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install make xz zstd
- script: export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install make xz
displayName: Install Xamarin.Android Utilities build dependencies

- script: bash ./build-llvm.sh
Expand Down
2 changes: 1 addition & 1 deletion external/llvm
Open in desktop
Submodule llvm updated 9 files
+3 −5 clang/lib/Format/TokenAnnotator.cpp
+7 −2 clang/lib/Format/UnwrappedLineParser.cpp
+0 −19 clang/unittests/Format/FormatTest.cpp
+0 −13 clang/unittests/Format/TokenAnnotatorTest.cpp
+3 −3 libcxx/include/string
+1 −1 llvm/CMakeLists.txt
+30 −7 llvm/lib/Target/PowerPC/PPCMergeStringPool.cpp
+0 −20 llvm/test/CodeGen/PowerPC/mergeable-string-pool-pr92991.ll
+1 −1 llvm/utils/lit/lit/__init__.py
12 changes: 6 additions & 6 deletions scripts/llvm-objcopy.cmd.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@echo off
setlocal
set BINARIES_DIRECTORY=%~dp0

set "BINARIES_DIRECTORY=" && "%BINARIES_DIRECTORY%llvm-objcopy.exe" %*
if not ERRORLEVEL 0 exit /b %errorlevel%
@echo off
setlocal
set BINARIES_DIRECTORY=%~dp0
set "BINARIES_DIRECTORY=" && "%BINARIES_DIRECTORY%llvm-objcopy.exe" %*
if not ERRORLEVEL 0 exit /b %errorlevel%