replica
/
hqjenny-rocket-chip
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump hardfloat, clean up build. (#1865) 

Hardfloat used to require Chisel 2 for testing, which is only published
for Scala 2.11. Rocket uses Scala 2.12, which meant the build system
needed a workaround to make hardfloat use Scala 2.12 when being used as
a part of rocket.

Hardfloat's tests have been updated to use Chisel 3, so the workaround
is no longer needed. This commit bumps the hardfloat submodule and
cleans up build.sbt to use Scala 2.12 only and Makefrag to not use
++2.12.4.
This commit is contained in:
Paul Rigge 2019-03-09 10:35:02 -08:00 committed by Andrew Waterman
parent 2e5268f4a2
commit 79e58d4faa
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefrag
View File

@ -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/*"

4
build.sbt
View File

@ -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)

2
hardfloat

@ -1 +1 @@
Subproject commit 45f5ae171a1950389f1b239b46a9e0d16ae0a6f4
Subproject commit 70c1e1dd0954bb8e9d62563b8c9730bbc39d2bf0