From 92276dc616195f327ff793235fd81f498b565b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Steinbrink?= Date: Sun, 18 Oct 2015 16:40:45 +0200 Subject: [PATCH] Update LLVM fork to include a backported fix for broken debug locations Fixes #28947 --- mk/main.mk | 6 +++++- src/llvm | 2 +- src/rustllvm/llvm-auto-clean-trigger | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mk/main.mk b/mk/main.mk index cb8af120ca6..1cd491a04f3 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -132,7 +132,11 @@ endif ifdef CFG_ENABLE_DEBUGINFO $(info cfg: enabling debuginfo (CFG_ENABLE_DEBUGINFO)) - CFG_RUSTC_FLAGS += -g + # FIXME: Re-enable -g in stage0 after new snapshot + #CFG_RUSTC_FLAGS += -g + RUSTFLAGS_STAGE1 += -g + RUSTFLAGS_STAGE2 += -g + RUSTFLAGS_STAGE3 += -g endif ifdef SAVE_TEMPS diff --git a/src/llvm b/src/llvm index 62ad301a240..cde1ed3196b 160000 --- a/src/llvm +++ b/src/llvm @@ -1 +1 @@ -Subproject commit 62ad301a2407a7aca50c1d5120c63597d676d29f +Subproject commit cde1ed3196ba9b39bcf028e06e08a8722113a5cb diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger index df9dc8bc841..3b99aa3520b 100644 --- a/src/rustllvm/llvm-auto-clean-trigger +++ b/src/rustllvm/llvm-auto-clean-trigger @@ -1,4 +1,4 @@ # If this file is modified, then llvm will be forcibly cleaned and then rebuilt. # The actual contents of this file do not matter, but to trigger a change on the # build bots then the contents should be changed so git updates the mtime. -2015-09-11 +2015-10-18