mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-15 13:28:59 +00:00
Code Activity

Updated min GCC requirement to GCC 4.8

Browse source
This commit is contained in:
Clifford Wolf 2016-05-11 09:31:53 +02:00
parent b8b39472bb
commit 407cdea0bc
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CodingReadme
View file

@ -239,7 +239,7 @@ C++ Language
------------- -------------
Yosys is written in C++11. At the moment only constructs supported by Yosys is written in C++11. At the moment only constructs supported by
gcc 4.6 are allowed in Yosys code. This will change in future releases. gcc 4.8 are allowed in Yosys code. This will change in future releases.
In general Yosys uses "int" instead of "size_t". To avoid compiler In general Yosys uses "int" instead of "size_t". To avoid compiler
warnings for implicit type casts, always use "GetSize(foobar)" instead warnings for implicit type casts, always use "GetSize(foobar)" instead
@ -368,7 +368,7 @@ And if a version of the verific library is currently available:
../../yosys test_navre.ys ../../yosys test_navre.ys
Finally run all tests with "make config-{clang,gcc,gcc-4.6}": Finally run all tests with "make config-{clang,gcc,gcc-4.8}":
cd ~yosys cd ~yosys
make clean make clean

24
Makefile
View file

@ -1,7 +1,7 @@
CONFIG := clang CONFIG := clang
# CONFIG := gcc # CONFIG := gcc
# CONFIG := gcc-4.6 # CONFIG := gcc-4.8
# CONFIG := emcc # CONFIG := emcc
# CONFIG := mxe # CONFIG := mxe
@ -124,12 +124,12 @@ endif
else ifeq ($(CONFIG),gcc) else ifeq ($(CONFIG),gcc)
CXX = gcc CXX = gcc
LD = gcc LD = gcc
CXXFLAGS += -std=gnu++0x -Os CXXFLAGS += -std=c++11 -Os
else ifeq ($(CONFIG),gcc-4.6) else ifeq ($(CONFIG),gcc-4.8)
CXX = gcc-4.6 CXX = gcc-4.8
LD = gcc-4.6 LD = gcc-4.8
CXXFLAGS += -std=gnu++0x -Os CXXFLAGS += -std=c++11 -Os
else ifeq ($(CONFIG),emcc) else ifeq ($(CONFIG),emcc)
CXX = emcc CXX = emcc
@ -164,7 +164,7 @@ yosys.html: misc/yosys.html
else ifeq ($(CONFIG),mxe) else ifeq ($(CONFIG),mxe)
CXX = /usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-gcc CXX = /usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-gcc
LD = /usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-gcc LD = /usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-gcc
CXXFLAGS += -std=gnu++0x -Os -D_POSIX_SOURCE CXXFLAGS += -std=c++11 -Os -D_POSIX_SOURCE
CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS)) CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS))
LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s
LDLIBS := $(filter-out -lrt,$(LDLIBS)) LDLIBS := $(filter-out -lrt,$(LDLIBS))
@ -173,7 +173,7 @@ ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" ABC_USE_NO_READLINE=1 CC="$(CXX)"
EXE = .exe EXE = .exe
else ifneq ($(CONFIG),none) else ifneq ($(CONFIG),none)
$(error Invalid CONFIG setting '$(CONFIG)'. Valid values: clang, gcc, gcc-4.6, emcc, none) $(error Invalid CONFIG setting '$(CONFIG)'. Valid values: clang, gcc, gcc-4.8, emcc, none)
endif endif
ifeq ($(ENABLE_LIBYOSYS),1) ifeq ($(ENABLE_LIBYOSYS),1)
@ -467,7 +467,7 @@ qtcreator:
vcxsrc: $(GENFILES) $(EXTRA_TARGETS) vcxsrc: $(GENFILES) $(EXTRA_TARGETS)
rm -rf yosys-win32-vcxsrc-$(YOSYS_VER){,.zip} rm -rf yosys-win32-vcxsrc-$(YOSYS_VER){,.zip}
set -e; for f in `ls $(filter %.cc %.cpp,$(GENFILES)) $(addsuffix .cc,$(basename $(OBJS))) $(addsuffix .cpp,$(basename $(OBJS))) 2> /dev/null`; do \ set -e; for f in `ls $(filter %.cc %.cpp,$(GENFILES)) $(addsuffix .cc,$(basename $(OBJS))) $(addsuffix .cpp,$(basename $(OBJS))) 2> /dev/null`; do \
echo "Analyse: $$f" >&2; cpp -std=gnu++0x -MM -I. -D_YOSYS_ $$f; done | sed 's,.*:,,; s,//*,/,g; s,/[^/]*/\.\./,/,g; y, \\,\n\n,;' | grep '^[^/]' | sort -u | grep -v kernel/version_ > srcfiles.txt echo "Analyse: $$f" >&2; cpp -std=c++11 -MM -I. -D_YOSYS_ $$f; done | sed 's,.*:,,; s,//*,/,g; s,/[^/]*/\.\./,/,g; y, \\,\n\n,;' | grep '^[^/]' | sort -u | grep -v kernel/version_ > srcfiles.txt
bash misc/create_vcxsrc.sh yosys-win32-vcxsrc $(YOSYS_VER) $(GIT_REV) bash misc/create_vcxsrc.sh yosys-win32-vcxsrc $(YOSYS_VER) $(GIT_REV)
echo "namespace Yosys { extern const char *yosys_version_str; const char *yosys_version_str=\"Yosys (Version Information Unavailable)\"; }" > kernel/version.cc echo "namespace Yosys { extern const char *yosys_version_str; const char *yosys_version_str=\"Yosys (Version Information Unavailable)\"; }" > kernel/version.cc
zip yosys-win32-vcxsrc-$(YOSYS_VER)/genfiles.zip $(GENFILES) kernel/version.cc zip yosys-win32-vcxsrc-$(YOSYS_VER)/genfiles.zip $(GENFILES) kernel/version.cc
@ -496,8 +496,8 @@ config-clang: clean
config-gcc: clean config-gcc: clean
echo 'CONFIG := gcc' > Makefile.conf echo 'CONFIG := gcc' > Makefile.conf
config-gcc-4.6: clean config-gcc-4.8: clean
echo 'CONFIG := gcc-4.6' > Makefile.conf echo 'CONFIG := gcc-4.8' > Makefile.conf
config-emcc: clean config-emcc: clean
echo 'CONFIG := emcc' > Makefile.conf echo 'CONFIG := emcc' > Makefile.conf
@ -533,5 +533,5 @@ echo-git-rev:
-include techlibs/*/*.d -include techlibs/*/*.d
.PHONY: all top-all abc test install install-abc manual clean mrproper qtcreator .PHONY: all top-all abc test install install-abc manual clean mrproper qtcreator
.PHONY: config-clean config-clang config-gcc config-gcc-4.6 config-gprof config-sudo .PHONY: config-clean config-clang config-gcc config-gcc-4.8 config-gprof config-sudo