@@ -43,7 +43,7 @@ the branch we're already using. The steps for this are:
43
43
1 . Make sure the bugfix is in upstream LLVM.
44
44
2 . Identify the branch that rustc is currently using. The ` src/llvm-project `
45
45
submodule is always pinned to a branch of the
46
- [ rust-lang/llvm-project] ( https://github.com/rust-lang/llvm-project ) repository.
46
+ [ rust-lang/llvm-project repository] .
47
47
3 . Fork the rust-lang/llvm-project repository
48
48
4 . Check out the appropriate branch (typically named ` rustc/a.b-yyyy-mm-dd ` )
49
49
5 . Cherry-pick the upstream commit onto the branch
@@ -146,9 +146,6 @@ easiest to land [`llvm-wrapper`] compatibility as a PR before actually updating
146
146
interested in trying out the new LLVM can benefit from work you've done to
147
147
update the C++ bindings.
148
148
149
- [ rust-lang/llvm-project repository ] : https://github.com/rust-lang/llvm-project
150
- [ `llvm-wrapper` ] : https://github.com/rust-lang/rust/tree/master/compiler/rustc_llvm/llvm-wrapper
151
-
152
149
### Caveats and gotchas
153
150
154
151
Ideally the above instructions are pretty smooth, but here's some caveats to
@@ -161,8 +158,6 @@ keep in mind while going through them:
161
158
* Creating branches is a privileged operation on GitHub, so you'll need someone
162
159
with write access to create the branches for you most likely.
163
160
164
- [ wg-llvm ] : https://rust-lang.zulipchat.com/#narrow/stream/187780-t-compiler.2Fwg-llvm
165
-
166
161
## New LLVM Release Updates
167
162
168
163
Updating to a new release of LLVM is very similar to the "feature updates"
@@ -172,7 +167,7 @@ section above is generally around branch naming. The sequence of events
172
167
typically looks like:
173
168
174
169
1 . LLVM announces that its latest release version has branched. This will show
175
- up as a branch in https://github.com/ llvm/llvm-project typically named
170
+ up as a branch in the [ llvm/llvm-project repository ] typically named
176
171
` release/$N.x ` where ` $N ` is the version of LLVM that's being released.
177
172
178
173
2 . We then follow the "feature updates" section above to create a new branch of
@@ -192,3 +187,8 @@ typically looks like:
192
187
to create a new branch in the rust-lang/llvm-project repository, this time
193
188
with a new date. The commit history should look much cleaner as just a few
194
189
Rust-specific commits stacked on top of stock LLVM's release branch.
190
+
191
+ [ rust-lang/llvm-project repository ] : https://github.com/rust-lang/llvm-project
192
+ [ llvm/llvm-project repository ] : https://github.com/llvm/llvm-project
193
+ [ `llvm-wrapper` ] : https://github.com/rust-lang/rust/tree/master/compiler/rustc_llvm/llvm-wrapper
194
+ [ wg-llvm ] : https://rust-lang.zulipchat.com/#narrow/stream/187780-t-compiler.2Fwg-llvm
0 commit comments