Skip to content

Commit 947301b

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 151537 b: refs/heads/try2 c: 30927f1 h: refs/heads/master i: 151535: 8893e0c v: v3
1 parent 1514260 commit 947301b

File tree

160 files changed

+1064
-1364
lines changed

Some content is hidden

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

160 files changed

+1064
-1364
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 032510bae206a789ce9a18f1c8d692f6120591ab
8+
refs/heads/try2: 30927f15b76e68ae9f08c463041f77b72c37095e
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ src/etc/pkg/rust-logo.ico binary
88
src/etc/pkg/rust-logo.png binary
99
src/rt/msvc/* -whitespace
1010
src/rt/vg/* -whitespace
11+
src/rt/jemalloc/**/* -whitespace

‎branches/try2/.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,3 @@
1515
[submodule "src/rt/hoedown"]
1616
path = src/rt/hoedown
1717
url = https://github.com/rust-lang/hoedown.git
18-
[submodule "src/jemalloc"]
19-
path = src/jemalloc
20-
url = https://github.com/rust-lang/jemalloc.git

‎branches/try2/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,6 @@ do
782782
for s in 0 1 2 3
783783
do
784784
make_dir $t/rt/stage$s
785-
make_dir $t/rt/jemalloc
786785
make_dir $t/rt/libuv
787786
make_dir $t/rt/libuv/src/ares
788787
make_dir $t/rt/libuv/src/eio

‎branches/try2/mk/crates.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5757
TOOLS := compiletest rustdoc rustc
5858

5959
DEPS_core :=
60-
DEPS_std := core libc native:rustrt native:compiler-rt native:backtrace native:jemalloc
60+
DEPS_std := core libc native:rustrt native:compiler-rt native:backtrace
6161
DEPS_green := std rand native:context_switch
6262
DEPS_rustuv := std native:uv native:uv_support
6363
DEPS_native := std

