fix back

Author: vinay-deshmukh

libc/CMakeLists.txt

@@ -34,8 +34,6 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_definitions("-D_DEBUG")
 endif()
 
-add_compile_options("-Werror=global-constructors")
-
 # Default to C++17
 set(CMAKE_CXX_STANDARD 17)
 

libc/test/integration/startup/gpu/init_fini_array_test.cpp

@@ -32,7 +32,10 @@ int GLOBAL_INDEX = 512;
 int INITVAL_INITIALIZER = 0x600D;
 int BEFORE_INITIALIZER = 0xFEED;
 
-static A global(GLOBAL_INDEX, INITVAL_INITIALIZER);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wglobal-constructors"
+A global(GLOBAL_INDEX, INITVAL_INITIALIZER);
+#pragma GCC diagnostic pop
 
 int initval = 0;
 int before = 0;

libc/test/integration/startup/linux/init_fini_array_test.cpp

@@ -31,7 +31,10 @@ class A {
 int GLOBAL_INDEX = 512;
 int INITVAL_INITIALIZER = 0x600D;
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wglobal-constructors"
 A global(GLOBAL_INDEX, INITVAL_INITIALIZER);
+#pragma GCC diagnostic pop
 
 int initval = 0;
 int preinitval = 0;