Undo code fixes

Author: vinay-deshmukh

libc/test/UnitTest/LibcTest.h

@@ -334,18 +334,6 @@ CString libc_make_test_file_path_func(const char *file_name);
     return "[ParamType = " #TYPE "]";                                          \
   }
 
-#define LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA(x) _Pragma(#x)
-
-#define LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_BEGIN                                  \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA(GCC diagnostic push)
-
-#define LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_BODY                                   \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA(GCC diagnostic ignored                       \
-                                  "-Wglobal-constructors")
-
-#define LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_END                                    \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA(GCC diagnostic pop)
-
 #define TYPED_TEST(SuiteName, TestName, TypeList)                              \
   static_assert(                                                               \
       LIBC_NAMESPACE::testing::internal::valid_prefix(#SuiteName),             \
@@ -363,11 +351,8 @@ CString libc_make_test_file_path_func(const char *file_name);
     void Run() override;                                                       \
     const char *getName() const override { return name; }                      \
   };                                                                           \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_BEGIN                                        \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_BODY                                         \
   TypeList::Tests<SuiteName##_##TestName>::type                                \
       SuiteName##_##TestName##_Instance;                                       \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_END                                          \
   template <typename T> void SuiteName##_##TestName<T>::Run()
 
 #define TYPED_TEST_F(SuiteClass, TestName, TypeList)                           \
@@ -386,11 +371,8 @@ CString libc_make_test_file_path_func(const char *file_name);
     void Run() override;                                                       \
     const char *getName() const override { return name; }                      \
   };                                                                           \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_BEGIN                                        \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_BODY                                         \
   TypeList::Tests<SuiteClass##_##TestName>::type                               \
       SuiteClass##_##TestName##_Instance;                                      \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_END                                          \
   template <typename T> void SuiteClass##_##TestName<T>::Run()
 
 #define TEST(SuiteName, TestName)                                              \
@@ -402,10 +384,7 @@ CString libc_make_test_file_path_func(const char *file_name);
     void Run() override;                                                       \
     const char *getName() const override { return #SuiteName "." #TestName; }  \
   };                                                                           \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_BEGIN                                        \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_BODY                                         \
   SuiteName##_##TestName SuiteName##_##TestName##_Instance;                    \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_END                                          \
   void SuiteName##_##TestName::Run()
 
 #define TEST_F(SuiteClass, TestName)                                           \
@@ -418,10 +397,7 @@ CString libc_make_test_file_path_func(const char *file_name);
     void Run() override;                                                       \
     const char *getName() const override { return #SuiteClass "." #TestName; } \
   };                                                                           \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_BEGIN                                        \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_BODY                                         \
   SuiteClass##_##TestName SuiteClass##_##TestName##_Instance;                  \
-  LIBC_TEST_GLOBAL_CTOR_DO_PRAGMA_END                                          \
   void SuiteClass##_##TestName::Run()
 
 // Helper to trick the compiler into ignoring lack of braces on the else

libc/test/integration/src/pthread/pthread_exit_test.cpp

@@ -29,10 +29,7 @@ class A {
   }
 };
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
 thread_local A thread_local_a(123);
-#pragma GCC diagnostic pop
 
 void *func(void *) {
   // Touch the thread local variable so that it gets initialized and a callback

libc/test/integration/src/threads/thrd_exit_test.cpp

@@ -29,10 +29,7 @@ class A {
   }
 };
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wglobal-constructors"
 thread_local A thread_local_a(123);
-#pragma GCC diagnostic pop
 
 int func(void *) {
   thread_local_a.set(321);

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

@@ -32,10 +32,7 @@ int GLOBAL_INDEX = 512;
 int INITVAL_INITIALIZER = 0x600D;
 int BEFORE_INITIALIZER = 0xFEED;
 
-#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,10 +31,7 @@ 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;