‎branches/try2/mk/platform.mk

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ CFG_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).so
145145
CFG_STATIC_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).a
146146
CFG_LIB_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.so
147147
CFG_LIB_DSYM_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
148-
CFG_CFLAGS_x86_64-unknown-linux-gnu := -m64
149148
CFG_GCCISH_CFLAGS_x86_64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64
150149
CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-gnu := -fno-rtti
151150
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m64
@@ -173,7 +172,6 @@ CFG_LIB_NAME_i686-unknown-linux-gnu=lib$(1).so
173172
CFG_STATIC_LIB_NAME_i686-unknown-linux-gnu=lib$(1).a
174173
CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
175174
CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
176-
CFG_CFLAGS_i686-unknown-linux-gnu := -m32
177175
CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32
178176
CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti
179177
CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32
@@ -203,7 +201,6 @@ AR_arm-apple-darwin = $(shell xcrun -find -sdk iphoneos ar)
203201
CFG_LIB_NAME_arm-apple-darwin = lib$(1).dylib
204202
CFG_LIB_GLOB_arm-apple-darwin = lib$(1)-*.dylib
205203
CFG_LIB_DSYM_GLOB_arm-apple-darwin = lib$(1)-*.dylib.dSYM
206-
CFG_CFLAGS_arm-apple-darwin := $(CFG_IOS_FLAGS)
207204
CFG_GCCISH_CFLAGS_arm-apple-darwin := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS)
208205
CFG_GCCISH_CXXFLAGS_arm-apple-darwin := -fno-rtti $(CFG_IOS_FLAGS)
209206
CFG_GCCISH_LINK_FLAGS_arm-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind
@@ -232,7 +229,6 @@ CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
232229
CFG_STATIC_LIB_NAME_x86_64-apple-darwin=lib$(1).a
233230
CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
234231
CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM
235-
CFG_CFLAGS_x86_64-apple-darwin := -m64 -arch x86_64
236232
CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64
237233
CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti
238234
CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread -framework CoreServices -m64
@@ -260,7 +256,6 @@ CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib
260256
CFG_STATIC_LIB_NAME_i686-apple-darwin=lib$(1).a
261257
CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
262258
CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
263-
CFG_CFLAGS_i686-apple-darwin := -m32 -arch i386
264259
CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386
265260
CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti
266261
CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread -framework CoreServices -m32
@@ -288,7 +283,6 @@ CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so
288283
CFG_STATIC_LIB_NAME_arm-linux-androideabi=lib$(1).a
289284
CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so
290285
CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM
291-
CFG_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__
292286
CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__
293287
CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti
294288
CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++
@@ -319,7 +313,6 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so
319313
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a
320314
CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so
321315
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
322-
CFG_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__
323316
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__
324317
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabihf := -fno-rtti
325318
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabihf := -shared -fPIC -g
@@ -350,7 +343,6 @@ CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
350343
CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
351344
CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
352345
CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
353-
CFG_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp
354346
CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfpu=vfp
355347
CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti
356348
CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g
@@ -380,7 +372,6 @@ CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so
380372
CFG_STATIC_LIB_NAME_mips-unknown-linux-gnu=lib$(1).a
381373
CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so
382374
CFG_LIB_DSYM_GLOB_mips-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
383-
CFG_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 -mno-compact-eh
384375
CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 -mno-compact-eh
385376
CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti
386377
CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32
@@ -409,7 +400,6 @@ CFG_LIB_NAME_i686-pc-mingw32=$(1).dll
409400
CFG_STATIC_LIB_NAME_i686-pc-mingw32=$(1).lib
410401
CFG_LIB_GLOB_i686-pc-mingw32=$(1)-*.dll
411402
CFG_LIB_DSYM_GLOB_i686-pc-mingw32=$(1)-*.dylib.dSYM
412-
CFG_CFLAGS_mips-i686-pc-mingw32 := -m32 -march=i686 -D_WIN32_WINNT=0x0600
413403
CFG_GCCISH_CFLAGS_i686-pc-mingw32 := -Wall -Werror -g -m32 -march=i686 -D_WIN32_WINNT=0x0600 -I$(CFG_SRC_DIR)src/etc/mingw-fix-include
414404
CFG_GCCISH_CXXFLAGS_i686-pc-mingw32 := -fno-rtti
415405
CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g -m32
@@ -438,7 +428,6 @@ CFG_LIB_NAME_i586-mingw32msvc=$(1).dll
438428
CFG_STATIC_LIB_NAME_i586-mingw32msvc=$(1).lib
439429
CFG_LIB_GLOB_i586-mingw32msvc=$(1)-*.dll
440430
CFG_LIB_DSYM_GLOB_i586-mingw32msvc=$(1)-*.dylib.dSYM
441-
CFG_CFLAGS_i586-mingw32msvc := -march=i586 -m32
442431
CFG_GCCISH_CFLAGS_i586-mingw32msvc := -Wall -Werror -g -march=i586 -m32
443432
CFG_GCCISH_CXXFLAGS_i586-mingw32msvc := -fno-rtti
444433
CFG_GCCISH_LINK_FLAGS_i586-mingw32msvc := -shared -g -m32
@@ -469,7 +458,6 @@ CFG_LIB_NAME_i686-w64-mingw32=$(1).dll
469458
CFG_STATIC_LIB_NAME_i686-w64-mingw32=$(1).lib
470459
CFG_LIB_GLOB_i686-w64-mingw32=$(1)-*.dll
471460
CFG_LIB_DSYM_GLOB_i686-w64-mingw32=$(1)-*.dylib.dSYM
472-
CFG_CFLAGS_i586-w64-mingw32 := -march=i586 -m32 -D_WIN32_WINNT=0x0600
473461
CFG_GCCISH_CFLAGS_i686-w64-mingw32 := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600
474462
CFG_GCCISH_CXXFLAGS_i686-w64-mingw32 := -fno-rtti
475463
CFG_GCCISH_LINK_FLAGS_i686-w64-mingw32 := -shared -g -m32
@@ -499,7 +487,6 @@ CFG_LIB_NAME_x86_64-w64-mingw32=$(1).dll
499487
CFG_STATIC_LIB_NAME_x86_64-w64-mingw32=$(1).lib
500488
CFG_LIB_GLOB_x86_64-w64-mingw32=$(1)-*.dll
501489
CFG_LIB_DSYM_GLOB_x86_64-w64-mingw32=$(1)-*.dylib.dSYM
502-
CFG_CFLAGS_x86_64-w64-mingw32 := -m64 -D_WIN32_WINNT=0x0600
503490
CFG_GCCISH_CFLAGS_x86_64-w64-mingw32 := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600
504491
CFG_GCCISH_CXXFLAGS_x86_64-w64-mingw32 := -fno-rtti
505492
CFG_GCCISH_LINK_FLAGS_x86_64-w64-mingw32 := -shared -g -m64
@@ -528,7 +515,6 @@ CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so
528515
CFG_STATIC_LIB_NAME_x86_64-unknown-freebsd=lib$(1).a
529516
CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so
530517
CFG_LIB_DSYM_GLOB_x86_64-unknown-freebsd=$(1)-*.dylib.dSYM
531-
CFG_CFLAGS_x86_64-unknown-freebsd := -I/usr/local/include
532518
CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include
533519
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -pthread -lrt
534520
CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=

‎branches/try2/mk/rt.mk

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,10 @@ $(foreach lib,$(NATIVE_LIBS), \
122122
################################################################################
123123
# Building third-party targets with external build systems
124124
#
125-
# This location is meant for dependencies which have external build systems. It
126-
# is still assumed that the output of each of these steps is a static library
127-
# in the correct location.
128-
################################################################################
129-
130-
################################################################################
131-
# libuv
125+
# The only current member of this section is libuv, but long ago this used to
126+
# also be occupied by jemalloc. This location is meant for dependencies which
127+
# have external build systems. It is still assumed that the output of each of
128+
# these steps is a static library in the correct location.
132129
################################################################################
133130

134131
define DEF_LIBUV_ARCH_VAR
@@ -157,19 +154,13 @@ define DEF_THIRD_PARTY_TARGETS
157154

158155
ifeq ($$(CFG_WINDOWSY_$(1)), 1)
159156
LIBUV_OSTYPE_$(1) := win
160-
# This isn't necessarily a desired option, but it's harmless and works around
161-
# what appears to be a mingw-w64 bug.
162-
#
163-
# https://sourceforge.net/p/mingw-w64/bugs/395/
164-
JEMALLOC_ARGS_$(1) := --enable-lazy-lock
165157
else ifeq ($(OSTYPE_$(1)), apple-darwin)
166158
LIBUV_OSTYPE_$(1) := mac
167159
else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
168160
LIBUV_OSTYPE_$(1) := freebsd
169161
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
170162
LIBUV_OSTYPE_$(1) := android
171163
LIBUV_ARGS_$(1) := PLATFORM=android host=android OS=linux
172-
JEMALLOC_ARGS_$(1) := --disable-tls
173164
else
174165
LIBUV_OSTYPE_$(1) := linux
175166
endif
@@ -229,41 +220,6 @@ $$(LIBUV_DIR_$(1))/Release/libuv.a: $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) \
229220

