diff options
Diffstat (limited to 'decoder/build')
5 files changed, 23 insertions, 27 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 \ diff --git a/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj b/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj index 095f27b56acc..f1aaece9b3ba 100644 --- a/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj +++ b/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj @@ -323,6 +323,7 @@ <ClInclude Include="..\..\..\include\common\ocsd_error.h" /> <ClInclude Include="..\..\..\include\common\ocsd_error_logger.h" /> <ClInclude Include="..\..\..\include\common\ocsd_gen_elem_list.h" /> + <ClInclude Include="..\..\..\include\common\ocsd_gen_elem_stack.h" /> <ClInclude Include="..\..\..\include\common\ocsd_lib_dcd_register.h" /> <ClInclude Include="..\..\..\include\common\ocsd_msg_logger.h" /> <ClInclude Include="..\..\..\include\common\ocsd_pe_context.h" /> @@ -400,8 +401,6 @@ <ClInclude Include="..\..\..\include\opencsd\trc_gen_elem_types.h" /> <ClInclude Include="..\..\..\include\opencsd\trc_pkt_types.h" /> <ClInclude Include="..\..\..\source\etmv3\trc_pkt_proc_etmv3_impl.h" /> - <ClInclude Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4d_impl.h" /> - <ClInclude Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i_impl.h" /> <ClInclude Include="..\..\..\source\trc_frame_deformatter_impl.h" /> </ItemGroup> <ItemGroup> @@ -413,10 +412,8 @@ <ClCompile Include="..\..\..\source\etmv4\trc_cmp_cfg_etmv4.cpp" /> <ClCompile Include="..\..\..\source\etmv4\trc_etmv4_stack_elem.cpp" /> <ClCompile Include="..\..\..\source\etmv4\trc_pkt_decode_etmv4i.cpp" /> - <ClCompile Include="..\..\..\source\etmv4\trc_pkt_elem_etmv4d.cpp" /> <ClCompile Include="..\..\..\source\etmv4\trc_pkt_elem_etmv4i.cpp" /> - <ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4.cpp" /> - <ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i_impl.cpp" /> + <ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i.cpp" /> <ClCompile Include="..\..\..\source\i_dec\trc_idec_arminst.cpp" /> <ClCompile Include="..\..\..\source\i_dec\trc_i_decode.cpp" /> <ClCompile Include="..\..\..\source\mem_acc\trc_mem_acc_base.cpp" /> @@ -430,6 +427,7 @@ <ClCompile Include="..\..\..\source\ocsd_error.cpp" /> <ClCompile Include="..\..\..\source\ocsd_error_logger.cpp" /> <ClCompile Include="..\..\..\source\ocsd_gen_elem_list.cpp" /> + <ClCompile Include="..\..\..\source\ocsd_gen_elem_stack.cpp" /> <ClCompile Include="..\..\..\source\ocsd_lib_dcd_register.cpp" /> <ClCompile Include="..\..\..\source\ocsd_msg_logger.cpp" /> <ClCompile Include="..\..\..\source\ocsd_version.cpp" /> diff --git a/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters b/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters index 1ef87207089f..cdb6f84f736d 100644 --- a/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters +++ b/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters @@ -221,12 +221,6 @@ <ClInclude Include="..\..\..\include\opencsd\ptm\trc_pkt_decode_ptm.h"> <Filter>Header Files\ptm</Filter> </ClInclude> - <ClInclude Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4d_impl.h"> - <Filter>Source Files\etmv4</Filter> - </ClInclude> - <ClInclude Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i_impl.h"> - <Filter>Source Files\etmv4</Filter> - </ClInclude> <ClInclude Include="..\..\..\source\etmv3\trc_pkt_proc_etmv3_impl.h"> <Filter>Source Files\etmv3</Filter> </ClInclude> @@ -359,6 +353,9 @@ <ClInclude Include="..\..\..\include\opencsd\ocsd_if_version.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\..\..\include\common\ocsd_gen_elem_stack.h"> + <Filter>Header Files\common</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\source\trc_component.cpp"> @@ -385,18 +382,9 @@ <ClCompile Include="..\..\..\source\ptm\trc_pkt_proc_ptm.cpp"> <Filter>Source Files\ptm</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\etmv4\trc_pkt_elem_etmv4d.cpp"> - <Filter>Source Files\etmv4</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\etmv4\trc_pkt_elem_etmv4i.cpp"> <Filter>Source Files\etmv4</Filter> </ClCompile> - <ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4.cpp"> - <Filter>Source Files\etmv4</Filter> - </ClCompile> - <ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i_impl.cpp"> - <Filter>Source Files\etmv4</Filter> - </ClCompile> <ClCompile Include="..\..\..\source\etmv4\trc_pkt_decode_etmv4i.cpp"> <Filter>Source Files\etmv4</Filter> </ClCompile> @@ -490,5 +478,11 @@ <ClCompile Include="..\..\..\source\mem_acc\trc_mem_acc_cache.cpp"> <Filter>Source Files\mem_acc</Filter> </ClCompile> + <ClCompile Include="..\..\..\source\etmv4\trc_pkt_proc_etmv4i.cpp"> + <Filter>Source Files\etmv4</Filter> + </ClCompile> + <ClCompile Include="..\..\..\source\ocsd_gen_elem_stack.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> </Project>
\ No newline at end of file |