---

yaml
---
r: 66038
b: refs/heads/master
c: 3281f5b
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d084d9e7df0da671765c8a2d9212757f16ab1c9d
+refs/heads/master: 3281f5b63792a57d2cea6e93446e63f44e1e3ea0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/Makefile.in

@@ -111,7 +111,7 @@ ifdef SAVE_TEMPS
   CFG_RUSTC_FLAGS += --save-temps
 endif
 ifdef ASM_COMMENTS
-  CFG_RUSTC_FLAGS += -Z asm-comments
+  CFG_RUSTC_FLAGS += -z asm-comments
 endif
 ifdef TIME_PASSES
   CFG_RUSTC_FLAGS += -Z time-passes
@@ -208,6 +208,7 @@ CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
 CFG_EXTRALIB_$(1) :=$(call CFG_LIB_NAME_$(1),extra)
 CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
 CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
+CFG_LIBFUZZER_$(1) :=$(call CFG_LIB_NAME_$(1),fuzzer)
 CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
 CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
 CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
@@ -217,6 +218,7 @@ EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
 STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
 LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
 LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
+LIBFUZZER_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),fuzzer)
 LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
 LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
 LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
@@ -225,6 +227,7 @@ EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
 STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
 LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
 LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
+LIBFUZZER_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),fuzzer)
 LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
 LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
 LIBRUSTI_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rusti)
@@ -399,10 +402,12 @@ SREQ$(1)_T_$(2)_H_$(3) = \
 # Prerequisites for a working stageN compiler and libraries, for a specific target
 CSREQ$(1)_T_$(2)_H_$(3) = \
 	$$(TSREQ$(1)_T_$(2)_H_$(3)) \
+	$$(HBIN$(1)_H_$(3))/fuzzer$$(X_$(3)) \
 	$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(3)) \
 	$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
 	$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
 	$$(HBIN$(1)_H_$(3))/rust$$(X_$(3)) \
+	$$(HLIB$(1)_H_$(3))/$(CFG_LIBFUZZER_$(3)) \
 	$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
 	$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
 	$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
@@ -411,6 +416,7 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2))  \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))  \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
+	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2)) \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
 	$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2)) \

trunk/RELEASES.txt

@@ -4,90 +4,36 @@ Version 0.7 (July 2013)
    * ??? changes, numerous bugfixes
 
    * Syntax changes
-      * `use mod` is no longer valid.
-      * `fail!` and `assert!` accept `~str`, `&'static str` or `fmt!`-style
-        argument list.
-      * `Encodable`, `Decodable`, `TotalOrd`, `TotalEq`, `DeepClone` can all
-        be automatically derived with `#[deriving(...)]`.
-      * The `Durable` trait is replaced with the `'static` bounds.
-      * At long last, 'argument modes' no longer exist.
-      * The `bytes!` macro returns a vector of bytes for string, u8, char,
-        and unsuffixed integer literals.
+      * `#[deriving(Encodable)]`, `#[deriving(Decodable)]`
 
    * Semantic changes
-      * The borrow checker has been rewritten with flow-sensitivity, fixing
-        many bugs and inconveniences.
       * The `self` parameter no longer implicitly means `&'self self`,
         and can be explicitly marked with a lifetime.
       * Structs with the `#[packed]` attribute have byte alignment and
         no padding between fields.
-      * The `for` loop protocol now requires `for`-iterators to return `bool`
-        so they compose better.
-      * `Option<~T>` is now represented as a nullable pointer.
-      * `@mut` does dynamic borrow checks correctly.
-      * Macros TODO
-      * The `main` function is only detected at the topmost level of the crate.
-        The `#[main]` attribute is still valid anywhere.
-      * Struct fields may no longer be mutable. Use inherited mutability.
-      * The `#[non_owned]` attribute makes a type that would otherwise be
-        `Owned`, not. TODO this may change to non_send before 0.7
-      * The `#[mutable]` attribute makes a type that would otherwise be
-        `Const`, note. TODO this may change to non_freeze before 0.7
-      * Unbounded recursion will abort the process after reaching the limit
-        specified by the `RUST_MAX_STACK` environment variable.
-      * The `vecs_implicitly_copyable` lint mode has been removed. Vectors
-        are never implicitly copyable.
 
    * Libraries
