Skip to content

Commit 0d7f8f7

Browse files
borsbors
committed
auto merge of #7166 : brson/rust/fuzzer, r=pcwalton
It is suffering from a bad case of megabitrot. #5247
2 parents ebca26c + 069086c commit 0d7f8f7

File tree

11 files changed

+0
-1146
lines changed

11 files changed

+0
-1146
lines changed

‎Makefile.in

-6
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
208208
CFG_EXTRALIB_$(1) :=$(call CFG_LIB_NAME_$(1),extra)
209209
CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
210210
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
211-
CFG_LIBFUZZER_$(1) :=$(call CFG_LIB_NAME_$(1),fuzzer)
212211
CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
213212
CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
214213
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
@@ -218,7 +217,6 @@ EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
218217
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
219218
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
220219
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
221-
LIBFUZZER_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),fuzzer)
222220
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
223221
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
224222
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
@@ -227,7 +225,6 @@ EXTRALIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),extra)
227225
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
228226
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
229227
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
230-
LIBFUZZER_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),fuzzer)
231228
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
232229
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
233230
LIBRUSTI_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rusti)
@@ -402,12 +399,10 @@ SREQ$(1)_T_$(2)_H_$(3) = \
402399
# Prerequisites for a working stageN compiler and libraries, for a specific target
403400
CSREQ$(1)_T_$(2)_H_$(3) = \
404401
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
405-
$$(HBIN$(1)_H_$(3))/fuzzer$$(X_$(3)) \
406402
$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(3)) \
407403
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
408404
$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
409405
$$(HBIN$(1)_H_$(3))/rust$$(X_$(3)) \
410-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBFUZZER_$(3)) \
411406
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
412407
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
413408
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
@@ -416,7 +411,6 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
416411
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_EXTRALIB_$(2)) \
417412
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
418413
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
419-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2)) \
420414
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
421415
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
422416
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2)) \

‎mk/clean.mk

-6
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,11 @@ define CLEAN_HOST_STAGE_N
6363

6464
clean$(1)_H_$(2):
6565
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustc$(X_$(2))
66-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/fuzzer$(X_$(2))
6766
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustpkg$(X_$(2))
6867
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X_$(2))
6968
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X_$(2))
7069
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X_$(2))
7170
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X_$(2))
72-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBFUZZER_$(2))
7371
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG_$(2))
7472
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC_$(2))
7573
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUNTIME_$(2))
@@ -83,7 +81,6 @@ clean$(1)_H_$(2):
8381
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(EXTRALIB_GLOB_$(2))
8482
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB_$(2))
8583
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB_$(2))
86-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBFUZZER_GLOB_$(2))
8784
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB_$(2))
8885
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB_$(2))
8986
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB_$(2))
@@ -101,13 +98,11 @@ define CLEAN_TARGET_STAGE_N
10198

10299
clean$(1)_T_$(2)_H_$(3):
103100
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$(X_$(2))
104-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/fuzzer$(X_$(2))
105101
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$(X_$(2))
106102
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X_$(2))
107103
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X_$(2))
108104
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rusti$(X_$(2))
109105
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rust$(X_$(2))
110-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2))
111106
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2))
112107
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
113108
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2))
@@ -121,7 +116,6 @@ clean$(1)_T_$(2)_H_$(3):
121116
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(EXTRALIB_GLOB_$(2))
122117
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
123118
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
124-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBFUZZER_GLOB_$(2))
125119
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
126120
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
127121
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTI_GLOB_$(2))

‎mk/dist.mk

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ PKG_FILES := \
3232
librustc \
3333
compiletest \
3434
etc \
35-
libfuzzer \
3635
libextra \
3736
libstd \
3837
libsyntax \

