It appears that mudflap creeped into one additional file (targhooks)
between the time I bootstrapped the final change and committed the
change. This also elimiantes PRED_MUDFLAP which I missed the first
time around.
Given this is currently breaking boostrap, I'm checking it in
proactively, but will allow my bootstrap and regression test to continue
overnight.
diff --git a/gcc/predict.def b/gcc/predict.def
index f8dba66..2ce135c 100644
--- a/gcc/predict.def
+++ b/gcc/predict.def
@@ -117,9 +117,6 @@ DEF_PREDICTOR (PRED_NEGATIVE_RETURN, "negative return",
HITRATE (96), 0)
/* Branch ending with return; is probably not taken */
DEF_PREDICTOR (PRED_NULL_RETURN, "null return", HITRATE (90), 0)
-/* Branches to a mudflap bounds check are extremely unlikely. */
-DEF_PREDICTOR (PRED_MUDFLAP, "mudflap check", PROB_VERY_LIKELY, 0)
-
/* Branches to compare induction variable to a loop bound is
extremely likely. */
DEF_PREDICTOR (PRED_LOOP_IV_COMPARE_GUESS, "guess loop iv compare",
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index bee404d..fd0d0d4 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -72,7 +72,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-ssanames.h"
#include "tree-ssa-alias.h"
#include "insn-codes.h"
-#include "tree-mudflap.h"
bool
@@ -1576,10 +1575,6 @@ tree
build_va_arg_indirect_ref (tree addr)
{
addr = build_simple_mem_ref_loc (EXPR_LOCATION (addr), addr);
-
- if (flag_mudflap) /* Don't instrument va_arg INDIRECT_REF. */
- mf_mark (addr);
-
return addr;
}
