Skip to content

Commit 8b2e31f

Browse files
committed
---
yaml --- r: 272767 b: refs/heads/beta c: 34aed8f h: refs/heads/master i: 272765: ac068e7 272763: 5714824 272759: 417b6d1 272751: 90baa0e 272735: cad5a66 272703: c775b32 272639: 567c99f
1 parent e537173 commit 8b2e31f

File tree

372 files changed

+2682
-3608
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

372 files changed

+2682
-3608
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 493d999ffa44be6610441dabab80e18dda90015a
26+
refs/heads/beta: 34aed8f06237a5f53961de1e4bfc590d63deaa19
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/COMPILER_TESTS.md

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -42,43 +42,3 @@ whole, instead of just a few lines inside the test.
4242
* `ignore-test` always ignores the test
4343
* `ignore-lldb` and `ignore-gdb` will skip the debuginfo tests
4444
* `min-{gdb,lldb}-version`
45-
* `should-fail` indicates that the test should fail; used for "meta testing",
46-
where we test the compiletest program itself to check that it will generate
47-
errors in appropriate scenarios. This header is ignored for pretty-printer tests.
48-
49-
## Revisions
50-
51-
Certain classes of tests support "revisions" (as of the time of this
52-
writing, this includes run-pass, compile-fail, run-fail, and
53-
incremental, though incremental tests are somewhat
54-
different). Revisions allow a single test file to be used for multiple
55-
tests. This is done by adding a special header at the top of the file:
56-
57-
```
58-
// revisions: foo bar baz
59-
```
60-
61-
This will result in the test being compiled (and tested) three times,
62-
once with `--cfg foo`, once with `--cfg bar`, and once with `--cfg
63-
baz`. You can therefore use `#[cfg(foo)]` etc within the test to tweak
64-
each of these results.
65-
66-
You can also customize headers and expected error messages to a particular
67-
revision. To do this, add `[foo]` (or `bar`, `baz`, etc) after the `//`
68-
comment, like so:
69-
70-
```
71-
// A flag to pass in only for cfg `foo`:
72-
//[foo]compile-flags: -Z verbose
73-
74-
#[cfg(foo)]
75-
fn test_foo() {
76-
let x: usize = 32_u32; //[foo]~ ERROR mismatched types
77-
}
78-
```
79-
80-
Note that not all headers have meaning when customized too a revision.
81-
For example, the `ignore-test` header (and all "ignore" headers)
82-
currently only apply to the test as a whole, not to particular
83-
revisions. The only headers that are intended to really work when
84-
customized to a revision are error patterns and compiler flags.

branches/beta/Makefile.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@
100100
# // Having trouble figuring out which test is failing? Turn off parallel tests
101101
# make check-stage1-std RUST_TEST_THREADS=1
102102
#
103-
# // To make debug!() and other logging calls visible, reconfigure:
104-
# ./configure --enable-debug-assertions
105-
# make ....
106-
#
107103
# If you really feel like getting your hands dirty, then:
108104
#
109105
# run `make nitty-gritty`

branches/beta/RELEASES.md

Lines changed: 72 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,82 @@
11
Version 1.7.0 (2016-03-03)
22
==========================
33

4+
Language
5+
--------
6+
7+
* Soundness fixes to the interactions between associated types and
8+
lifetimes, specified in [RFC 1214], [now generate errors][1.7sf] for
9+
code that violates the new rules. This is a significant change that
10+
is known to break existing code, so it has emitted warnings for the
11+
new error cases since 1.4 to give crate authors time to adapt. The
12+
details of what is changing are subtle; read the RFC for more.
13+
414
Libraries
515
---------
616

