From 2b65478f3a218452f5b87b7892fa4f464963ed9d Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Thu, 27 Oct 2016 23:45:01 -0700
Subject: [PATCH] bump chisel/firrtl

---
 Makefrag | 3 +++
 chisel3  | 2 +-
 firrtl   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefrag b/Makefrag
index 39e01809..5289732d 100644
--- a/Makefrag
+++ b/Makefrag
@@ -19,9 +19,12 @@ SHELL := /bin/bash
 FIRRTL_JAR ?= $(base_dir)/firrtl/utils/bin/firrtl.jar
 FIRRTL ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -cp $(FIRRTL_JAR) firrtl.Driver
 
+# Build firrtl.jar and put it where chisel3 can find it.
 $(FIRRTL_JAR): $(shell find $(base_dir)/firrtl/src/main/scala -iname "*.scala")
 	$(MAKE) -C $(base_dir)/firrtl SBT="$(SBT)" root_dir=$(base_dir)/firrtl build-scala
 	touch $(FIRRTL_JAR)
+	mkdir -p $(base_dir)/chisel3/lib
+	cp -p $(FIRRTL_JAR) $(base_dir)/chisel3/lib
 
 src_path = src/main/scala
 default_submodules = . hardfloat context-dependent-environments chisel3
diff --git a/chisel3 b/chisel3
index b18e98ba..224ee397 160000
--- a/chisel3
+++ b/chisel3
@@ -1 +1 @@
-Subproject commit b18e98ba2d058c7dd24f96f005486b70c856aeca
+Subproject commit 224ee397db324067b35874bf22c76a63e9ca531b
diff --git a/firrtl b/firrtl
index bcf73fb7..5b35f2d2 160000
--- a/firrtl
+++ b/firrtl
@@ -1 +1 @@
-Subproject commit bcf73fb70969e5629a693c18f1f2ee7b37f14a76
+Subproject commit 5b35f2d2722f72c81d2d6c507cd379be2a1476d8