Skip to content

Commit 0883f70

Browse files
youknowoneyouknowone
committed
---
yaml --- r: 140510 b: refs/heads/try2 c: cb918e1 h: refs/heads/master v: v3
1 parent f18c2b9 commit 0883f70

File tree

279 files changed

+5740
-15742
lines changed

Some content is hidden

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

279 files changed

+5740
-15742
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: 3225870191f7e6b601d70fa5aa08617eb04b170b
8+
refs/heads/try2: cb918e1a831782d6072a0b93dd57614cb9c2d961
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/Makefile.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ endif
110110
ifdef SAVE_TEMPS
111111
CFG_RUSTC_FLAGS += --save-temps
112112
endif
113-
ifdef ASM_COMMENTS
114-
CFG_RUSTC_FLAGS += -z asm-comments
115-
endif
116113
ifdef TIME_PASSES
117114
CFG_RUSTC_FLAGS += -Z time-passes
118115
endif

‎branches/try2/configure

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -439,10 +439,6 @@ then
439439
probe CFG_ZCAT zcat
440440
fi
441441

442-
step_msg "looking for target specific programs"
443-
444-
probe CFG_ADB adb
445-
446442
if [ ! -z "$CFG_PANDOC" ]
447443
then
448444
PV_MAJOR_MINOR=$(pandoc --version | grep '^pandoc ' |

‎branches/try2/doc/tutorial-ffi.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,11 @@ wrapping `malloc` and `free`:
150150

151151
~~~~
152152
use core::libc::{c_void, size_t, malloc, free};
153-
use core::unstable::intrinsics;
153+
154+
#[abi = "rust-intrinsic"]
155+
extern "rust-intrinsic" mod rusti {
156+
fn init<T>() -> T;
157+
}
154158
155159
// a wrapper around the handle returned by the foreign code
156160
pub struct Unique<T> {
@@ -162,8 +166,7 @@ pub impl<'self, T: Owned> Unique<T> {
162166
unsafe {
163167
let ptr = malloc(core::sys::size_of::<T>() as size_t) as *mut T;
164168
assert!(!ptr::is_null(ptr));
165-
// `*ptr` is uninitialized, and `*ptr = value` would attempt to destroy it
166-
intrinsics::move_val_init(&mut *ptr, value);
169+
*ptr = value;
167170
Unique{ptr: ptr}
168171
}
169172
}
@@ -183,7 +186,7 @@ pub impl<'self, T: Owned> Unique<T> {
183186
impl<T: Owned> Drop for Unique<T> {
184187
fn finalize(&self) {
185188
unsafe {
186-
let mut x = intrinsics::init(); // dummy value to swap in
189+
let mut x = rusti::init(); // dummy value to swap in
187190
x <-> *self.ptr; // moving the object out is needed to call the destructor
188191
free(self.ptr as *c_void)
189192
}

‎branches/try2/mk/host.mk

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ $$(HBIN$(2)_H_$(4))/rustc$$(X_$(4)): \
2929
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
3030
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
3131
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
32-
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
33-
| $$(HBIN$(2)_H_$(4))/
34-
32+
$$(HSTDLIB_DEFAULT$(2)_H_$(4))
3533
@$$(call E, cp: $$@)
3634
$$(Q)cp $$< $$@
3735

@@ -41,9 +39,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
4139
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
4240
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
4341
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
44-
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
45-
| $$(HLIB$(2)_H_$(4))/
46-
42+
$$(HSTDLIB_DEFAULT$(2)_H_$(4))
4743
@$$(call E, cp: $$@)
4844
$$(Q)cp $$< $$@
4945
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_GLOB_$(4)) \
@@ -55,24 +51,21 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
5551
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
5652
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
5753
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
58-
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
59-
| $$(HLIB$(2)_H_$(4))/
54+
$$(HSTDLIB_DEFAULT$(2)_H_$(4))
6055
@$$(call E, cp: $$@)
6156
$$(Q)cp $$< $$@
6257
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB_$(4)) \
6358
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_DSYM_GLOB_$(4))) \
6459
$$(HLIB$(2)_H_$(4))
6560

6661
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)): \
67-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUNTIME_$(4)) \
68-
| $$(HLIB$(2)_H_$(4))/
62+
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUNTIME_$(4))
6963
@$$(call E, cp: $$@)
7064
$$(Q)cp $$< $$@
7165

7266
$$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)): \
7367
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_CORELIB_$(4)) \
74-
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
75-
| $$(HLIB$(2)_H_$(4))/
68+
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4))
7669
@$$(call E, cp: $$@)
7770
$$(Q)cp $$< $$@
7871
# Subtle: We do not let the shell expand $(CORELIB_DSYM_GLOB) directly rather
@@ -89,8 +82,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)): \
8982
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
9083
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
9184
$$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)) \
92-
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
93-
| $$(HLIB$(2)_H_$(4))/
85+
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4))
9486
@$$(call E, cp: $$@)
9587
$$(Q)cp $$< $$@
9688
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB_$(4)) \
@@ -99,40 +91,30 @@ $$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
9991