7-
* Stabilized APIs
8-
* `Path`
9-
* [`Path::strip_prefix`][] (renamed from relative_from)
10-
* [`path::StripPrefixError`][] (new error type returned from strip_prefix)
11-
* `Ipv4Addr`
12-
* [`Ipv4Addr::is_loopback`]
13-
* [`Ipv4Addr::is_private`]
14-
* [`Ipv4Addr::is_link_local`]
15-
* [`Ipv4Addr::is_multicast`]
16-
* [`Ipv4Addr::is_broadcast`]
17-
* [`Ipv4Addr::is_documentation`]
18-
* `Ipv6Addr`
19-
* [`Ipv6Addr::is_unspecified`]
20-
* [`Ipv6Addr::is_loopback`]
21-
* [`Ipv6Addr::is_multicast`]
22-
* `Vec`
23-
* [`Vec::as_slice`]
24-
* [`Vec::as_mut_slice`]
25-
* `String`
26-
* [`String::as_str`]
27-
* [`String::as_mut_str`]
28-
* Slices
29-
* `<[T]>::`[`clone_from_slice`], which now requires the two slices to
30-
be the same length
31-
* `<[T]>::`[`sort_by_key`]
32-
* checked, saturated, and overflowing operations
33-
* [`i32::checked_rem`], [`i32::checked_neg`], [`i32::checked_shl`], [`i32::checked_shr`]
34-
* [`i32::saturating_mul`]
35-
* [`i32::overflowing_add`], [`i32::overflowing_sub`], [`i32::overflowing_mul`], [`i32::overflowing_div`]
36-
* [`i32::overflowing_rem`], [`i32::overflowing_neg`], [`i32::overflowing_shl`], [`i32::overflowing_shr`]
37-
* [`u32::checked_rem`], [`u32::checked_neg`], [`u32::checked_shl`], [`u32::checked_shl`]
38-
* [`u32::saturating_mul`]
39-
* [`u32::overflowing_add`], [`u32::overflowing_sub`], [`u32::overflowing_mul`], [`u32::overflowing_div`]
40-
* [`u32::overflowing_rem`], [`u32::overflowing_neg`], [`u32::overflowing_shl`], [`u32::overflowing_shr`]
41-
* and checked, saturated, and overflowing operations for other primitive types
42-
* FFI
43-
* [`ffi::IntoStringError`]
44-
* [`CString::into_string`]
45-
* [`CString::into_bytes`]
46-
* [`CString::into_bytes_with_nul`]
47-
* `From<CString> for Vec<u8>`
48-
* `IntoStringError`
49-
* [`IntoStringError::into_cstring`]
50-
* [`IntoStringError::utf8_error`]
51-
* `Error for IntoStringError`
52-
* Hashing
53-
* [`std::hash::BuildHasher`]
54-
* [`BuildHasher::Hasher`]
55-
* [`BuildHasher::build_hasher`]
56-
* [`std::hash::BuildHasherDefault`]
57-
* [`HashMap::with_hasher`]
58-
* [`HashMap::with_capacity_and_hasher`]
59-
* [`HashSet::with_hasher`]
60-
* [`HashSet::with_capacity_and_hasher`]
61-
* [`std::collections::hash_map::RandomState`]
62-
* [`RandomState::new`]
17+
* Stabilized APIs:
18+
[`Path::strip_prefix`][] (renamed from relative_from),
19+
[`path::StripPrefixError`][] (new error type returned from strip_prefix),
20+
[`Ipv4Addr::is_loopback`],
21+
[`Ipv4Addr::is_private`],
22+
[`Ipv4Addr::is_link_local`],
23+
[`Ipv4Addr::is_multicast`],
24+
[`Ipv4Addr::is_broadcast`],
25+
[`Ipv4Addr::is_documentation`],
26+
[`Ipv6Addr::is_unspecified`],
27+
[`Ipv6Addr::is_loopback`],
28+
[`Ipv6Addr::is_multicast`],
29+
[`Vec::as_slice`],
30+
[`Vec::as_mut_slice`],
31+
[`String::as_str`],
32+
[`String::as_mut_str`],
33+
`<[T]>::`[`clone_from_slice`], which now requires the two slices to
34+
be the same length
35+
`<[T]>::`[`sort_by_key`],
36+
[`i32::checked_rem`],
37+
[`i32::checked_neg`],
38+
[`i32::checked_shl`],
39+
[`i32::checked_shr`],
40+
[`i32::saturating_mul`],
41+
[`i32::overflowing_add`],
42+
[`i32::overflowing_sub`],
43+
[`i32::overflowing_mul`],
44+
[`i32::overflowing_div`],
45+
[`i32::overflowing_rem`],
46+
[`i32::overflowing_neg`],
47+
[`i32::overflowing_shl`],
48+
[`i32::overflowing_shr`],
49+
[`u32::checked_rem`],
50+
[`u32::checked_neg`],
51+
[`u32::checked_shl`],
52+
[`u32::checked_shl`],
53+
[`u32::saturating_mul`],
54+
[`u32::overflowing_add`],
55+
[`u32::overflowing_sub`],
56+
[`u32::overflowing_mul`],
57+
[`u32::overflowing_div`],
58+
[`u32::overflowing_rem`],
59+
[`u32::overflowing_neg`],
60+
[`u32::overflowing_shl`],
61+
[`u32::overflowing_shr`],
62+
checked, saturated, and overflowing operations for other primitive types,
63+
[`ffi::IntoStringError`],
64+
[`CString::into_string`],
65+
[`CString::into_bytes`],
66+
[`CString::into_bytes_with_nul`],
67+
`From<CString> for Vec<u8>`,
68+
[`IntoStringError::into_cstring`],
69+
[`IntoStringError::utf8_error`],
70+
`Error for IntoStringError`.
6371
* [Validating UTF-8 is faster by a factor of between 7 and 14x for
6472
ASCII input][1.7utf8]. This means that creating `String`s and `str`s
6573
from bytes is faster.
6674
* [The performance of `LineWriter` (and thus `io::stdout`) was
6775
improved by using `memchr` to search for newlines][1.7m].
6876
* [`f32::to_degrees` and `f32::to_radians` are stable][1.7f]. The
6977
`f64` variants were stabilized previously.
70-
* [`BTreeMap` was rewritten to use less memory and improve the performance
71-
of insertion and iteration, the latter by as much as 5x][1.7bm].
78+
* [`BTreeMap` was rewritten to use less memory improve performance of
79+
insertion and iteration, the latter by as much as 5x`][1.7bm].
7280
* [`BTreeSet` and its iterators, `Iter`, `IntoIter`, and `Range` are
7381
covariant over their contained type][1.7bt].
7482
* [`LinkedList` and its iterators, `Iter` and `IntoIter` are covariant
@@ -81,6 +89,9 @@ Libraries
8189
Misc
8290
----
8391

92+
* [The `--error-format=json` flag to `rustc` causes it to emit errors
93+
in JSON format][1.7j]. This is an unstable flag and so also requires
94+
the `-Z unstable-options` flag.
8495
* [When running tests with `--test`, rustdoc will pass `--cfg`
8596
arguments to the compiler][1.7dt].
8697
* [The compiler is built with RPATH information by default][1.7rpa].
@@ -102,12 +113,6 @@ Cargo
102113
Compatibility Notes
103114
-------------------
104115

105-
* Soundness fixes to the interactions between associated types and
106-
lifetimes, specified in [RFC 1214], [now generate errors][1.7sf] for
107-
code that violates the new rules. This is a significant change that
108-
is known to break existing code, so it has emitted warnings for the
109-
new error cases since 1.4 to give crate authors time to adapt. The
110-
details of what is changing are subtle; read the RFC for more.
111116
* [Several bugs in the compiler's visibility calculations were
112117
fixed][1.7v]. Since this was found to break significant amounts of
113118
code, the new errors will be emitted as warnings for several release
@@ -130,6 +135,7 @@ Compatibility Notes
130135
[1.7dta]: https://github.com/rust-lang/rust/pull/30394
131136
[1.7f]: https://github.com/rust-lang/rust/pull/30672
132137
[1.7h]: https://github.com/rust-lang/rust/pull/30818
138+
[1.7j]: https://github.com/rust-lang/rust/pull/30711
133139
[1.7ll]: https://github.com/rust-lang/rust/pull/30663
134140
[1.7m]: https://github.com/rust-lang/rust/pull/30381
135141
[1.7p]: https://github.com/rust-lang/rust/pull/30681
@@ -140,15 +146,11 @@ Compatibility Notes
140146
[1.7utf8]: https://github.com/rust-lang/rust/pull/30740
141147
[1.7v]: https://github.com/rust-lang/rust/pull/29973
142148
[RFC 1214]: https://github.com/rust-lang/rfcs/blob/master/text/1214-projections-lifetimes-and-wf.md
143-
[`BuildHasher::Hasher`]: http://doc.rust-lang.org/nightly/std/hash/trait.Hasher.html
144-
[`BuildHasher::build_hasher`]: http://doc.rust-lang.org/nightly/std/hash/trait.BuildHasher.html#tymethod.build_hasher
149+
[`clone_from_slice`]: http://doc.rust-lang.org/nightly/std/primitive.slice.html#method.clone_from_slice
150+
[`sort_by_key`]: http://doc.rust-lang.org/nightly/std/primitive.slice.html#method.sort_by_key
145151
[`CString::into_bytes_with_nul`]: http://doc.rust-lang.org/nightly/std/ffi/struct.CString.html#method.into_bytes_with_nul
146152
[`CString::into_bytes`]: http://doc.rust-lang.org/nightly/std/ffi/struct.CString.html#method.into_bytes
147153
[`CString::into_string`]: http://doc.rust-lang.org/nightly/std/ffi/struct.CString.html#method.into_string
148-
[`HashMap::with_capacity_and_hasher`]: http://doc.rust-lang.org/nightly/std/collections/struct.HashMap.html#method.with_capacity_and_hasher
149-
[`HashMap::with_hasher`]: http://doc.rust-lang.org/nightly/std/collections/struct.HashMap.html#method.with_hasher
150-
[`HashSet::with_capacity_and_hasher`]: http://doc.rust-lang.org/nightly/std/collections/struct.HashSet.html#method.with_capacity_and_hasher
151-
[`HashSet::with_hasher`]: http://doc.rust-lang.org/nightly/std/collections/struct.HashSet.html#method.with_hasher
152154
[`IntoStringError::into_cstring`]: http://doc.rust-lang.org/nightly/std/ffi/struct.IntoStringError.html#method.into_cstring
153155
[`IntoStringError::utf8_error`]: http://doc.rust-lang.org/nightly/std/ffi/struct.IntoStringError.html#method.utf8_error
154156
[`Ipv4Addr::is_broadcast`]: http://doc.rust-lang.org/nightly/std/net/struct.Ipv4Addr.html#method.is_broadcast
@@ -161,12 +163,10 @@ Compatibility Notes
161163
[`Ipv6Addr::is_multicast`]: http://doc.rust-lang.org/nightly/std/net/struct.Ipv6Addr.html#method.is_multicast
162164
[`Ipv6Addr::is_unspecified`]: http://doc.rust-lang.org/nightly/std/net/struct.Ipv6Addr.html#method.is_unspecified
163165
[`Path::strip_prefix`]: http://doc.rust-lang.org/nightly/std/path/struct.Path.html#method.strip_prefix
164-
[`RandomState::new`]: http://doc.rust-lang.org/nightly/std/collections/hash_map/struct.RandomState.html#method.new
165166
[`String::as_mut_str`]: http://doc.rust-lang.org/nightly/std/string/struct.String.html#method.as_mut_str
166167
[`String::as_str`]: http://doc.rust-lang.org/nightly/std/string/struct.String.html#method.as_str
167168
[`Vec::as_mut_slice`]: http://doc.rust-lang.org/nightly/std/vec/struct.Vec.html#method.as_mut_slice
168169
[`Vec::as_slice`]: http://doc.rust-lang.org/nightly/std/vec/struct.Vec.html#method.as_slice
169-
[`clone_from_slice`]: http://doc.rust-lang.org/nightly/std/primitive.slice.html#method.clone_from_slice
170170
[`ffi::IntoStringError`]: http://doc.rust-lang.org/nightly/std/ffi/struct.IntoStringError.html
171171
[`i32::checked_neg`]: http://doc.rust-lang.org/nightly/std/primitive.i32.html#method.checked_neg
172172
[`i32::checked_rem`]: http://doc.rust-lang.org/nightly/std/primitive.i32.html#method.checked_rem
@@ -182,13 +182,7 @@ Compatibility Notes
182182
[`i32::overflowing_sub`]: http://doc.rust-lang.org/nightly/std/primitive.i32.html#method.overflowing_sub
183183
[`i32::saturating_mul`]: http://doc.rust-lang.org/nightly/std/primitive.i32.html#method.saturating_mul
184184
[`path::StripPrefixError`]: http://doc.rust-lang.org/nightly/std/path/struct.StripPrefixError.html
185-
[`sort_by_key`]: http://doc.rust-lang.org/nightly/std/primitive.slice.html#method.sort_by_key
186-
[`std::collections::hash_map::RandomState`]: http://doc.rust-lang.org/nightly/std/collections/hash_map/struct.RandomState.html
187-
[`std::hash::BuildHasherDefault`]: http://doc.rust-lang.org/nightly/std/hash/struct.BuildHasherDefault.html
188-
[`std::hash::BuildHasher`]: http://doc.rust-lang.org/nightly/std/hash/trait.BuildHasher.html
189-
[`u32::checked_neg`]: http://doc.rust-lang.org/nightly/std/primitive.u32.html#method.checked_neg
190185
[`u32::checked_rem`]: http://doc.rust-lang.org/nightly/std/primitive.u32.html#method.checked_rem
191-
[`u32::checked_neg`]: http://doc.rust-lang.org/nightly/std/primitive.u32.html#method.checked_neg
192186
[`u32::checked_shl`]: http://doc.rust-lang.org/nightly/std/primitive.u32.html#method.checked_shl
193187
[`u32::overflowing_add`]: http://doc.rust-lang.org/nightly/std/primitive.u32.html#method.overflowing_add
194188
[`u32::overflowing_div`]: http://doc.rust-lang.org/nightly/std/primitive.u32.html#method.overflowing_div

branches/beta/configure

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,8 +865,9 @@ fi
865865
# Force bitrig to build with clang; gcc doesn't like us there
866866
if [ $CFG_OSTYPE = unknown-bitrig ]
867867
then
868-
step_msg "on Bitrig, forcing use of clang"
868+
step_msg "on Bitrig, forcing use of clang, disabling jemalloc"
869869
CFG_ENABLE_CLANG=1
870+
CFG_DISABLE_JEMALLOC=1
870871
fi
871872

872873
# default gcc version under OpenBSD maybe too old, try using egcc, which is a
@@ -886,6 +887,16 @@ then
886887
CXX="${CXX:-eg++}"
887888
fi
888889
fi
890+
891+
step_msg "on OpenBSD, disabling jemalloc"
892+
CFG_DISABLE_JEMALLOC=1
893+
fi
894+
895+
if [ $CFG_OSTYPE = pc-windows-gnu ]
896+
then
897+
# FIXME(#31030) - there's not a great reason to disable jemalloc here
898+
step_msg "on Windows, disabling jemalloc"
899+
CFG_DISABLE_JEMALLOC=1
889900
fi
890901

891902
# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
@@ -1175,6 +1186,12 @@ do
11751186
;;
11761187

11771188
*-msvc)
1189+
# Currently the build system is not configured to build jemalloc
1190+
# with MSVC, so we omit this optional dependency.
1191+
step_msg "targeting MSVC, disabling jemalloc"
1192+
CFG_DISABLE_JEMALLOC=1
1193+
putvar CFG_DISABLE_JEMALLOC
1194+
11781195
# There are some MSYS python builds which will auto-translate
11791196
# windows-style paths to MSYS-style paths in Python itself.
11801197
# Unfortunately this breaks LLVM's build system as somewhere along
@@ -1283,6 +1300,18 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake
12831300
putvar CFG_MSVC_LIB_PATH_${bits}
12841301
;;
12851302

1303+
*-rumprun-netbsd)
1304+
step_msg "targeting rumprun-netbsd, disabling jemalloc"
1305+
CFG_DISABLE_JEMALLOC=1
1306+
putvar CFG_DISABLE_JEMALLOC
1307+
;;
1308+
1309+
*-emscripten)
1310+
step_msg "targeting emscripten, disabling jemalloc"
1311+
CFG_DISABLE_JEMALLOC=1
1312+
putvar CFG_DISABLE_JEMALLOC
1313+
;;
1314+
12861315
*)
12871316
;;
12881317
esac

branches/beta/mk/cfg/asmjs-unknown-emscripten.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@ CFG_LDPATH_asmjs-unknown-emscripten :=
2121
CFG_RUN_asmjs-unknown-emscripten=$(2)
2222
CFG_RUN_TARG_asmjs-unknown-emscripten=$(call CFG_RUN_asmjs-unknown-emscripten,,$(2))
2323
CFG_GNU_TRIPLE_asmjs-unknown-emscripten := asmjs-unknown-emscripten
24-
CFG_DISABLE_JEMALLOC_asmjs-unknown-emscripten := 1

branches/beta/mk/cfg/i686-pc-windows-gnu.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,3 @@ CFG_GNU_TRIPLE_i686-pc-windows-gnu := i686-w64-mingw32
2525
CFG_THIRD_PARTY_OBJECTS_i686-pc-windows-gnu := crt2.o dllcrt2.o
2626
CFG_INSTALLED_OBJECTS_i686-pc-windows-gnu := crt2.o dllcrt2.o rsbegin.o rsend.o
2727
CFG_RUSTRT_HAS_STARTUP_OBJS_i686-pc-windows-gnu := 1
28-
# FIXME(#31030) - there's not a great reason to disable jemalloc here
29-
CFG_DISABLE_JEMALLOC_i686-pc-windows-gnu := 1

branches/beta/mk/cfg/i686-pc-windows-msvc.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,3 @@ CFG_LDPATH_i686-pc-windows-msvc :=
2222
CFG_RUN_i686-pc-windows-msvc=$(2)
2323
CFG_RUN_TARG_i686-pc-windows-msvc=$(call CFG_RUN_i686-pc-windows-msvc,,$(2))
2424
CFG_GNU_TRIPLE_i686-pc-windows-msvc := i686-pc-win32
25-
26-
# Currently the build system is not configured to build jemalloc
27-
# with MSVC, so we omit this optional dependency.
28-
CFG_DISABLE_JEMALLOC_i686-pc-windows-msvc := 1

branches/beta/mk/cfg/x86_64-pc-windows-gnu.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,3 @@ CFG_GNU_TRIPLE_x86_64-pc-windows-gnu := x86_64-w64-mingw32
2525
CFG_THIRD_PARTY_OBJECTS_x86_64-pc-windows-gnu := crt2.o dllcrt2.o
2626
CFG_INSTALLED_OBJECTS_x86_64-pc-windows-gnu := crt2.o dllcrt2.o rsbegin.o rsend.o
2727
CFG_RUSTRT_HAS_STARTUP_OBJS_x86_64-pc-windows-gnu := 1
28-
# FIXME(#31030) - there's not a great reason to disable jemalloc here
29-
CFG_DISABLE_JEMALLOC_x86_64-pc-windows-gnu := 1

branches/beta/mk/cfg/x86_64-pc-windows-msvc.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,3 @@ CFG_LDPATH_x86_64-pc-windows-msvc :=
2222
CFG_RUN_x86_64-pc-windows-msvc=$(2)
2323
CFG_RUN_TARG_x86_64-pc-windows-msvc=$(call CFG_RUN_x86_64-pc-windows-msvc,,$(2))
2424
CFG_GNU_TRIPLE_x86_64-pc-windows-msvc := x86_64-pc-win32
25-
26-
# Currently the build system is not configured to build jemalloc
27-
# with MSVC, so we omit this optional dependency.
28-
CFG_DISABLE_JEMALLOC_x86_64-pc-windows-msvc := 1

branches/beta/mk/cfg/x86_64-rumprun-netbsd.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@ CFG_LDPATH_x86_64-rumprun-netbsd :=
2222
CFG_RUN_x86_64-rumprun-netbsd=$(2)
2323
CFG_RUN_TARG_x86_64-rumprun-netbsd=$(call CFG_RUN_x86_64-rumprun-netbsd,,$(2))
2424
CFG_GNU_TRIPLE_x86_64-rumprun-netbsd := x86_64-rumprun-netbsd
25-
CFG_DISABLE_JEMALLOC_x86_64-rumprun-netbsd := 1

branches/beta/mk/cfg/x86_64-unknown-bitrig.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ CFG_LDPATH_x86_64-unknown-bitrig :=
2020
CFG_RUN_x86_64-unknown-bitrig=$(2)
2121
CFG_RUN_TARG_x86_64-unknown-bitrig=$(call CFG_RUN_x86_64-unknown-bitrig,,$(2))
2222
CFG_GNU_TRIPLE_x86_64-unknown-bitrig := x86_64-unknown-bitrig
23-
CFG_DISABLE_JEMALLOC_x86_64-unknown-bitrig := 1

branches/beta/mk/cfg/x86_64-unknown-openbsd.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@ CFG_RUN_x86_64-unknown-openbsd=$(2)
2121
CFG_RUN_TARG_x86_64-unknown-openbsd=$(call CFG_RUN_x86_64-unknown-openbsd,,$(2))
2222
CFG_GNU_TRIPLE_x86_64-unknown-openbsd := x86_64-unknown-openbsd
2323
RUSTC_FLAGS_x86_64-unknown-openbsd=-C linker=$(call FIND_COMPILER,$(CC))
24-
CFG_DISABLE_JEMALLOC_x86_64-unknown-openbsd := 1

0 commit comments

Comments
 (0)