diff options
| author | Clifford Wolf <clifford@clifford.at> | 2016-01-31 19:55:48 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2016-01-31 19:55:48 +0100 |
| commit | 71f418c4682b8870c9f6ecb3c6f966d6072f8dfc (patch) | |
| tree | cfffac62ba412a9e38d768bb9218aad5296aa377 | |
| parent | 5462399c880c4736d0382bf5ba294e97637b393d (diff) | |
More clang sanitizer stuff
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | passes/techmap/Makefile.inc | 2 |
2 files changed, 12 insertions, 3 deletions
@@ -94,6 +94,7 @@ endif ifeq ($(CONFIG),clang) CXX = clang +LD = clang++ CXXFLAGS += -std=c++11 -Os ifneq ($(SANITIZER),) @@ -103,6 +104,10 @@ LDFLAGS += -g -fsanitize=$(SANITIZER) ifeq ($(SANITIZER),address) ENABLE_COVER := 0 endif +ifeq ($(SANITIZER),memory) +CXXFLAGS += -fPIE +LDFLAGS += -fPIE +endif ifeq ($(SANITIZER),cfi) CXXFLAGS += -flto LDFLAGS += -flto @@ -111,14 +116,17 @@ endif else ifeq ($(CONFIG),gcc) CXX = gcc +LD = gcc CXXFLAGS += -std=gnu++0x -Os else ifeq ($(CONFIG),gcc-4.6) CXX = gcc-4.6 +LD = gcc-4.6 CXXFLAGS += -std=gnu++0x -Os else ifeq ($(CONFIG),emcc) CXX = emcc +LD = emcc CXXFLAGS := -std=c++11 $(filter-out -fPIC -ggdb,$(CXXFLAGS)) EMCCFLAGS := -Os -Wno-warn-absolute-paths EMCCFLAGS += --memory-init-file 0 --embed-file share -s NO_EXIT_RUNTIME=1 @@ -148,6 +156,7 @@ yosys.html: misc/yosys.html else ifeq ($(CONFIG),mxe) CXX = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc +LD = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc CXXFLAGS += -std=gnu++0x -Os -D_POSIX_SOURCE CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS)) LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s @@ -321,10 +330,10 @@ yosys.js: $(filter-out yosysjs-$(YOSYS_VER).zip,$(EXTRA_TARGETS)) endif yosys$(EXE): $(OBJS) - $(P) $(CXX) -o yosys$(EXE) $(LDFLAGS) $(OBJS) $(LDLIBS) + $(P) $(LD) -o yosys$(EXE) $(LDFLAGS) $(OBJS) $(LDLIBS) libyosys.so: $(filter-out kernel/driver.o,$(OBJS)) - $(P) $(CXX) -o libyosys.so -shared -Wl,-soname,libyosys.so $(LDFLAGS) $^ $(LDLIBS) + $(P) $(LD) -o libyosys.so -shared -Wl,-soname,libyosys.so $(LDFLAGS) $^ $(LDLIBS) %.o: %.cc $(Q) mkdir -p $(dir $@) diff --git a/passes/techmap/Makefile.inc b/passes/techmap/Makefile.inc index 674cb77c..fa938868 100644 --- a/passes/techmap/Makefile.inc +++ b/passes/techmap/Makefile.inc @@ -42,6 +42,6 @@ EXTRA_OBJS += passes/techmap/filterlib.o yosys-filterlib$(EXE): passes/techmap/filterlib.o $(Q) mkdir -p $(dir $@) - $(P) $(CXX) -o yosys-filterlib$(EXE) $(LDFLAGS) $^ $(LDLIBS) + $(P) $(LD) -o yosys-filterlib$(EXE) $(LDFLAGS) $^ $(LDLIBS) endif |