diff --git a/Makefrag b/Makefrag
index 0c28dbb5..f83408d6 100644
--- a/Makefrag
+++ b/Makefrag
@@ -16,7 +16,7 @@ CXX ?= g++
 CXXFLAGS := -O1
 JVM_MEMORY ?= 2G
 
-SBT ?= java -Xmx$(JVM_MEMORY) -Xss8M -XX:MaxPermSize=256M -jar $(base_dir)/sbt-launch.jar ++2.12.4
+SBT ?= java -Xmx$(JVM_MEMORY) -Xss8M -XX:MaxPermSize=256M -jar $(base_dir)/sbt-launch.jar
 SHELL := /bin/bash
 
 ROCKET_CLASSES ?= "$(base_dir)/target/scala-2.12/classes:$(base_dir)/chisel3/target/scala-2.12/*"
diff --git a/build.sbt b/build.sbt
index 538e7dcf..6a957c9e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -11,7 +11,7 @@ lazy val commonSettings = Seq(
   organization := "edu.berkeley.cs",
   version      := "1.2-SNAPSHOT",
   scalaVersion := "2.12.4",
-  crossScalaVersions := Seq("2.12.4", "2.11.12"),
+  crossScalaVersions := Seq("2.12.4"),
   parallelExecution in Global := false,
   traceLevel   := 15,
   scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"),
@@ -63,7 +63,7 @@ def dependOnChisel(prj: Project) = {
 }
 
 lazy val hardfloat  = dependOnChisel(project).settings(commonSettings)
-  .settings(crossScalaVersions := Seq("2.11.12", "2.12.4"))
+  .settings(crossScalaVersions := Seq("2.12.4"))
 lazy val `rocket-macros` = (project in file("macros")).settings(commonSettings)
 lazy val rocketchip = dependOnChisel(project in file("."))
   .settings(commonSettings, chipSettings)
diff --git a/hardfloat b/hardfloat
index 45f5ae17..70c1e1dd 160000
--- a/hardfloat
+++ b/hardfloat
@@ -1 +1 @@
-Subproject commit 45f5ae171a1950389f1b239b46a9e0d16ae0a6f4
+Subproject commit 70c1e1dd0954bb8e9d62563b8c9730bbc39d2bf0