From 84b15dac7035f7e23fa821091ce97ae30ce2b0d8 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Wed, 2 Sep 2015 13:36:10 -0700
Subject: [PATCH] Don't automatically run autoconf

Run it yourself if you modify configure.ac, and commit the configure script.
---
 Makefile.in      |  9 ------
 riscv/encoding.h | 78 ++++++++----------------------------------------
 2 files changed, 12 insertions(+), 75 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 4dfc07b..240b46c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -380,15 +380,6 @@ endif
 # Regenerate configure information
 #-------------------------------------------------------------------------
 
-configure_prereq = \
-  $(src_dir)/configure.ac \
-  $(src_dir)/aclocal.m4 \
-  $(join $(addprefix $(src_dir)/, $(sprojs_enabled)), \
-         $(patsubst  %, /%.ac, $(sprojs_enabled)))
-
-$(src_dir)/configure : $(configure_prereq)
-	cd $(src_dir) && autoconf && autoheader
-
 config.status : $(src_dir)/configure
 	./config.status --recheck
 
diff --git a/riscv/encoding.h b/riscv/encoding.h
index f9f4bfb..d4f08fc 100644
--- a/riscv/encoding.h
+++ b/riscv/encoding.h
@@ -882,70 +882,16 @@ DECLARE_CSR(mtimecmph, CSR_MTIMECMPH)
 DECLARE_CSR(mtimeh, CSR_MTIMEH)
 #endif
 #ifdef DECLARE_CAUSE