230221
endif
231222

232-
################################################################################
233-
# jemalloc
234-
################################################################################
235-
236-
ifdef CFG_ENABLE_FAST_MAKE
237-
JEMALLOC_DEPS := $(S)/.gitmodules
238-
else
239-
JEMALLOC_DEPS := $(wildcard \
240-
$(S)src/jemalloc/* \
241-
$(S)src/jemalloc/*/* \
242-
$(S)src/jemalloc/*/*/* \
243-
$(S)src/jemalloc/*/*/*/*)
244-
endif
245-
246-
JEMALLOC_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),jemalloc)
247-
ifeq ($$(CFG_WINDOWSY_$(1)),1)
248-
JEMALLOC_REAL_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),jemalloc_s)
249-
else
250-
JEMALLOC_REAL_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),jemalloc_pic)
251-
endif
252-
JEMALLOC_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(JEMALLOC_NAME_$(1))
253-
JEMALLOC_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/jemalloc
254-
255-
$$(JEMALLOC_LIB_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS)
256-
@$$(call E, make: jemalloc)
257-
cd "$$(JEMALLOC_BUILD_DIR_$(1))"; "$(S)src/jemalloc/configure" \
258-
$$(JEMALLOC_ARGS_$(1)) --enable-cc-silence --with-jemalloc-prefix=je_ \
259-
--disable-experimental --build=$(CFG_BUILD) --host=$(1) \
260-
CC="$$(CC_$(1))" \
261-
AR="$$(AR_$(1))" \
262-
RANLIB="$$(AR_$(1)) s" \
263-
EXTRA_CFLAGS="$$(CFG_CFLAGS_$(1))"
264-
$$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static
265-
$$(Q)cp $$(JEMALLOC_BUILD_DIR_$(1))/lib/$$(JEMALLOC_REAL_NAME_$(1)) $$(JEMALLOC_LIB_$(1))
266-
267223
################################################################################
268224
# compiler-rt
269225
################################################################################

‎branches/try2/mk/tests.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
240240
tidy:
241241
@$(call E, check: formatting)
242242
$(Q)find $(S)src -name '*.r[sc]' \
243-
| grep '^$(S)src/jemalloc' -v \
244243
| grep '^$(S)src/libuv' -v \
245244
| grep '^$(S)src/llvm' -v \
246245
| grep '^$(S)src/gyp' -v \
@@ -265,9 +264,8 @@ tidy:
265264
$(Q)find $(S)src -type f -perm +111 \
266265
-not -name '*.rs' -and -not -name '*.py' \
267266
-and -not -name '*.sh' \
268-
| grep '^$(S)src/jemalloc' -v \
269-
| grep '^$(S)src/libuv' -v \
270267
| grep '^$(S)src/llvm' -v \
268+
| grep '^$(S)src/libuv' -v \
271269
| grep '^$(S)src/rt/hoedown' -v \
272270
| grep '^$(S)src/gyp' -v \
273271
| grep '^$(S)src/etc' -v \

‎branches/try2/src/doc/guide-unsafe.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ restrictions is undefined behaviour. For example, the following
6666
creates two aliasing `&mut` pointers, and is invalid.
6767

6868
```
69-
use std::mem;
69+
use std::cast;
7070
let mut x: u8 = 1;
7171
7272
let ref_1: &mut u8 = &mut x;
73-
let ref_2: &mut u8 = unsafe { mem::transmute(&mut *ref_1) };
73+
let ref_2: &mut u8 = unsafe { cast::transmute_mut_lifetime(ref_1) };
7474
7575
// oops, ref_1 and ref_2 point to the same piece of data (x) and are
7676
// both usable

‎branches/try2/src/doc/rust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1402,7 +1402,7 @@ to pointers to the trait name, used as a type.
14021402
let myshape: Box<Shape> = box mycircle as Box<Shape>;
14031403
~~~~
14041404

1405-
The resulting value is a box containing the value that was cast,
1405+
The resulting value is a managed box containing the value that was cast,
14061406
along with information that identifies the methods of the implementation that was used.
14071407
Values with a trait type can have [methods called](#method-call-expressions) on them,
14081408
for any method in the trait,

‎branches/try2/src/jemalloc

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)