custom-libcxx

Author: ls-1801

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         arch: ['x64', 'arm64']
         stdlib: ['libcxx', 'libstdcxx']
-        sanitizer: ['none', 'address', 'thread', 'undefined']
+        sanitizer: ['none', 'asan', 'tsan', 'ubsan']
     steps:
       - uses: AutoModality/action-clean@v1
       - uses: actions/checkout@v2
@@ -27,12 +27,17 @@ jobs:
         id: compressdeps
         run: |
           ZSTD_CLEVEL=19 ZSTD_NBTHREADS=0 tar --zstd -cf nes-llvm-20-${{ matrix.arch }}-${{ matrix.sanitizer }}-${{ matrix.stdlib }}.tar.zstd clang  
+          if [ "${{matrix.stdlib}}" == "libcxx" ]; then
+            ZSTD_CLEVEL=19 ZSTD_NBTHREADS=0 tar --zstd -cf nes-libcxx-20-${{ matrix.arch }}-${{ matrix.sanitizer }}.tar.zstd libcxx
+          fi
       - name: Release
         uses: softprops/action-gh-release@v1
         id: createrelease
         with:
+          fail_on_unmatched_files: false
           files: |
             nes-llvm-20-${{ matrix.arch }}-${{ matrix.sanitizer }}-${{ matrix.stdlib }}.tar.zstd
+            nes-libcxx-20-${{ matrix.arch }}-${{ matrix.sanitizer }}.tar.zstd
       - name: Clean build artifacts
         id: cleanbuildartifacts
         if: always()

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "llvm-project"]
 	path = llvm-project
-	url = git@github.com:llvm/llvm-project.git
+	url = https://github.com/llvm/llvm-project

build_llvm.sh

@@ -13,27 +13,28 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 set -o xtrace
-cd /build_dir/llvm-project
-rm -rf ./build
-mkdir build
-
-capitalize() {
-  if [ -z "$1" ]; then
-    return 1
-  fi
-  
-  local first_char rest
-  first_char=$(echo "${1:0:1}" | tr '[:lower:]' '[:upper:]')
-  rest="${1:1}"
-  echo "${first_char}${rest}"
-}
+set -e
+cd build_dir/llvm-project
 
 CXX_FLAGS=""
 LDFLAGS=""
 ADDITIONAL_FLAGS=""
 if [ "$STDLIB" == "libcxx" ]; then
-    CXXFLAGS="-stdlib=libc++ -std=c++23"
-    LDFLAGS="-lc++"
+    if [ "$ENABLE_SANITIZER" = "none" ]; then 
+      cmake -G Ninja -S runtimes -B build-libcxx -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" -DCMAKE_INSTALL_PREFIX="/build_dir/libcxx"; 
+    elif [ "$ENABLE_SANITIZER" = "asan" ]; then 
+      cmake -G Ninja -S runtimes -B build-libcxx -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" -DCMAKE_INSTALL_PREFIX="/build_dir/libcxx" -DLLVM_USE_SANITIZER="Address"; 
+    elif [ "$ENABLE_SANITIZER" = "tsan" ]; then 
+      cmake -G Ninja -S runtimes -B build-libcxx -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" -DCMAKE_INSTALL_PREFIX="/build_dir/libcxx" -DLLVM_USE_SANITIZER="Thread"; 
+    elif [ "$ENABLE_SANITIZER" = "ubsan" ]; then 
+      cmake -G Ninja -S runtimes -B build-libcxx -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" -DCMAKE_INSTALL_PREFIX="/build_dir/libcxx" -DLLVM_USE_SANITIZER="Undefined"; 
+    else 
+      echo unexpected sanitizer: $SANITIZER; 
+      exit 1
+    fi
+    ninja -C build-libcxx install-cxx install-cxxabi install-unwind
+    CXXFLAGS="-std=c++23 -nostdinc++ -isystem /build_dir/libcxx/include/c++/v1"
+    LDFLAGS="-L/build_dir/libcxx/lib -lc++ -rpath /build_dir/libcxx/lib"
 elif [ "$STDLIB" == "libstdcxx" ]; then
     CXXFLAGS="-std=c++23"
     LDFLAGS=""
@@ -42,16 +43,19 @@ else
     exit 1
 fi
 
-if [ ! "${ENABLE_SANITIZER}" = "none" ]; then
-    ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} -DLLVM_USE_SANITIZER=$(capitalize ${ENABLE_SANITIZER})"
-fi
-
-if [ "${ENABLE_SANITIZER}" = "undefined" ]; then
-    ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} -DLLVM_ENABLE_RTTI=ON"
-fi
-
-if [ "${ENABLE_SANITIZER}" = "thread" ]; then
+if [ "$ENABLE_SANITIZER" = "none" ]; then 
+    echo "Not using a sanitizer"
+elif [ "$ENABLE_SANITIZER" = "asan" ]; then 
+    ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} -DLLVM_USE_SANITIZER=Address"
+elif [ "$ENABLE_SANITIZER" = "tsan" ]; then 
+    ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} -DLLVM_USE_SANITIZER=Thread"
     export TSAN_OPTIONS="report_bugs=0"
+elif [ "$ENABLE_SANITIZER" = "ubsan" ]; then 
+    ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} -DLLVM_ENABLE_RTTI=ON"
+    ADDITIONAL_FLAGS="${ADDITIONAL_FLAGS} -DLLVM_USE_SANITIZER=Undefined"
+else 
+  echo unexpected sanitizer: $SANITIZER; 
+  exit 1
 fi
 
 if [ ! -z "${CXXFLAGS}" ]; then
@@ -62,6 +66,7 @@ if [ ! -z "${LDFLAGS}" ]; then
     export LDFLAGS
 fi
 
+
 cmake -G Ninja -S llvm -B build -DCMAKE_BUILD_TYPE=Release \
     			        -DLLVM_ENABLE_PROJECTS="mlir"   \
 				-DLLVM_TARGETS_TO_BUILD=Native \