Merge branch 'yosys-0.5-vtr' of https://github.com/eddiehung/yosys into eddiehung-vtr

diff --cc Makefile
index 7ed68ef420863808495c26e60b15f842c712af13,d41bec1875be83c313f374b17b935168b61dec59..fee099a02e9b8a5b0f71bd60e0eb609501ee52bc
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  
- CONFIG := clang
+ CONFIG := icc
  # CONFIG := gcc
 -# CONFIG := gcc-4.6
 +# CONFIG := gcc-4.8
  # CONFIG := emcc
  # CONFIG := mxe
  
@@@ -169,15 -106,15 +169,19 @@@ CXXFLAGS := $(filter-out -fPIC,$(CXXFLA
  LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s
  LDLIBS := $(filter-out -lrt,$(LDLIBS))
  ABCMKARGS += ARCHFLAGS="-DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32_NO_DLL -x c++ -fpermissive -w"
 -ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" READLINE=0 CC="$(CXX)" CXX="$(CXX)"
 +ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" ABC_USE_NO_READLINE=1 CC="$(CXX)" CXX="$(CXX)"
  EXE = .exe
  
+ else ifeq ($(CONFIG),icc)
+ CXX = icpc
+ CXXFLAGS += -std=gnu++0x -Os
+ 
  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
 +
 +ifeq ($(ENABLE_LIBYOSYS),1)
 +TARGETS += libyosys.so
  endif
  
  ifeq ($(ENABLE_READLINE),1)

diff --cc backends/blif/blif.cc
Simple merge