From 371f00268056194d96a657d57924346ffb03839d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 23 Jan 2019 14:58:29 +0200
Subject: [PATCH] Revert "Suppress compiler warnings in libunwind/libcxxabi if
 llvm cmake files are unavailable"

This reverts commit 92f301f775835bbbfe981acfd7999d97ed333d74.

With the latest versions of libunwind and libcxxabi, the -w option
for suppressing compiler warnings isn't added any longer when building
with the llvm cmake files available.
---
 build-libcxx.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/build-libcxx.sh b/build-libcxx.sh
index 38db0e4..d9ed8d3 100755
--- a/build-libcxx.sh
+++ b/build-libcxx.sh
@@ -89,9 +89,6 @@ build_all() {
     for arch in $ARCHS; do
         mkdir -p build-$arch-$type
         cd build-$arch-$type
-        # If llvm-config and the llvm cmake files are available, -w gets added
-        # to the compiler flags; manually add it here to avoid noisy warnings
-        # that normally are suppressed.
         cmake \
             ${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
             -DCMAKE_BUILD_TYPE=Release \
@@ -112,8 +109,7 @@ build_all() {
             -DLIBUNWIND_ENABLE_STATIC=$STATIC \
             -DLIBUNWIND_ENABLE_CROSS_UNWINDING=FALSE \
             -DLIBUNWIND_STANDALONE_BUILD=TRUE \
-            -DCMAKE_CXX_FLAGS="-nostdinc++ -I$LIBCXX/include -w" \
-            -DCMAKE_C_FLAGS="-w" \
+            -DCMAKE_CXX_FLAGS="-nostdinc++ -I$LIBCXX/include" \
             -DCMAKE_SHARED_LINKER_FLAGS="-lpsapi" \
             ..
         make -j$CORES
@@ -136,9 +132,6 @@ build_all() {
     for arch in $ARCHS; do
         mkdir -p build-$arch-$type
         cd build-$arch-$type
-        # If llvm-config and the llvm cmake files are available, -w gets added
-        # to the compiler flags; manually add it here to avoid noisy warnings
-        # that normally are suppressed.
         if [ "$type" = "shared" ]; then
             LIBCXXABI_VISIBILITY_FLAGS="-D_LIBCPP_BUILDING_LIBRARY -U_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS"
         else
@@ -166,7 +159,7 @@ build_all() {
             -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=OFF \
             -DLLVM_NO_OLD_LIBSTDCXX=TRUE \
             -DCXX_SUPPORTS_CXX11=TRUE \
-            -DCMAKE_CXX_FLAGS="$LIBCXXABI_VISIBILITY_FLAGS -D_LIBCPP_HAS_THREAD_API_WIN32 -w" \
+            -DCMAKE_CXX_FLAGS="$LIBCXXABI_VISIBILITY_FLAGS -D_LIBCPP_HAS_THREAD_API_WIN32" \
             ..
         make -j$CORES
         cd ..