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.

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

Rolling up PRs in the queue #19242

Merged
merged 49 commits into from Nov 23, 2014
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
aa58d53
mk/stage0: complain instead of creating an empty file
codyps Nov 18, 2014
29cc7c2
mk/target: fix typo so we depend on the correct directory
codyps Nov 18, 2014
bc5a139
rustdoc: avoid supplying a bad default sysroot so the librustc code c…
codyps Nov 18, 2014
9c320dd
configure: silence warning about LOCAL_RUST_ROOT being set
codyps Nov 20, 2014
12749fc
mk/rt: use CFG_LLVM_TARGET instead of plain target when calling llc
codyps Nov 20, 2014
125677e
Add vim modeline to lldb formatter
richo Nov 21, 2014
0ab0104
lldb: refactor print_vec_slice_val
richo Nov 21, 2014
5a08e67
Fix std::fmt::Binary format char in docs
Gekkio Nov 21, 2014
7191cd9
lldb: Clean up struct printing
richo Nov 21, 2014
68f90a2
compiletest: namespaced enums fallout
richo Nov 21, 2014
4c36ad0
Add `weak_count` and `strong_count` to Rc and Arc
scialex Nov 20, 2014
7ce2d9c
libs: stabilize ascii module
aturon Nov 21, 2014
6733d8b
Fallout from deprecation
aturon Nov 21, 2014
1684419
Register new snapshots
alexcrichton Nov 21, 2014
69861df
Shuffle locations for Deref
Nov 21, 2014
ab85448
args() doc: Fix a documentation line.
jashank Nov 22, 2014
0beaccb
Rename variables called pq to heap
mcpherrinm Nov 22, 2014
46bdb45
Merge pull request #1 from rust-lang/master
petrochenkov Nov 22, 2014
97d4354
DSTify free functions in std::hash
petrochenkov Nov 22, 2014
9f15ccb
Fix pretty printing unsafe match arms
aochagavia Nov 22, 2014
d678684
Add test
aochagavia Nov 22, 2014
1b17eef
Any: use plain transmute instead of transmute_copy for downcasting.
reem Nov 23, 2014
e83785c
save-analysis: emit a type for enum variants
nrc Nov 23, 2014
34c7664
save-analysis: add values for types
nrc Nov 23, 2014
b637a86
Fix typo in Result documentation
nicholasbishop Nov 23, 2014
2f0249b
Highlight trait methods in rustdoc’s search results
ftxqxd Nov 22, 2014
6b5655c
Make rustdoc display `extern crate` statements correctly
ftxqxd Nov 22, 2014
55af4af
Change how rustdoc shows constants and statics to be more similar to …
ftxqxd Nov 22, 2014
9a857b4
libsyntax: Forbid type parameters in tuple indices
aochagavia Nov 22, 2014
3531697
Remove type parameters from ExprField and ExprTupField
aochagavia Nov 23, 2014
40e1f8f
Add test
aochagavia Nov 23, 2014
6ffb7f0
fix for PR#16552 implementation on windows: CFG_LIBDIR should be alwa…
jauhien Nov 23, 2014
f90471e
rollup merge of #19161: jmesmon/mk-fixes
Nov 23, 2014
ab8d811
rollup merge of #19166: richo/lldb-cleanups
Nov 23, 2014
1e5de8c
rollup merge of #19184: Gekkio/fix-binary-format-char
Nov 23, 2014
77d1f0b
rollup merge of #19193: scialex/rc-counts
Nov 23, 2014
b21b480
rollup merge of #19194: aturon/stab-ascii
Nov 23, 2014
7b2122b
rollup merge of #19198: alexcrichton/snapshots
Nov 23, 2014
9d72118
rollup merge of #19204: mcpherrinm/master
Nov 23, 2014
072015e
rollup merge of #19205: jashank/docs-fix
Nov 23, 2014
5ad1512
rollup merge of #19210: petrochenkov/master
Nov 23, 2014
3594c58
rollup merge of #19211: aochagavia/tuple-index
Nov 23, 2014
4dbd657
rollup merge of #19215: aochagavia/pretty
Nov 23, 2014
11700cb
rollup merge of #19225: reem/any-unnecessary-transmute-copy
Nov 23, 2014
34ab154
rollup merge of #19230: nick29581/dxr-values
Nov 23, 2014
e9fcfe6
rollup merge of #19232: nicholasbishop/bishop_fix_result_typo
Nov 23, 2014
593af62
rollup merge of #19234: P1start/rustdoc-misc
Nov 23, 2014
69a217f
rollup merge of #19239: jauhien/fix-libdir
Nov 23, 2014
d6b023a
Fixes to the roll-up
Nov 23, 2014
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
Prev Previous commit
Next Next commit
mk/rt: use CFG_LLVM_TARGET instead of plain target when calling llc
We add CFG_LLVM_TARGET_$(target) (which can be defined in any of the
mk/cfg/* files) and supply a default to the plain target name

CFG_LLVM_TARGET mirrors the value of llvm_target (aka llvm-target) in
the librustc_back runtime target specification.
  • Loading branch information
codyps committed Nov 20, 2014
commit 12749fc8ec3f110d3fb8057b955c7fab98f85730
7 changes: 5 additions & 2 deletions mk/main.mk
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,14 @@ endif
# Target-and-rule "utility variables"
######################################################################

define DEF_X
define DEF_FOR_TARGET
X_$(1) := $(CFG_EXE_SUFFIX_$(1))
ifndef CFG_LLVM_TARGET_$(1)
CFG_LLVM_TARGET_$(1) := $(1)
endif
endef
$(foreach target,$(CFG_TARGET), \
$(eval $(call DEF_X,$(target))))
$(eval $(call DEF_FOR_TARGET,$(target))))

# "Source" files we generate in builddir along the way.
GENERATED :=
Expand Down
2 changes: 1 addition & 1 deletion mk/rt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ $$(RT_OUTPUT_DIR_$(1))/%.o: $(S)src/rt/%.ll $$(MKFILE_DEPS) \
@mkdir -p $$(@D)
@$$(call E, compile: $$@)
$$(Q)$$(LLC_$$(CFG_BUILD)) $$(CFG_LLC_FLAGS_$(1)) \
-filetype=obj -mtriple=$(1) -relocation-model=pic -o $$@ $$<
-filetype=obj -mtriple=$$(CFG_LLVM_TARGET_$(1)) -relocation-model=pic -o $$@ $$<

$$(RT_OUTPUT_DIR_$(1))/%.o: $(S)src/rt/%.c $$(MKFILE_DEPS)
@mkdir -p $$(@D)
Expand Down