10092
$$(HLIB$(2)_H_$(4))/libcore.rlib: \
10193
$$(TLIB$(1)_T_$(4)_H_$(3))/libcore.rlib \
102-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
103-
| $$(HLIB$(2)_H_$(4))/
94+
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4))
10495
@$$(call E, cp: $$@)
10596
$$(Q)cp $$< $$@
10697

10798
$$(HLIB$(2)_H_$(4))/libstd.rlib: \
10899
$$(TLIB$(1)_T_$(4)_H_$(3))/libstd.rlib \
109100
$$(HLIB$(2)_H_$(4))/libcore.rlib \
110-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
111-
| $$(HLIB$(2)_H_$(4))/
101+
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4))
112102
@$$(call E, cp: $$@)
113103
$$(Q)cp $$< $$@
114104

115105
$$(HLIB$(2)_H_$(4))/librustc.rlib: \
116106
$$(TLIB$(1)_T_$(4)_H_$(3))/librustc.rlib \
117107
$$(HLIB$(2)_H_$(4))/libcore.rlib \
118108
$$(HLIB$(2)_H_$(4))/libstd.rlib \
119-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
120-
| $$(HLIB$(2)_H_$(4))/
109+
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4))
121110
@$$(call E, cp: $$@)
122111
$$(Q)cp $$< $$@
123112

124113
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)): \
125-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUSTLLVM_$(4)) \
126-
| $$(HLIB$(2)_H_$(4))/
114+
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUSTLLVM_$(4))
127115
@$$(call E, cp: $$@)
128116
$$(Q)cp $$< $$@
129117

130-
$$(HBIN$(2)_H_$(4))/:
131-
mkdir -p $$@
132-
133-
$$(HLIB$(2)_H_$(4))/:
134-
mkdir -p $$@
135-
136118
endef
137119

138120
$(foreach t,$(CFG_HOST_TRIPLES), \

‎branches/try2/mk/install.mk

Lines changed: 0 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -154,76 +154,3 @@ uninstall:
154154
done
155155
$(Q)rm -Rf $(PHL)/rustc
156156
$(Q)rm -f $(PREFIX_ROOT)/share/man/man1/rustc.1
157-
158-
# target platform specific variables
159-
# for arm-linux-androidabi
160-
define DEF_ADB_DEVICE_STATUS
161-
CFG_ADB_DEVICE_STATUS=$(1)
162-
endef
163-
164-
$(foreach target,$(CFG_TARGET_TRIPLES), \
165-
$(if $(findstring $(target),"arm-linux-androideabi"), \
166-
$(if $(findstring adb,$(CFG_ADB)), \
167-
$(if $(findstring device,$(shell adb devices 2>/dev/null | grep -E '^[_A-Za-z0-9-]+[[:blank:]]+device')), \
168-
$(info install: install-runtime-target for $(target) enabled \
169-
$(info install: android device attached) \
170-
$(eval $(call DEF_ADB_DEVICE_STATUS, true))), \
171-
$(info install: install-runtime-target for $(target) disabled \
172-
$(info install: android device not attached) \
173-
$(eval $(call DEF_ADB_DEVICE_STATUS, false))) \
174-
), \
175-
$(info install: install-runtime-target for $(target) disabled \
176-
$(info install: adb not found) \
177-
$(eval $(call DEF_ADB_DEVICE_STATUS, false))) \
178-
), \
179-
) \
180-
)
181-
182-
ifeq (install-runtime-target,$(firstword $(MAKECMDGOALS)))
183-
$(eval $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS)):;@:)
184-
L_TOKEN := $(word 2,$(MAKECMDGOALS))
185-
ifeq ($(L_TOKEN),)
186-
CFG_RUNTIME_PUSH_DIR=/system/lib
187-
else
188-
CFG_RUNTIME_PUSH_DIR=$(L_TOKEN)
189-
endif
190-
191-
ifeq ($(CFG_ADB_DEVICE_STATUS),true)
192-
ifdef VERBOSE
193-
ADB = adb $(1)
194-
ADB_PUSH = adb push $(1) $(2)
195-
ADB_SHELL = adb shell $(1) $(2)
196-
else
197-
ADB = $(Q)$(call E, adb $(1)) && adb $(1) 1>/dev/null
198-
ADB_PUSH = $(Q)$(call E, adb push $(1)) && adb push $(1) $(2) 1>/dev/null
199-
ADB_SHELL = $(Q)$(call E, adb shell $(1) $(2)) && adb shell $(1) $(2) 1>/dev/null
200-
endif
201-
202-
define INSTALL_RUNTIME_TARGET_N
203-
install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
204-
$(Q)$(call ADB_SHELL,mkdir,$(CFG_RUNTIME_PUSH_DIR))
205-
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(CFG_RUNTIME_$(1)),$(CFG_RUNTIME_PUSH_DIR))
206-
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(CORELIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
207-
$(Q)$(call ADB_PUSH,$$(TL$(1)$(2))/$$(STDLIB_GLOB_$(1)),$(CFG_RUNTIME_PUSH_DIR))
208-
endef
209-
210-
define INSTALL_RUNTIME_TARGET_CLEANUP_N
211-
install-runtime-target-$(1)-cleanup:
212-
$(Q)$(call ADB,remount)
213-
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(CFG_RUNTIME_$(1)))
214-
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(CORELIB_GLOB_$(1)))
215-
$(Q)$(call ADB_SHELL,rm,$(CFG_RUNTIME_PUSH_DIR)/$(STDLIB_GLOB_$(1)))
216-
endef
217-
218-
$(eval $(call INSTALL_RUNTIME_TARGET_N,arm-linux-androideabi,$(CFG_BUILD_TRIPLE)))
219-
$(eval $(call INSTALL_RUNTIME_TARGET_CLEANUP_N,arm-linux-androideabi))
220-
221-
install-runtime-target: \
222-
install-runtime-target-arm-linux-androideabi-cleanup \
223-
install-runtime-target-arm-linux-androideabi-host-$(CFG_BUILD_TRIPLE)
224-
else
225-
install-runtime-target:
226-
@echo "No device to install runtime library"
227-
@echo
228-
endif
229-
endif

