[llvm-branch-commits] [flang] ba25381 - Revert "Fix Debug Build Using GCC 15 (#152223)"

[via llvm-branch-commits]

Author: dpalermo
Date: 2025-08-21T21:53:01-05:00
New Revision: ba25381d5aca817e12b2e222d6c13fc4f49cbcc1

URL: https://github.com/llvm/llvm-project/commit/ba25381d5aca817e12b2e222d6c13fc4f49cbcc1
DIFF: https://github.com/llvm/llvm-project/commit/ba25381d5aca817e12b2e222d6c13fc4f49cbcc1.diff

LOG: Revert "Fix Debug Build Using GCC 15 (#152223)"

This reverts commit 304373fb6d03531e62cf7cb1321705259a951fc1.

Added: 
    

Modified: 
    flang-rt/lib/runtime/CMakeLists.txt
    flang/lib/Optimizer/Builder/CMakeLists.txt
    flang/lib/Optimizer/HLFIR/Transforms/CMakeLists.txt
    openmp/runtime/src/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/flang-rt/lib/runtime/CMakeLists.txt b/flang-rt/lib/runtime/CMakeLists.txt
index 08db8b2e3a4db..dc2db1d9902cb 100644
--- a/flang-rt/lib/runtime/CMakeLists.txt
+++ b/flang-rt/lib/runtime/CMakeLists.txt
@@ -183,10 +183,6 @@ endif ()
 
 
 if (NOT WIN32)
-  add_definitions(-U_GLIBCXX_ASSERTIONS -D_GLIBCXX_NO_ASSERTIONS)
-  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>)
-  add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-O2>)
-
   add_flangrt_library(flang_rt.runtime STATIC SHARED
     ${sources}
     LINK_LIBRARIES ${Backtrace_LIBRARY}

diff  --git a/flang/lib/Optimizer/Builder/CMakeLists.txt b/flang/lib/Optimizer/Builder/CMakeLists.txt
index 404afd185fd31..8fb36a750d433 100644
--- a/flang/lib/Optimizer/Builder/CMakeLists.txt
+++ b/flang/lib/Optimizer/Builder/CMakeLists.txt
@@ -50,7 +50,6 @@ add_flang_library(FIRBuilder
   FIRDialectSupport
   FIRSupport
   FortranEvaluate
-  FortranSupport
   HLFIRDialect
 
   MLIR_DEPS

diff  --git a/flang/lib/Optimizer/HLFIR/Transforms/CMakeLists.txt b/flang/lib/Optimizer/HLFIR/Transforms/CMakeLists.txt
index 3775a13e31e95..cc74273d9c5d9 100644
--- a/flang/lib/Optimizer/HLFIR/Transforms/CMakeLists.txt
+++ b/flang/lib/Optimizer/HLFIR/Transforms/CMakeLists.txt
@@ -27,8 +27,6 @@ add_flang_library(HLFIRTransforms
   FIRSupport
   FIRTransforms
   FlangOpenMPTransforms
-  FortranEvaluate
-  FortranSupport
   HLFIRDialect
 
   LINK_COMPONENTS

diff  --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
index 71eab0eedccef..08e1753b93636 100644
--- a/openmp/runtime/src/CMakeLists.txt
+++ b/openmp/runtime/src/CMakeLists.txt
@@ -168,7 +168,7 @@ endif()
 # Disable libstdc++ assertions, even in an LLVM_ENABLE_ASSERTIONS build, to
 # avoid an unwanted dependency on libstdc++.so.
 if(NOT WIN32)
-  add_definitions(-U_GLIBCXX_ASSERTIONS -D_GLIBCXX_NO_ASSERTIONS)
+  add_definitions(-U_GLIBCXX_ASSERTIONS)
 endif()
 
 # Add the OpenMP library