github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-01 04:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
Wilson Snyder 2018-06-16 07:32:32 -04:00
commit 4c9c39bd08
8 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -19,6 +19,8 @@ The contributors that suggested a given feature are shown in []. Thanks!
* Verilator 3.925 devel
**** Add OBJCACHE envvar support to examples and generated Makefiles.
* Verilator 3.924 2018-06-12

4
bin/verilator
View File

@ -1756,8 +1756,8 @@ needed at runtime.
Optionally specifies a caching or distribution program to place in front of
all runs of the C++ Compiler. For example, "objcache --read --write", or
"ccache". If using distcc, it would generally be run under either objcache
or ccache; see the documentation for those programs.
"ccache". If using distcc or icecc/icecream, they would generally be run
under either objcache or ccache; see the documentation for those programs.
=item SYSTEMC

3
examples/tracing_c/Makefile_obj
View File

@ -17,6 +17,9 @@ default: Vtop
# Include the rules made by Verilator
include Vtop.mk
# Use OBJCACHE (ccache) if using gmake and its installed
COMPILE.cc = $(OBJCACHE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
#######################################################################
# Compile flags

3
examples/tracing_sc/Makefile_obj
View File

@ -17,6 +17,9 @@ default: Vtop
# Include the rules made by Verilator
include Vtop.mk
# Use OBJCACHE (ccache) if using gmake and its installed
COMPILE.cc = $(OBJCACHE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
#######################################################################
# Compile flags

2
src/V3EmitMk.cpp
View File

@ -202,7 +202,7 @@ public:
string cppfile = *it;
string basename = V3Os::filenameNonExt(cppfile);
of.puts(basename+".o: "+cppfile+"\n");
of.puts("\t$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(OPT_FAST) -c -o $@ $<\n");
of.puts("\t$(OBJCACHE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(OPT_FAST) -c -o $@ $<\n");
}
of.puts("\n### Link rules... (from --exe)\n");

1
src/V3Graph.h
View File

@ -24,7 +24,6 @@
#include "verilatedos.h"
#include "V3Error.h"
#include "V3List.h"
#include "V3Ast.h"
#include <vector>
#include <algorithm>

1
src/V3GraphDfa.h
View File

@ -24,6 +24,7 @@
#include "verilatedos.h"
#include <vector>
#include "V3Ast.h" // for VNUser
#include "V3Global.h"
#include "V3Graph.h"

4
test_regress/driver.pl
View File

@ -1734,8 +1734,8 @@ resource required by the test is not available, such as SystemC), or are
unsupported (buggy or require a feature change before will pass.)
There are hundreds of tests, and for faster completion you may want to run
the regression tests with CCACHE enabled and in parallel on a machine with
many cores. See the -j option.
the regression tests with OBJCACHE enabled and in parallel on a machine
with many cores. See the -j option and OBJCACHE environment variable.
=head1 TEST CONFIGURATION