-DECLARE_CAUSE("fflags", CAUSE_FFLAGS)
-DECLARE_CAUSE("frm", CAUSE_FRM)
-DECLARE_CAUSE("fcsr", CAUSE_FCSR)
-DECLARE_CAUSE("cycle", CAUSE_CYCLE)
-DECLARE_CAUSE("time", CAUSE_TIME)
-DECLARE_CAUSE("instret", CAUSE_INSTRET)
-DECLARE_CAUSE("stats", CAUSE_STATS)
-DECLARE_CAUSE("uarch0", CAUSE_UARCH0)
-DECLARE_CAUSE("uarch1", CAUSE_UARCH1)
-DECLARE_CAUSE("uarch2", CAUSE_UARCH2)
-DECLARE_CAUSE("uarch3", CAUSE_UARCH3)
-DECLARE_CAUSE("uarch4", CAUSE_UARCH4)
-DECLARE_CAUSE("uarch5", CAUSE_UARCH5)
-DECLARE_CAUSE("uarch6", CAUSE_UARCH6)
-DECLARE_CAUSE("uarch7", CAUSE_UARCH7)
-DECLARE_CAUSE("uarch8", CAUSE_UARCH8)
-DECLARE_CAUSE("uarch9", CAUSE_UARCH9)
-DECLARE_CAUSE("uarch10", CAUSE_UARCH10)
-DECLARE_CAUSE("uarch11", CAUSE_UARCH11)
-DECLARE_CAUSE("uarch12", CAUSE_UARCH12)
-DECLARE_CAUSE("uarch13", CAUSE_UARCH13)
-DECLARE_CAUSE("uarch14", CAUSE_UARCH14)
-DECLARE_CAUSE("uarch15", CAUSE_UARCH15)
-DECLARE_CAUSE("sstatus", CAUSE_SSTATUS)
-DECLARE_CAUSE("stvec", CAUSE_STVEC)
-DECLARE_CAUSE("sie", CAUSE_SIE)
-DECLARE_CAUSE("sscratch", CAUSE_SSCRATCH)
-DECLARE_CAUSE("sepc", CAUSE_SEPC)
-DECLARE_CAUSE("sip", CAUSE_SIP)
-DECLARE_CAUSE("sptbr", CAUSE_SPTBR)
-DECLARE_CAUSE("sasid", CAUSE_SASID)
-DECLARE_CAUSE("cyclew", CAUSE_CYCLEW)
-DECLARE_CAUSE("timew", CAUSE_TIMEW)
-DECLARE_CAUSE("instretw", CAUSE_INSTRETW)
-DECLARE_CAUSE("stime", CAUSE_STIME)
-DECLARE_CAUSE("scause", CAUSE_SCAUSE)
-DECLARE_CAUSE("sbadaddr", CAUSE_SBADADDR)
-DECLARE_CAUSE("stimew", CAUSE_STIMEW)
-DECLARE_CAUSE("mstatus", CAUSE_MSTATUS)
-DECLARE_CAUSE("mtvec", CAUSE_MTVEC)
-DECLARE_CAUSE("mtdeleg", CAUSE_MTDELEG)
-DECLARE_CAUSE("mie", CAUSE_MIE)
-DECLARE_CAUSE("mtimecmp", CAUSE_MTIMECMP)
-DECLARE_CAUSE("mscratch", CAUSE_MSCRATCH)
-DECLARE_CAUSE("mepc", CAUSE_MEPC)
-DECLARE_CAUSE("mcause", CAUSE_MCAUSE)
-DECLARE_CAUSE("mbadaddr", CAUSE_MBADADDR)
-DECLARE_CAUSE("mip", CAUSE_MIP)
-DECLARE_CAUSE("mtime", CAUSE_MTIME)
-DECLARE_CAUSE("mcpuid", CAUSE_MCPUID)
-DECLARE_CAUSE("mimpid", CAUSE_MIMPID)
-DECLARE_CAUSE("mhartid", CAUSE_MHARTID)
-DECLARE_CAUSE("mtohost", CAUSE_MTOHOST)
-DECLARE_CAUSE("mfromhost", CAUSE_MFROMHOST)
-DECLARE_CAUSE("mreset", CAUSE_MRESET)
-DECLARE_CAUSE("send_ipi", CAUSE_SEND_IPI)
-DECLARE_CAUSE("cycleh", CAUSE_CYCLEH)
-DECLARE_CAUSE("timeh", CAUSE_TIMEH)
-DECLARE_CAUSE("instreth", CAUSE_INSTRETH)
-DECLARE_CAUSE("cyclehw", CAUSE_CYCLEHW)
-DECLARE_CAUSE("timehw", CAUSE_TIMEHW)
-DECLARE_CAUSE("instrethw", CAUSE_INSTRETHW)
-DECLARE_CAUSE("stimeh", CAUSE_STIMEH)
-DECLARE_CAUSE("stimehw", CAUSE_STIMEHW)
-DECLARE_CAUSE("mtimecmph", CAUSE_MTIMECMPH)
-DECLARE_CAUSE("mtimeh", CAUSE_MTIMEH)
+DECLARE_CAUSE("misaligned fetch", CAUSE_MISALIGNED_FETCH)
+DECLARE_CAUSE("fault fetch", CAUSE_FAULT_FETCH)
+DECLARE_CAUSE("illegal instruction", CAUSE_ILLEGAL_INSTRUCTION)
+DECLARE_CAUSE("breakpoint", CAUSE_BREAKPOINT)
+DECLARE_CAUSE("misaligned load", CAUSE_MISALIGNED_LOAD)
+DECLARE_CAUSE("fault load", CAUSE_FAULT_LOAD)
+DECLARE_CAUSE("misaligned store", CAUSE_MISALIGNED_STORE)
+DECLARE_CAUSE("fault store", CAUSE_FAULT_STORE)
+DECLARE_CAUSE("user_ecall", CAUSE_USER_ECALL)
+DECLARE_CAUSE("supervisor_ecall", CAUSE_SUPERVISOR_ECALL)
+DECLARE_CAUSE("hypervisor_ecall", CAUSE_HYPERVISOR_ECALL)
+DECLARE_CAUSE("machine_ecall", CAUSE_MACHINE_ECALL)
 #endif
-- 
2.30.2