summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9824aaf)
raw | patch | inline | side by side (parent: 9824aaf)
author | Ajay Jayaraj <ajayj@ti.com> | |
Thu, 21 Jun 2018 17:12:33 +0000 (12:12 -0500) | ||
committer | Ajay Jayaraj <ajayj@ti.com> | |
Thu, 21 Jun 2018 19:25:20 +0000 (14:25 -0500) |
1. Allow CXX to be overridden - this is required during a yocto
nativesdk build because the -isystem option is suffixed to CXX
2. Switch tidl-viewer to a 64bit x86/Linux binary. Building a 32bit
binary within a 64bit Yocto devkit is complicated.
(MCT-1001)
nativesdk build because the -isystem option is suffixed to CXX
2. Switch tidl-viewer to a 64bit x86/Linux binary. Building a 32bit
binary within a 64bit Yocto devkit is complicated.
(MCT-1001)
tidl_api/src/tidl_create_params.h | patch | blob | history | |
viewer/Makefile | patch | blob | history |
index f702b688e92d45525286b3b79c073ebee7d9c549..42546d06fd2c7f20a13dae73d89b5d6f6e5c880a 100644 (file)
*/
typedef struct
{
+ // The tidl-viewer binary is built for 64b x86/Linux. On such systems,
+ // void* is 64b and this breaks structure size/layout required by TIDL.
+ // Cannot use -m32 with yocto builds. Workaround is to use int32_t for ptr.
+ // ptr is not used by the tidl-viewer.
+ #if defined(__x86_64__)
+ int32_t ptr;
+ #else
void* ptr;
+ #endif
int32_t bufSize;
int32_t reserved[2];
}sBuffer_t;
diff --git a/viewer/Makefile b/viewer/Makefile
index d94171247eeec2d8059b5b8c11a9b3a7ca0a284a..b5b0dfa2ab35e141a1a1fa8d6fdb475d62cb5848 100644 (file)
--- a/viewer/Makefile
+++ b/viewer/Makefile
TIDL_API_DIR=../tidl_api
-# -m32 required on x86 to ensure consistent layout of struct sTIDL_Network_t
ifeq ($(TARGET),x86)
- CXX = g++
- CXXFLAGS += -m32 -static
+ CXX ?= g++
+ CXXFLAGS += -static
else
include $(TIDL_API_DIR)/make.inc
endif