diff options
Diffstat (limited to 'decoder/build/linux')
| -rw-r--r-- | decoder/build/linux/makefile | 8 | ||||
| -rw-r--r-- | decoder/build/linux/makefile.dev | 5 | ||||
| -rw-r--r-- | decoder/build/linux/ref_trace_decode_lib/makefile | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/decoder/build/linux/makefile b/decoder/build/linux/makefile index 6032c2cf7283..659cf68c6376 100644 --- a/decoder/build/linux/makefile +++ b/decoder/build/linux/makefile @@ -70,8 +70,8 @@ INSTALL_BIN_DIR=$(PREFIX)/bin export INSTALL_INCLUDE_DIR=$(PREFIX)/include/ # compile flags -CFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -fPIC -CXXFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -fPIC -std=c++11 +CFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -Wlogical-op -fPIC +CXXFLAGS += $(CPPFLAGS) -c -Wall -DLINUX -Wno-switch -Wlogical-op -fPIC -std=c++11 LDFLAGS += -Wl,-z,defs ARFLAGS ?= rcs @@ -81,8 +81,8 @@ CFLAGS += -g -O0 -DDEBUG CXXFLAGS += -g -O0 -DDEBUG BUILD_VARIANT=dbg else -CFLAGS += -g -O2 -DNDEBUG -CXXFLAGS += -g -O2 -DNDEBUG +CFLAGS += -O2 -DNDEBUG +CXXFLAGS += -O2 -DNDEBUG BUILD_VARIANT=rel endif diff --git a/decoder/build/linux/makefile.dev b/decoder/build/linux/makefile.dev index 7c02328db2a8..5eb1ec9557fa 100644 --- a/decoder/build/linux/makefile.dev +++ b/decoder/build/linux/makefile.dev @@ -56,7 +56,12 @@ CXXFLAGS += $(MFLAG) CFLAGS += $(MFLAG) LDFLAGS += $(MFLAG) +ifdef GCCDIR +GCCVER:= $(shell $(CROSS_COMPILE)gcc -dumpversion | cut -c 1-3) +PLAT_DIR=builddir/linux$(BIT_VARIANT)/GCC_$(GCCVER) +else PLAT_DIR=linux$(BIT_VARIANT)/$(BUILD_VARIANT) +endif # include the main makefile include makefile diff --git a/decoder/build/linux/ref_trace_decode_lib/makefile b/decoder/build/linux/ref_trace_decode_lib/makefile index 373e8248bd6a..7087036cc62e 100644 --- a/decoder/build/linux/ref_trace_decode_lib/makefile +++ b/decoder/build/linux/ref_trace_decode_lib/makefile @@ -59,11 +59,9 @@ ETMV3OBJ= $(BUILD_DIR)/trc_cmp_cfg_etmv3.o \ $(BUILD_DIR)/trc_pkt_proc_etmv3_impl.o ETMV4OBJ= $(BUILD_DIR)/trc_cmp_cfg_etmv4.o \ - $(BUILD_DIR)/trc_pkt_proc_etmv4.o \ - $(BUILD_DIR)/trc_pkt_proc_etmv4i_impl.o \ + $(BUILD_DIR)/trc_pkt_proc_etmv4i.o \ $(BUILD_DIR)/trc_pkt_decode_etmv4i.o \ $(BUILD_DIR)/trc_pkt_elem_etmv4i.o \ - $(BUILD_DIR)/trc_pkt_elem_etmv4d.o \ $(BUILD_DIR)/trc_etmv4_stack_elem.o PTMOBJ= $(BUILD_DIR)/trc_cmp_cfg_ptm.o \ @@ -94,6 +92,7 @@ OBJECTS=$(BUILD_DIR)/ocsd_code_follower.o \ $(BUILD_DIR)/ocsd_error.o \ $(BUILD_DIR)/ocsd_error_logger.o \ $(BUILD_DIR)/ocsd_gen_elem_list.o \ + $(BUILD_DIR)/ocsd_gen_elem_stack.o \ $(BUILD_DIR)/ocsd_lib_dcd_register.o \ $(BUILD_DIR)/ocsd_msg_logger.o \ $(BUILD_DIR)/ocsd_version.o \ |