Merge pull request #11081 from HiassofT/le13-gcc-sanitizer

Add support for using gcc sanitizers

Author: chewitt

config/optimize

@@ -42,9 +42,9 @@ CXXFLAGS_OPTIM_SPEED="$CFLAGS_OPTIM_SPEED"
 CFLAGS_OPTIM_SIZE="-Os -fomit-frame-pointer"
 CXXFLAGS_OPTIM_SIZE="$CFLAGS_OPTIM_SIZE"
 # debug settings
-CFLAGS_OPTIM_DEBUG="-ggdb -Og"
+CFLAGS_OPTIM_DEBUG="-ggdb -Og ${DEBUG_SANITIZER_CFLAGS}"
 CXXFLAGS_OPTIM_DEBUG="$CFLAGS_OPTIM_DEBUG"
-LDFLAGS_OPTIM_DEBUG="-ggdb"
+LDFLAGS_OPTIM_DEBUG="-ggdb ${DEBUG_SANITIZER_LDFLAGS}"
 # split debug settings (requires gold)
 CFLAGS_OPTIM_DEBUG_SPLIT="-gdwarf-4 -gsplit-dwarf -Og"
 CXXFLAGS_OPTIM_DEBUG_SPLIT="$CFLAGS_OPTIM_DEBUG_SPLIT"

config/options

@@ -149,6 +149,24 @@ if [ -z "${CONFIG_SHELL}" ] && [ -x "/bin/dash" ]; then
   export CONFIG_SHELL="/bin/dash"
 fi
 
+# enable gcc sanitizer support in debug builds
+# DEBUG_SANITIZER_FLAGS sets both CFLAGS and LDFLAGS
+if [ "${DEBUG:-no}" != "no" ]; then
+  if [ -n "${DEBUG_SANITIZER_FLAGS}" ]; then
+    DEBUG_SANITIZER_CFLAGS="${DEBUG_SANITIZER_FLAGS}"
+    DEBUG_SANITIZER_LDFLAGS="${DEBUG_SANITIZER_FLAGS}"
+  fi
+  if [ -n "${DEBUG_SANITIZER_CFLAGS}" ] || [ -n "${DEBUG_SANITIZER_LDFLAGS}" ]; then
+    SANITIZER_SUPPORT="yes"
+  else
+    SANITIZER_SUPPORT="no"
+  fi
+else
+  SANITIZER_SUPPORT="no"
+  DEBUG_SANITIZER_CFLAGS=""
+  DEBUG_SANITIZER_LDFLAGS=""
+fi
+
 check_config
 
 . config/graphic

packages/lang/gcc/package.mk

@@ -168,6 +168,14 @@ makeinstall_target() {
   mkdir -p ${INSTALL}/usr/lib
     cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libgcc/libgcc_s.so* ${INSTALL}/usr/lib
     cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libstdc++-v3/src/.libs/libstdc++.so* ${INSTALL}/usr/lib
+    if [ "${SANITIZER_SUPPORT}" = "yes" ]; then
+      for f in ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libsanitizer/*/.libs/*.so*; do
+        # exclude so.0.0.0T files
+        if [[ ! "${f}" =~ T$ ]]; then
+          cp -P "${f}" ${INSTALL}/usr/lib
+        fi
+      done
+    fi
     if [ "${OPTS_LIBATOMIC}" = "--enable-libatomic" ]; then
       cp -P ${PKG_BUILD}/.${HOST_NAME}/${TARGET_NAME}/libatomic/.libs/libatomic.so* ${INSTALL}/usr/lib
     fi