build/build.sh | 6 3 + 3 - 0 !
build/cross_compile.sh | 2 1 + 1 - 0 !
src/CMake/findpackage.cmake | 4 2 + 2 - 0 !
src/CMake/version.cmake | 4 2 + 2 - 0 !
src/CMakeLists.txt | 21 8 + 13 - 0 !
src/runtime_src/CMakeLists.txt | 6 3 + 3 - 0 !
src/runtime_src/core/CMakeLists.txt | 16 7 + 9 - 0 !
src/runtime_src/core/tools/CMakeLists.txt | 4 2 + 2 - 0 !
src/runtime_src/core/tools/xbmgmt2/CMakeLists.txt | 4 2 + 2 - 0 !
src/runtime_src/core/tools/xbutil2/CMakeLists.txt | 4 2 + 2 - 0 !
src/runtime_src/ert/CMakeLists.txt | 2 1 + 1 - 0 !
src/runtime_src/tools/xclbinutil/CMakeLists.txt | 2 1 + 1 - 0 !
src/runtime_src/xdp/CMakeLists.txt | 4 2 + 2 - 0 !
13 files changed, 36 insertions(+), 43 deletions(-)

 [patch 1/9] decouple the target decision from native / cross builds

When building XRT, the variable XRT_NATIVE_BUILD is used to track
whether HOST == TARGET.

Unfortunately when XRT_NATIVE_BUILD is set to "no", the usage has also
expanded to include the assumption that XRT is being built for
embedded targets, e.g., Xilinx MPSoC. This assumption makes it
impossible to do native builds targeting edge devices - useful for
builds running builds directly on arm64 platforms.

In order to decouple the semantics of native / cross build from the
target - PCIe or edge, introduce a new variable "XRT_EDGE_BUILD" that
is used to indicate that the build is targetting edge devices. It is
possible to xrt builds for edge devices by passing
"-DXRT_EDGE_BUILD=yes" when invoking cmake. With this change, it is no
longer necessary to track native / cross builds and XRT_NATIVE_BUILD
can be dropped.

Signed-off-by: Punit Agrawal <punit1.agrawal@toshiba.co.jp>

src/CMake/embedded_system.cmake | 2 1 + 1 - 0 !
src/CMake/nativeLnx.cmake | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 [patch 2/9] make "git" optional for the build

During the build, "git" is used to query information regarding the
branch and top commit which is then embedded in the build
artifacts.

Not all builds of xrt are from the upstream trees and embedding
arbitrary git tree information is not helpful. Drop the requirement
for "git" during the build - thus preventing the embedding of
associated information as well.

Signed-off-by: Punit Agrawal <punit1.agrawal@toshiba.co.jp>

src/CMake/nativeLnx.cmake | 4 2 + 2 - 0 !
src/CMakeLists.txt | 5 0 + 5 - 0 !
2 files changed, 2 insertions(+), 7 deletions(-)

 [patch 3/9] don't force install location

The XRT build system makes assumption about where the generated
binaries are to be installed depending on whether the target is PCIe
or edge device.

Drop these assumptions and let the caller specify if they want things
installed anywhere other than the default.

Signed-off-by: Punit Agrawal <punit1.agrawal@toshiba.co.jp>

src/CMake/embedded_system.cmake | 2 1 + 1 - 0 !
src/CMake/pkgconfig.cmake | 4 2 + 2 - 0 !
2 files changed, 3 insertions(+), 3 deletions(-)

 [patch 4/9] install pkgconfig files in multiarch aware location

src/CMake/embedded_system.cmake | 2 1 + 1 - 0 !
src/CMake/nativeLnx.cmake | 4 2 + 2 - 0 !
src/xma/src/xmaapi/CMakeLists.txt | 6 3 + 3 - 0 !
src/xma/src/xmaplugin/CMakeLists.txt | 6 3 + 3 - 0 !
4 files changed, 9 insertions(+), 9 deletions(-)

 [patch 5/9] update library install location

By default XRT installs libraries to locations that don't take
multi-arch into account. In some situations, the install location is
prefixed with "xrt".

Make the library install path multiarch aware by using the cmake
variable CMAKE_INSTALL_LIBDIR for all the libraries.

src/CMake/version.cmake | 10 2 + 8 - 0 !
1 file changed, 2 insertions(+), 8 deletions(-)

 [patch 6/9] src/cmake/version.cmake: consistently use utc timezone
 for timestamps.

While cmake TIMESTAMP respects the SOURCE_DATE_EPOCH environment
variable, it needs to be specified in the UTC timezone otherwise the
local timezone is used.

Convert XRT_DATE_RFC to use cmake TIMESTAMP.

https://reproducible-builds.org/docs/source-date-epoch/

src/runtime_src/ert/ert.mk | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [patch 7/9] src/runtime_src/ert/ert.mk: disable optimize o3

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>

src/runtime_src/core/pcie/tools/xbflash.qspi/xqspips.cpp | 1 1 + 0 - 0 !
src/runtime_src/core/pcie/tools/xbflash.qspi/xspi.cpp | 1 1 + 0 - 0 !
src/runtime_src/core/pcie/tools/xbmgmt/xqspips.cpp | 1 1 + 0 - 0 !
3 files changed, 3 insertions(+)

 [patch 8/9] add include <array>

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>

src/runtime_src/core/pcie/emulation/cpu_em/generic_pcie_hal2/shim.cxx | 8 4 + 4 - 0 !
src/runtime_src/core/pcie/emulation/hw_em/generic_pcie_hal2/shim.cxx | 8 4 + 4 - 0 !
2 files changed, 8 insertions(+), 8 deletions(-)

 [patch 9/9] fix cpp check for double free

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>

src/runtime_src/tools/xclbinutil/XclBinUtilities.cxx | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [patch] fix format of sscanf

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>

src/runtime_src/core/common/module_loader.cpp | 8 7 + 1 - 0 !
1 file changed, 7 insertions(+), 1 deletion(-)

 [patch] module_loader.cpp: change modules path to multiarch

Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@debian.org>

src/runtime_src/core/common/time.h | 1 1 + 0 - 0 !
src/runtime_src/core/edge/user/aie/common_layer/adf_api_config.h | 1 1 + 0 - 0 !
src/runtime_src/core/edge/user/zynq_dev.h | 1 1 + 0 - 0 !
src/runtime_src/core/pcie/common/dd.h | 1 1 + 0 - 0 !
src/runtime_src/tools/xclbinutil/CBOR.h | 1 1 + 0 - 0 !
src/runtime_src/tools/xclbinutil/DTCStringsBlock.h | 1 1 + 0 - 0 !
src/runtime_src/tools/xclbinutil/XclBinSignature.h | 1 1 + 0 - 0 !
src/runtime_src/xdp/profile/database/events/device_events.h | 1 1 + 0 - 0 !
src/runtime_src/xdp/profile/database/events/vtf_event.h | 1 1 + 0 - 0 !
src/runtime_src/xdp/profile/device/aie_trace/aie_trace_logger.h | 1 1 + 0 - 0 !
src/runtime_src/xdp/profile/writer/vp_base/vp_writer.h | 1 1 + 0 - 0 !
src/xma/include/app/xma_utils.hpp | 1 1 + 0 - 0 !
src/xma/include/app/xmahw.h | 2 2 + 0 - 0 !
src/xma/include/plg/xmasess.h | 1 1 + 0 - 0 !
14 files changed, 15 insertions(+)

---