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.

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

Fix Issue 22956 - Bump LLD version #505

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix Issue 22956 - Bump LLD version #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
925ad13
Fix Issue 22956 - Bump LLD version
maxhaton Mar 29, 2022
ef7885b
Merge branch 'dlang:master' into bumplld
maxhaton Mar 29, 2022
17d4b68
Try to update LLVM_URL
maxhaton Mar 29, 2022
cc01e83
Update 256sums
maxhaton Mar 29, 2022
f5ebfb1
Say yes to 7zip dialogues
maxhaton Mar 29, 2022
336e91d
Try VS2019?
maxhaton Mar 30, 2022
a8c64cb
Add choco nativedesktop things
maxhaton Mar 30, 2022
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
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\
# NB: update windows/build_lld.sha256sums as well
LLVM_VER: 9.0.0
LLVM_VER: 14.0.0
maxhaton marked this conversation as resolved.
Show resolved Hide resolved
ARCH: x86
steps:
- template: .azure-pipelines/build-lld.yml
Expand All @@ -24,7 +24,7 @@ jobs:
variables:
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\
# NB: update windows/build_lld.sha256sums as well
LLVM_VER: 9.0.0
LLVM_VER: 14.0.0
ARCH: x64
steps:
- template: .azure-pipelines/build-lld.yml
Expand Down
15 changes: 10 additions & 5 deletions windows/build_lld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,22 @@ call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
cd %ROOT%
@echo on

set LLVM_URL=http://releases.llvm.org/%LLVM_VER%

:: LLVM releases are now done with github so need to match https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/lld-14.0.0.src.tar.xz

set LLVM_URL=https://github.com/llvm/llvm-project/releases/download/llvmorg-%LLVM_VER%
powershell -Command "Invoke-WebRequest %LLVM_URL%/lld-%LLVM_VER%.src.tar.xz -OutFile lld.src.tar.xz" || exit /B 1
powershell -Command "Invoke-WebRequest %LLVM_URL%/llvm-%LLVM_VER%.src.tar.xz -OutFile llvm.src.tar.xz" || exit /B 1

:: e.g. from git installation
dos2unix "%ROOT%\windows\build_lld.sha256sums"
sha256sum -c "%ROOT%\windows\build_lld.sha256sums" || exit /B 1

7z x "llvm.src.tar.xz" || exit /B 1
7z x "lld.src.tar.xz" || exit /B 1
7z x "llvm.src.tar.xz" -y || exit /B 1
7z x "lld.src.tar.xz" -y || exit /B 1

7z x "llvm.src.tar" || exit /B 1
7z x "lld.src.tar" || exit /B 1
7z x "llvm.src.tar" -y || exit /B 1
7z x "lld.src.tar" -y || exit /B 1

move "llvm-%LLVM_VER%.src" llvm
move "lld-%LLVM_VER%.src" llvm\tools\lld
Expand All @@ -37,6 +40,8 @@ rem patch lld to not emit "No structured exception handler"
sed -e s/IMAGE_DLL_CHARACTERISTICS_NO_SEH/0/ llvm\tools\lld\COFF\Writer.cpp >Writer.tmp
move /Y Writer.tmp llvm\tools\lld\COFF\Writer.cpp

choco install visualstudio2019-workload-nativedesktop

set CMAKE_OPT=%CMAKE_OPT% -DCMAKE_CXX_FLAGS="/DIMAGE_DLL_CHARACTERISTICS_NO_SEH=0"

set lld_build_dir=build-lld
Expand Down
4 changes: 2 additions & 2 deletions windows/build_lld.sha256sums
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
31c6748b235d09723fb73fea0c816ed5a3fab0f96b66f8fbc546a0fcc8688f91 lld.src.tar.xz
d6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84 llvm.src.tar.xz
88fc0f028aa8c0d9287920b101f288b03c7fabb584077326c5a0be482eb9115c lld.src.tar.xz
4df7ed50b8b7017b90dc22202f6b59e9006a29a9568238c6af28df9c049c7b9b llvm.src.tar.xz