From a8462d3cfcc5e7e2c8e8fd6b08617de0f0952b0f Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Wed, 25 May 2016 11:09:37 -0700
Subject: [PATCH] bump chisel

---
 Makefrag            | 3 +--
 chisel2             | 2 +-
 chisel3             | 2 +-
 firrtl              | 2 +-
 project/build.scala | 5 ++++-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefrag b/Makefrag
index 0589108b..24f2f0f0 100644
--- a/Makefrag
+++ b/Makefrag
@@ -9,8 +9,7 @@ CXX ?= g++
 CXXFLAGS := -O1
 
 CHISEL_VERSION ?= 2
-CHISEL_SUBMODULE ?= chisel$(CHISEL_VERSION)
-export CHISEL_SUBMODULE
+export CHISEL_VERSION
 
 SBT ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -jar sbt-launch.jar
 SHELL := /bin/bash
diff --git a/chisel2 b/chisel2
index c736c900..e9e5bb28 160000
--- a/chisel2
+++ b/chisel2
@@ -1 +1 @@
-Subproject commit c736c900aed0dc71f5d1189044ef902f6a3627f6
+Subproject commit e9e5bb28ac230ab7c54aab9ca30fbe164bbb84be
diff --git a/chisel3 b/chisel3
index 3ae577bc..d742d70a 160000
--- a/chisel3
+++ b/chisel3
@@ -1 +1 @@
-Subproject commit 3ae577bc710b3767f47403a3d055e84815a30043
+Subproject commit d742d70a05b5fa997517ea7b5eb2d15b23e7a431
diff --git a/firrtl b/firrtl
index a73efa2f..26694d34 160000
--- a/firrtl
+++ b/firrtl
@@ -1 +1 @@
-Subproject commit a73efa2f67428101cf0984a8fb8ac3ebf32b914b
+Subproject commit 26694d3496b7b500a3448599eb889126335b031f
diff --git a/project/build.scala b/project/build.scala
index 0fe1f98f..7a3d690b 100644
--- a/project/build.scala
+++ b/project/build.scala
@@ -15,7 +15,10 @@ object BuildSettings extends Build {
     libraryDependencies ++= Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
   )
 
-  lazy val chisel     = project in file(sys.env.getOrElse("CHISEL_SUBMODULE", "chisel2"))
+  lazy val chiselMacros = project in file("chisel3/chiselMacros")
+  lazy val chiselFrontend = project in file("chisel3/chiselFrontend")
+  lazy val chisel = project in file("chisel" + sys.env.getOrElse("CHISEL_VERSION", 2)) dependsOn(chiselMacros, chiselFrontend)
+
   lazy val cde        = project in file("context-dependent-environments")
   lazy val hardfloat  = project.dependsOn(chisel)
   lazy val junctions  = project.dependsOn(chisel, cde)