aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunsup Lee <yunsup@cs.berkeley.edu>2014-10-24 09:53:01 -0700
committerYunsup Lee <yunsup@cs.berkeley.edu>2014-10-24 09:53:01 -0700
commitb3bf5049ac3cee767ca70a22685dd83466f3dc52 (patch)
tree73fc5fe9282e696281570a02ab0bc51b2036af8f
parentd4a26c50d1c8d69082533196b7f79e4762fb9637 (diff)
parent70b52dd5fa74b5968a20ded22df4ae3a9a76d7f4 (diff)
downloadriscv-opcodes-b3bf5049ac3cee767ca70a22685dd83466f3dc52.zip
riscv-opcodes-b3bf5049ac3cee767ca70a22685dd83466f3dc52.tar.gz
riscv-opcodes-b3bf5049ac3cee767ca70a22685dd83466f3dc52.tar.bz2
Merge branch 'pr/1'
Conflicts: Makefile
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 18f179f..00933b9 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ install: $(ISASIM_H) $(PK_H) $(ENV_H) $(GAS_H) $(XCC_H) inst.chisel instr-table.
$(ISASIM_H) $(PK_H) $(ENV_H): $(ALL_OPCODES) parse-opcodes
cp encoding.h $@
- ./parse-opcodes -c < opcodes >> $@
+ cat opcodes opcodes-custom | ./parse-opcodes -c >> $@
$(GAS_H) $(XCC_H): $(ALL_OPCODES) parse-opcodes
cat $(ALL_OPCODES) | ./parse-opcodes -c > $@