WebSVN – QNX 8.QNX8 LLVM/Clang compiler suite – Diff – //cross-build.sh

 echo "QNX_HOST=${QNX_HOST}"
 echo "QNX_TARGET=${QNX_TARGET}"
 echo "MAKEFLAGS=${MAKEFLAGS}"
 # create the QNX CMake toolchain file
-echo '# '${TARGET_TRIPLE}' CMake toolchain file by Pierre-Marie Baty <pm@pmbaty.com>
+test -e "${TARGET_TRIPLE}.cmake" || echo '# '${TARGET_TRIPLE}' CMake toolchain file by Pierre-Marie Baty <pm@pmbaty.com>
 SET(CMAKE_SYSTEM_NAME "QNX")
 SET(CMAKE_SYSTEM_VERSION "'${QNXSDK_VERSION}'")
 SET(QNX "1")
         # test if already patched
         grep -q "${2}" "../${LLVM_SOURCES_DIR}/${1}" && return
         # tell what we're about to do
         echo "Patching ${1}..."
         # have a backup first
-        test -f "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [BEFORE PATCH]" || cp "../${LLVM_SOURCES_DIR}/${1}" "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [BEFORE PATCH]"
+        test -f "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [ORIGINAL]" || cp "../${LLVM_SOURCES_DIR}/${1}" "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [ORIGINAL]"
         # perform the patch
-        sed -E "${3}" "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [BEFORE PATCH]" > "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [AFTER PATCH]"
+        sed -E "${3}" "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [ORIGINAL]" > "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [PATCHED]"
         # verify that we did it successfully
-        if ! grep -q "${2}" "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [AFTER PATCH]"; then
+        if ! grep -q "${2}" "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [PATCHED]"; then
                 echo "Error: the file ${1} could not be patched. Please investigate and fix manually." | fold -s -w 79; exit 1
         fi
         # and put the patched file in place
-        cp -f "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [AFTER PATCH]" "../${LLVM_SOURCES_DIR}/${1}" || exit 1
+        cp -f "${CURRENT_DIR}/$(echo "${1}"|tr '/' '.') [PATCHED]" "../${LLVM_SOURCES_DIR}/${1}" || exit 1
+}
 # patch llvm/Support/Unix/Path.inc if not done yet
-# replace "defined(__FreeBSD_kernel__)" with "(defined(__FreeBSD_kernel__) || defined(__QNXNTO__))"
+# replace [defined(__FreeBSD_kernel__)] with [(defined(__FreeBSD_kernel__) || defined(__QNXNTO__))]
 # RATIONALE: the concerned parts of the QNX platform SDK (/usr/include/devs/*) are actually largely based on FreeBSD code, to conveniently use the FreeBSD network stack.
 # NONETHELESS, QNX *IS NOT* FreeBSD and "__FreeBSD_kernel__" *SHOULD NOT* be defined, else userland code may falsely assume a genuine FreeBSD include tree to be available,
 # which leads to compilation errors caused by include files assumed to be there whereas they are in fact nowhere to be found (ex: /usr/include/sys/user.h, among others).
 # The QNX8 platform SDK has thus been patched to NOT define __FreeBSD_kernel__ when the -DDONT_DEFINE___FreeBSD_kernel__ flag is passed, and the feature tests in Path.inc
 # that branch into FreeBSD APIs (which ones *are* exposed in the QNX libc since QNX largely shares FreeBSD code) are about to be patched right now to accept __QNXNTO__ too.
 # Additionally, support for statfs()/fstatfs() has been restored in the QNX8 platform SDK in /usr/include/devs/sys/mount.h where it was claimed but absent from the QNX8 libc.
 # FIXME: these hacks should be moved elsewhere not to pollute the QNX8 platform SDK -- it *SHOULD* be possible to build without devs
 backup_and_patch_if_necessary "llvm/lib/Support/Unix/Path.inc" __QNXNTO__ 's/defined\(__FreeBSD_kernel__\)/\(defined\(__FreeBSD_kernel__\) \|\| \defined\(__QNXNTO__\)\)/g'
 # patch lldb/Source/Host/common/Host.cpp if not done yet