‎mk/pp.mk

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ else
1717
$(wildcard $(addprefix $(S)src/rustc/,*.rs */*.rs */*/*.rs)) \
1818
$(wildcard $(S)src/test/*/*.rs \
1919
$(S)src/test/*/*/*.rs) \
20-
$(wildcard $(S)src/fuzzer/*.rs) \
2120
$(wildcard $(S)src/rustpkg/*.rs) \
2221
$(wildcard $(S)src/rusti/*.rs) \
2322
$(wildcard $(S)src/rust/*.rs)

‎mk/tools.mk

-39
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
# Rules for non-core tools built with the compiler, both for target
1212
# and host architectures
1313

14-
FUZZER_LIB := $(S)src/libfuzzer/fuzzer.rc
15-
FUZZER_INPUTS := $(wildcard $(addprefix $(S)src/libfuzzer/, *.rs))
16-
1714
# The test runner that runs the cfail/rfail/rpass and bxench tests
1815
COMPILETEST_CRATE := $(S)src/compiletest/compiletest.rc
1916
COMPILETEST_INPUTS := $(wildcard $(S)src/compiletest/*rs)
@@ -38,21 +35,6 @@ RUST_INPUTS := $(wildcard $(S)src/librust/*.rs)
3835
# have tools that need to built for other targets.
3936
define TOOLS_STAGE_N_TARGET
4037

41-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBFUZZER_$(4)): \
42-
$$(FUZZER_LIB) $$(FUZZER_INPUTS) \
43-
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
44-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
45-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4)) \
46-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4))
47-
@$$(call E, compile_and_link: $$@)
48-
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
49-
50-
$$(TBIN$(1)_T_$(4)_H_$(3))/fuzzer$$(X_$(4)): \
51-
$$(DRIVER_CRATE) \
52-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBFUZZER_$(4))
53-
@$$(call E, compile_and_link: $$@)
54-
$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg fuzzer -o $$@ $$<
55-
5638
$$(TBIN$(1)_T_$(4)_H_$(3))/compiletest$$(X_$(4)): \
5739
$$(COMPILETEST_CRATE) $$(COMPILETEST_INPUTS) \
5840
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
@@ -128,27 +110,6 @@ endef
128110

129111
define TOOLS_STAGE_N_HOST
130112

131-
132-
# Promote the stageN target to stageN+1 host
133-
# FIXME: Shouldn't need to depend on host/librustc.so once
134-
# rpath is working
135-
$$(HLIB$(2)_H_$(4))/$(CFG_LIBFUZZER_$(4)): \
136-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBFUZZER_$(4)) \
137-
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
138-
$$(HSREQ$(2)_H_$(4))
139-
@$$(call E, cp: $$@)
140-
$$(Q)cp $$< $$@
141-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBFUZZER_GLOB_$(4)) \
142-
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBFUZZER_DSYM_GLOB_$(4))) \
143-
$$(HLIB$(2)_H_$(4))
144-
145-
$$(HBIN$(2)_H_$(4))/fuzzer$$(X_$(4)): \
146-
$$(TBIN$(1)_T_$(4)_H_$(3))/fuzzer$$(X_$(4)) \
147-
$$(HLIB$(2)_H_$(4))/$(CFG_LIBFUZZER_$(4)) \
148-
$$(HSREQ$(2)_H_$(4))
149-
@$$(call E, cp: $$@)
150-
$$(Q)cp $$< $$@
151-
152113
$$(HBIN$(2)_H_$(4))/compiletest$$(X_$(4)): \
153114
$$(TBIN$(1)_T_$(4)_H_$(3))/compiletest$$(X_$(4)) \
154115
$$(HSREQ$(2)_H_$(4))

‎src/driver/driver.rs

-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ extern mod core(name = "std", vers = "0.7-pre");
1616
#[cfg(rustpkg)]
1717
extern mod this(name = "rustpkg");
1818

19-
#[cfg(fuzzer)]
20-
extern mod this(name = "fuzzer");
21-
2219
#[cfg(rustdoc)]
2320
extern mod this(name = "rustdoc");
2421

‎src/libfuzzer/ast_match.rs

-42
This file was deleted.

‎src/libfuzzer/cycles.rs

-108
This file was deleted.

0 commit comments

Comments
 (0)