+
+      **Note: in 0.7 `core` was renamed `std` and `std` to `extra.
+        These notes use the new crate names.**
+
       * The `core` crate was renamed to `std`.
       * The `std` crate was renamed to `extra`.
       * `std::mut` removed.
-      * std: The prelude no longer reexports any modules, only types and traits.
-      * std: Prelude additions: `print`, `println`, `FromStr`, `ApproxEq`, `Equiv`,
-        `Iterator`, `IteratorUtil`, many numeric traits, many tuple traits.
       * std: `iterator` module for external iterator objects.
-      * std: new numeric traits: `Fractional`, `Real`, `RealExt`, `Integer`, `Ratio`,
-        `Algebraic`, `Trigonometric`, `Exponential`, `Primitive`.
-      * std: Tuple traits and accessors defined for up to 12-tuples, e.g.
-        `(0, 1, 2).n2()` or `(0, 1, 2).n2_ref()`.
       * std: many types implement `Clone` - tuples, @, @mut. TODO
       * std: `path` type renamed to `Path`.
       * std: Many standalone functions removed in favor of methods in
-        `vec`, `str`. In the future methods will also work as functions.
-      * std: `reinterpret_cast` removed. Used `transmute`.
-      * std: ascii string handling in `std::ascii`.
-      * std: `Rand` is implemented for ~/@.
-      * std: `run` module for spawning processes overhauled.
-      * std: Various atomic types added to `unstable::atomic`.
-      * std: `LinearMap` and `LinearSet` renamed to `HashMap` and `HashSet`.
-      * std: Added `os::mkdir_recursive`.
-      * std: Added `os::glob` function performs filesystems globs.
-      * std: `FuzzyEq` renamed to `ApproxEq`.
-      * std: `Map` now defines `pop` and `swap` methods.
-      * extra: `flate` module moved from `std` to `extra`.
+        `vec`, `str`, TODO. In the future methods will also work as functions.
       * extra: `FileInput` implements `std::io::Reader`.
       * extra: `Complex` number type and `complex` module.
       * extra: `Rational` number type and `rational` module.
       * extra: `BigInt`, `BigUint` implement numeric and comparison traits.
-      * extra: `term` uses terminfo now, is more correct.
-
-   * Tooling
-      * `unused_unsafe` lint mode for detecting unnecessary `unsafe` blocks.
-      * `unused_mut` lint mode for identifying unused `mut` qualifiers.
-      * The `rusti` command has been rewritten and a number of bugs addressed.
-      * rustc outputs in color on more terminals.
-      * rustc accepts a `--link-args` flag to pass arguments to the linker.
-      * rustc accepts a `-Z print-link-args` flag for debugging linkage.
-      * Compiling with `-g` will make the binary record information about
-        dynamic borrowcheck failures for debugging.
-      * rustdoc has a nicer stylesheet.
-      * Various improvements to rustdoc.
 
    * Other
+      * `unused_unsafe` lint mode for detecting unnecessary `unsafe` blocks.
       * More and improved library documentation.
-      * Various improvements on ARM and Android.
-      * Various improvements to MIPS backend.
-      * jemalloc is the Rust allocator.
+      * The `rusti` command has been rewritten and a number of bugs addressed.
 
 Version 0.6 (April 2013)
 ------------------------

trunk/doc/rust.css

@@ -12,38 +12,41 @@ body {
 }
 
 h1 {
-    font-size: 24pt;
-    margin-top: 1.6em;
+    font-size: 20pt;
+    margin-top: 2em;
     padding-left: 0.4em;
     line-height: 1.6em;
     background-color:#FFF2CE;
     border-radius: 0.2em;
+    border: 1px solid rgba(0, 0, 0, 0.15);
 }
 
 h2 {
-    font-size: 16pt;
-    margin-top: 1.6em;
-    padding: 0.2em 0.5em;
+    font-size: 15pt;
+    margin-top: 2em;
+    padding-left: 0.4em;
     background-color:#FFF2CE;
     border-radius: 0.4em;
+    border: 1px solid rgba(0, 0, 0, 0.15);
 }
 
 h2 code {
     color: #097334;
-    font-size: 16pt;
+    font-size: 15pt;
 }
 
 h3 {
-    font-size: 14pt;
+    font-size: 13pt;
     color: black;
     background-color:#D9E7FF;
     border-radius: 0.4em;
-    padding: 0.2em 0.5em;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    padding: 0 0.4em 0 0.4em;
 }
 
 h3 code {
     color: #541800;
-    font-size: 14pt;
+    font-size: 13pt;
     font-style: italic;
 }
 

trunk/doc/rust.md

@@ -2826,7 +2826,7 @@ Within the body of an item that has type parameter declarations, the names of it
 ~~~~~~~
 fn map<A: Copy, B: Copy>(f: &fn(A) -> B, xs: &[A]) -> ~[B] {
    if xs.len() == 0 { return ~[]; }
-   let first: B = f(copy xs[0]);
+   let first: B = f(xs[0]);
    let rest: ~[B] = map(f, xs.slice(1, xs.len()));
    return ~[first] + rest;
 }

trunk/doc/tutorial-tasks.md

@@ -359,7 +359,7 @@ fn pnorm(nums: &~[float], p: uint) -> float {
 
 fn main() {
     let numbers = vec::from_fn(1000000, |_| rand::random::<float>());
-    println(fmt!("Inf-norm = %?",  *numbers.iter().max().unwrap()));
+    println(fmt!("Inf-norm = %?",  numbers.max()));
 
     let numbers_arc = ARC(numbers);
 

trunk/doc/tutorial.md

@@ -1941,14 +1941,12 @@ fn head_bad<T>(v: &[T]) -> T {
 ~~~~
 
 However, we can tell the compiler that the `head` function is only for
-copyable types: that is, those that have the `Copy` trait. In that
-case, we can explicitly create a second copy of the value we are
-returning using the `copy` keyword:
+copyable types: that is, those that have the `Copy` trait.
 
 ~~~~
 // This does
 fn head<T: Copy>(v: &[T]) -> T {
-    copy v[0]
+    v[0]
 }
 ~~~~
 
@@ -2041,12 +2039,17 @@ themselves contain type parameters. A trait for generalized sequence
 types might look like the following:
 
 ~~~~
+# use std::vec;
 trait Seq<T> {
-    fn length(&self) -> uint;
+    fn len(&self) -> uint;
+    fn iter(&self, b: &fn(v: &T));
 }
 
 impl<T> Seq<T> for ~[T] {
-    fn length(&self) -> uint { self.len() }
+    fn len(&self) -> uint { self.len() }
+    fn iter(&self, b: &fn(v: &T)) {
+        for vec::each(*self) |elt| { b(elt); }
+    }
 }
 ~~~~
 
@@ -2139,7 +2142,7 @@ as in this version of `print_all` that copies elements.
 fn print_all<T: Printable + Copy>(printable_things: ~[T]) {
     let mut i = 0;
     while i < printable_things.len() {
-        let copy_of_thing = copy printable_things[i];
+        let copy_of_thing = printable_things[i];
         copy_of_thing.print();
         i += 1;
     }

trunk/mk/clean.mk

@@ -63,11 +63,13 @@ define CLEAN_HOST_STAGE_N
 
 clean$(1)_H_$(2):
 	$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustc$(X_$(2))
+	$(Q)rm -f $$(HBIN$(1)_H_$(2))/fuzzer$(X_$(2))
 	$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustpkg$(X_$(2))
 	$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X_$(2))
 	$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X_$(2))
 	$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X_$(2))
 	$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X_$(2))
+	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBFUZZER_$(2))
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG_$(2))
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC_$(2))
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUNTIME_$(2))
@@ -81,6 +83,7 @@ clean$(1)_H_$(2):
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(EXTRALIB_GLOB_$(2))
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB_$(2))
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB_$(2))
+	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBFUZZER_GLOB_$(2))
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB_$(2))
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB_$(2))
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB_$(2))
@@ -98,11 +101,13 @@ define CLEAN_TARGET_STAGE_N
 
 clean$(1)_T_$(2)_H_$(3):
 	$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$(X_$(2))
+	$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/fuzzer$(X_$(2))
 	$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$(X_$(2))
 	$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X_$(2))
 	$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X_$(2))
 	$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rusti$(X_$(2))
 	$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rust$(X_$(2))
+	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2))
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2))
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2))
@@ -116,6 +121,7 @@ clean$(1)_T_$(2)_H_$(3):
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(EXTRALIB_GLOB_$(2))
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
+	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBFUZZER_GLOB_$(2))
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTI_GLOB_$(2))

trunk/mk/dist.mk

@@ -32,6 +32,7 @@ PKG_FILES := \
       librustc                                 \
       compiletest                              \
       etc                                      \
+      libfuzzer                                \
       libextra                                 \
       libstd                                   \
       libsyntax                                \

trunk/mk/pp.mk

@@ -17,6 +17,7 @@ else
               $(wildcard $(addprefix $(S)src/rustc/,*.rs */*.rs */*/*.rs)) \
               $(wildcard $(S)src/test/*/*.rs    \
                          $(S)src/test/*/*/*.rs) \
+              $(wildcard $(S)src/fuzzer/*.rs)   \
               $(wildcard $(S)src/rustpkg/*.rs) \
               $(wildcard $(S)src/rusti/*.rs) \
               $(wildcard $(S)src/rust/*.rs)

trunk/mk/tools.mk

@@ -11,6 +11,9 @@
 # Rules for non-core tools built with the compiler, both for target
 # and host architectures
 
+FUZZER_LIB := $(S)src/libfuzzer/fuzzer.rc
+FUZZER_INPUTS := $(wildcard $(addprefix $(S)src/libfuzzer/, *.rs))
+
 # The test runner that runs the cfail/rfail/rpass and bxench tests
 COMPILETEST_CRATE := $(S)src/compiletest/compiletest.rc
 COMPILETEST_INPUTS := $(wildcard $(S)src/compiletest/*rs)
@@ -35,6 +38,21 @@ RUST_INPUTS := $(wildcard $(S)src/librust/*.rs)
 # have tools that need to built for other targets.
 define TOOLS_STAGE_N_TARGET
 
+$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBFUZZER_$(4)):          \
+		$$(FUZZER_LIB) $$(FUZZER_INPUTS)			\
+		$$(TSREQ$(1)_T_$(4)_H_$(3))					\
+		$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4))	\
+		$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4))	\
+		$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4))
+	@$$(call E, compile_and_link: $$@)
+	$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
+
+$$(TBIN$(1)_T_$(4)_H_$(3))/fuzzer$$(X_$(4)):				\
+		$$(DRIVER_CRATE)								\
+		$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBFUZZER_$(4))
+	@$$(call E, compile_and_link: $$@)
+	$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg fuzzer -o $$@ $$<
+
 $$(TBIN$(1)_T_$(4)_H_$(3))/compiletest$$(X_$(4)):			\
 		$$(COMPILETEST_CRATE) $$(COMPILETEST_INPUTS)	\
 		$$(TSREQ$(1)_T_$(4)_H_$(3))						\
@@ -110,6 +128,27 @@ endef
 
 define TOOLS_STAGE_N_HOST
 
+
+# Promote the stageN target to stageN+1 host
+# FIXME: Shouldn't need to depend on host/librustc.so once
+# rpath is working
+$$(HLIB$(2)_H_$(4))/$(CFG_LIBFUZZER_$(4)):					\
+		$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBFUZZER_$(4))	\
+		$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4))			\
+		$$(HSREQ$(2)_H_$(4))
+	@$$(call E, cp: $$@)
+	$$(Q)cp $$< $$@
+	$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBFUZZER_GLOB_$(4)) \
+		$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBFUZZER_DSYM_GLOB_$(4))) \
+	        $$(HLIB$(2)_H_$(4))
+
+$$(HBIN$(2)_H_$(4))/fuzzer$$(X_$(4)):				\
+		$$(TBIN$(1)_T_$(4)_H_$(3))/fuzzer$$(X_$(4))	\
+		$$(HLIB$(2)_H_$(4))/$(CFG_LIBFUZZER_$(4))	\
+		$$(HSREQ$(2)_H_$(4))
+	@$$(call E, cp: $$@)
+	$$(Q)cp $$< $$@
+
 $$(HBIN$(2)_H_$(4))/compiletest$$(X_$(4)):				\
 		$$(TBIN$(1)_T_$(4)_H_$(3))/compiletest$$(X_$(4))	\
 		$$(HSREQ$(2)_H_$(4))