-# replace "defined(SIGINFO)" with "(defined(SIGINFO) && !defined(__QNXNTO__))"
+# replace [defined(SIGINFO)] with [(defined(SIGINFO) && !defined(__QNXNTO__))]
 # RATIONALE: the QNX people defined SIGINFO to the value of SIGUSR1 for a mysterious reason, defeating the purpose of SIGUSR1
 # which should be a User-Definable signal as mandated by POSIX. Consequently, userland code that enumerates POSIX signals
 # hits twice the same value and all is left to solve this problem is to filter either one out. Since SIGINFO, contrarily to SIGUSR1,
 # is an optional signal, this is the value that will be left out - even if on QNX nobody can actually use SIGUSR1's value.
 backup_and_patch_if_necessary "lldb/source/Host/common/Host.cpp" __QNXNTO__ 's/defined\(SIGINFO\)/\(defined\(SIGINFO\) \&\& \!defined\(__QNXNTO__\)\)/g'
 #   if (ptrace(PT_TRACE_ME, 0, nullptr, 0) == -1) // <--- undefined: ptrace, PT_TRACE_ME
 #    -D LLVM_ENABLE_PROJECTS="clang;lld;lldb" \
 # patch compiler-rt/lib/builtins/enable_execute_stack.c if not done yet
-# replace "#include "int_lib.h"" with "#ifdef __QNXNTO__\n#define _QNX_SOURCE 1\n#endif\n#include "int_lib.h""
+# replace [#include "int_lib.h"] with [#ifdef __QNXNTO__\n#define _QNX_SOURCE 1\n#endif\n#include "int_lib.h"]
 # RATIONALE: the QNX people decided to hide most of the UNIX APIs of their libc behind a mandatory _QNX_SOURCE definition to separate the Neutrino primitives from the rest maybe.
 # This name does not "enforce" any standard at all (like _POSIX_SOURCE and similar names), it's just a convenient hack for the QNX people to hide stuff.
 # To put things back on track and expose the POSIX interfaces of their libc to the world, _QNX_SOURCE has been added to the toolchain CMake file, but it happens that
 # when building compiler-rt specifically, the CMAKE_C_FLAGS directive is ignored. Patching the source file seems like the best option to fix that.
 backup_and_patch_if_necessary "compiler-rt/lib/builtins/enable_execute_stack.c" __QNXNTO__ 's/#include "int_lib.h"/#ifdef __QNXNTO__\n#define _QNX_SOURCE 1\n#endif\n#include "int_lib.h"/g'
+# patch libunwind/src/RWMutex.hpp
+# replace [#include <pthread.h>] with [#ifdef __QNXNTO__\n#define __EXT_QNX\n#define __EXT_POSIX1_200112\n#endif\n#include <pthread.h>]
+# RATIONALE: the pthreads implementation in QNX 'steals' things from the POSIX.1 standard and hides them behind the __EXT_QNX macro,
+# which is defined when either _QNX_SOURCE or __EXT without anything else is defined. This is not correct and low-level libraries
+# such as libunwind that do not define either of those fail to build. Also note that a FreeBSD-compatible header was added to the QNX8
+# platform SDK: /usr/include/link.h, which defines Elf types as Elf64/Elf32 types depending on the architecture and adds some glue.
+backup_and_patch_if_necessary "libunwind/src/RWMutex.hpp" __QNXNTO__ 's/#include <pthread.h>/#ifdef __QNXNTO__\n#define __EXT_QNX\n#define __EXT_POSIX1_200112\n#endif\n#include <pthread.h>/g'
 # now configure LLVM
 echo "Configuring LLVM build..."
 cmake \
     -D CMAKE_TOOLCHAIN_FILE="${TARGET_TRIPLE}.cmake" \
     -D CMAKE_STAGING_PREFIX="/usr/bin" \
     -D LLVM_HOST_TRIPLE="${TARGET_TRIPLE}" \
     -D LLVM_ENABLE_PROJECTS="clang;lld" \
     -D LLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind" \
     -D LLVM_TARGETS_TO_BUILD="AArch64;X86" \
+    -D COMPILER_RT_BUILD_SANITIZERS="OFF" \
     -G Ninja \
     "../${LLVM_SOURCES_DIR}/llvm" || exit 1
 # hijack the "bin" and "lib/clang" output directories and redirect them to the hypervisor's filesystem
 test -e "${CURRENT_DIR}/llvm-build" && rm -rf "${CURRENT_DIR}/llvm-build"

Subversion Repositories QNX 8.QNX8 LLVM/Clang compiler suite

QNX 8.QNX8 LLVM/Clang compiler suite//cross-build.sh – Rev 7 → 8