‎branches/try2/mk/target.mk

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,62 +18,54 @@
1818
define TARGET_STAGE_N
1919

2020
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \
21-
rt/$(2)/arch/$$(HOST_$(2))/libmorestack.a \
22-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
21+
rt/$(2)/arch/$$(HOST_$(2))/libmorestack.a
2322
@$$(call E, cp: $$@)
2423
$$(Q)cp $$< $$@
2524

2625
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2)): \
27-
rt/$(2)/$(CFG_RUNTIME_$(2)) \
28-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
26+
rt/$(2)/$(CFG_RUNTIME_$(2))
2927
@$$(call E, cp: $$@)
3028
$$(Q)cp $$< $$@
3129

3230
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)): \
3331
$$(CORELIB_CRATE) $$(CORELIB_INPUTS) \
34-
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
35-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
32+
$$(TSREQ$(1)_T_$(2)_H_$(3))
3633
@$$(call E, compile_and_link: $$@)
3734
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
3835

3936
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)): \
4037
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
4138
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
42-
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
43-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
39+
$$(TSREQ$(1)_T_$(2)_H_$(3))
4440
@$$(call E, compile_and_link: $$@)
4541
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
4642

4743
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
4844
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
4945
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
5046
$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3)) \
51-
$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3)) \
52-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
47+
$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3))
5348
@$$(call E, compile_and_link: $$@)
5449
$$(STAGE$(1)_T_$(2)_H_$(3)) $(BORROWCK) -o $$@ $$< && touch $$@
5550

5651
# Only build the compiler for host triples
5752
ifneq ($$(findstring $(2),$$(CFG_HOST_TRIPLES)),)
5853

5954
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)): \
60-
rustllvm/$(2)/$(CFG_RUSTLLVM_$(3)) \
61-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
55+
rustllvm/$(2)/$(CFG_RUSTLLVM_$(3))
6256
@$$(call E, cp: $$@)
6357
$$(Q)cp $$< $$@
6458

6559
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
6660
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
6761
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)) \
68-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
69-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
62+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3))
7063
@$$(call E, compile_and_link: $$@)
7164
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
7265

7366
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \
74-
$$(DRIVER_CRATE) \
75-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)) \
76-
| $$(TBIN$(1)_T_$(2)_H_$(3))/
67+
$$(DRIVER_CRATE) \
68+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3))
7769
@$$(call E, compile_and_link: $$@)
7870
$$(STAGE$(1)_T_$(2)_H_$(3)) --cfg rustc -o $$@ $$<
7971
ifdef CFG_ENABLE_PAX_FLAGS
@@ -83,12 +75,6 @@ endif
8375

8476
endif
8577

86-
$$(TBIN$(1)_T_$(2)_H_$(3))/:
87-
mkdir -p $$@
88-
89-
$$(TLIB$(1)_T_$(2)_H_$(3))/:
90-
mkdir -p $$@
91-
9278
endef
9379

9480
# In principle, each host can build each target:

0 commit comments

Comments
 (0)