Automated rollback of commit e9b10399f6a148a3d20442f2c5020b05fa891873.

*** Reason for rollback ***

Breaks ~2k ios targets, see b/68179560

*** Original change description ***

Move hard-coded compilation-mode-specific flags in ObjcConfiguration.

PiperOrigin-RevId: 173239463

1 files changed, 0 insertions, 240 deletions

diff --git a/tools/osx/crosstool/CROSSTOOL.tpl b/tools/osx/crosstool/CROSSTOOL.tpl
index 954a54fb34..9ec9547123 100644
--- a/tools/osx/crosstool/CROSSTOOL.tpl
+++ b/tools/osx/crosstool/CROSSTOOL.tpl
@@ -136,17 +136,10 @@ toolchain {
     compiler_flag: "-DNDEBUG"
     compiler_flag: "-ffunction-sections"
     compiler_flag: "-fdata-sections"
-    compiler_flag: "-Wno-unused-variable"
-    compiler_flag: "-Winit-self"
-    compiler_flag: "-Wno-extra"
   }
   compilation_mode_flags {
     mode: DBG
     compiler_flag: "-g"
-    compiler_flag: "-DDEBUG"
-    compiler_flag: "-O0"
-    compiler_flag: "-fstack-protector"
-    compiler_flag: "-fstack-protector-all"
   }
   linking_mode_flags {
     mode: DYNAMIC
@@ -180,23 +173,6 @@ toolchain {
     name: "dbg"
   }
   feature {
-    name: "use_glibcxx_dbg_opts"
-    flag_set {
-      action: "c-compile"
-      action: "c++-compile"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-D_GLIBCXX_DEBUG"
-        flag: "-D_GLIBCXX_DEBUG_PEDANTIC"
-        flag: "-D_GLIBCPP_CONCEPT_CHECKS"
-      }
-    }
-    requires {
-      feature: "dbg"
-    }
-  }
-  feature {
     name: "compile_all_modules"
   }
   feature {
@@ -1809,17 +1785,10 @@ toolchain {
     compiler_flag: "-DNDEBUG"
     compiler_flag: "-ffunction-sections"
     compiler_flag: "-fdata-sections"
-    compiler_flag: "-Wno-unused-variable"
-    compiler_flag: "-Winit-self"
-    compiler_flag: "-Wno-extra"
   }
   compilation_mode_flags {
     mode: DBG
     compiler_flag: "-g"
-    compiler_flag: "-DDEBUG"
-    compiler_flag: "-O0"
-    compiler_flag: "-fstack-protector"
-    compiler_flag: "-fstack-protector-all"
   }
   make_variable {
     name: "STACK_FRAME_UNLIMITED"
@@ -1850,23 +1819,6 @@ toolchain {
     name: "dbg"
   }
   feature {
-    name: "use_glibcxx_dbg_opts"
-    flag_set {
-      action: "c-compile"
-      action: "c++-compile"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-D_GLIBCXX_DEBUG"
-        flag: "-D_GLIBCXX_DEBUG_PEDANTIC"
-        flag: "-D_GLIBCPP_CONCEPT_CHECKS"
-      }
-    }
-    requires {
-      feature: "dbg"
-    }
-  }
-  feature {
     name: "compile_all_modules"
   }
   feature {
@@ -3495,17 +3447,10 @@ toolchain {
     compiler_flag: "-DNDEBUG"
     compiler_flag: "-ffunction-sections"
     compiler_flag: "-fdata-sections"
-    compiler_flag: "-Wno-unused-variable"
-    compiler_flag: "-Winit-self"
-    compiler_flag: "-Wno-extra"
   }
   compilation_mode_flags {
     mode: DBG
     compiler_flag: "-g"
-    compiler_flag: "-DDEBUG"
-    compiler_flag: "-O0"
-    compiler_flag: "-fstack-protector"
-    compiler_flag: "-fstack-protector-all"
   }
   make_variable {
     name: "STACK_FRAME_UNLIMITED"
@@ -3536,23 +3481,6 @@ toolchain {
     name: "dbg"
   }
   feature {
-    name: "use_glibcxx_dbg_opts"
-    flag_set {
-      action: "c-compile"
-      action: "c++-compile"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-D_GLIBCXX_DEBUG"
-        flag: "-D_GLIBCXX_DEBUG_PEDANTIC"
-        flag: "-D_GLIBCPP_CONCEPT_CHECKS"
-      }
-    }
-    requires {
-      feature: "dbg"
-    }
-  }
-  feature {
     name: "compile_all_modules"
   }
   feature {
@@ -5183,18 +5111,11 @@ toolchain {
     compiler_flag: "-DNDEBUG"
     compiler_flag: "-ffunction-sections"
     compiler_flag: "-fdata-sections"
-    compiler_flag: "-Wno-unused-variable"
-    compiler_flag: "-Winit-self"
-    compiler_flag: "-Wno-extra"
     compiler_flag: "-DNS_BLOCK_ASSERTIONS=1"
   }
   compilation_mode_flags {
     mode: DBG
     compiler_flag: "-g"
-    compiler_flag: "-DDEBUG"
-    compiler_flag: "-O0"
-    compiler_flag: "-fstack-protector"
-    compiler_flag: "-fstack-protector-all"
   }
   make_variable {
     name: "STACK_FRAME_UNLIMITED"
@@ -5225,23 +5146,6 @@ toolchain {
     name: "dbg"
   }
   feature {
-    name: "use_glibcxx_dbg_opts"
-    flag_set {
-      action: "c-compile"
-      action: "c++-compile"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-D_GLIBCXX_DEBUG"
-        flag: "-D_GLIBCXX_DEBUG_PEDANTIC"
-        flag: "-D_GLIBCPP_CONCEPT_CHECKS"
-      }
-    }
-    requires {
-      feature: "dbg"
-    }
-  }
-  feature {
     name: "compile_all_modules"
   }
   feature {
@@ -6900,17 +6804,10 @@ toolchain {
     compiler_flag: "-DNDEBUG"
     compiler_flag: "-ffunction-sections"
     compiler_flag: "-fdata-sections"
-    compiler_flag: "-Wno-unused-variable"
-    compiler_flag: "-Winit-self"
-    compiler_flag: "-Wno-extra"
   }
   compilation_mode_flags {
     mode: DBG
     compiler_flag: "-g"
-    compiler_flag: "-DDEBUG"
-    compiler_flag: "-O0"
-    compiler_flag: "-fstack-protector"
-    compiler_flag: "-fstack-protector-all"
   }
   make_variable {
     name: "STACK_FRAME_UNLIMITED"
@@ -6941,23 +6838,6 @@ toolchain {
     name: "dbg"
   }
   feature {
-    name: "use_glibcxx_dbg_opts"
-    flag_set {
-      action: "c-compile"
-      action: "c++-compile"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-D_GLIBCXX_DEBUG"
-        flag: "-D_GLIBCXX_DEBUG_PEDANTIC"
-        flag: "-D_GLIBCPP_CONCEPT_CHECKS"
-      }
-    }
-    requires {
-      feature: "dbg"
-    }
-  }
-  feature {
     name: "compile_all_modules"
   }
   feature {
@@ -8586,17 +8466,10 @@ toolchain {
     compiler_flag: "-DNDEBUG"
     compiler_flag: "-ffunction-sections"
     compiler_flag: "-fdata-sections"
-    compiler_flag: "-Wno-unused-variable"
-    compiler_flag: "-Winit-self"
-    compiler_flag: "-Wno-extra"
   }
   compilation_mode_flags {
     mode: DBG
     compiler_flag: "-g"
-    compiler_flag: "-DDEBUG"
-    compiler_flag: "-O0"
-    compiler_flag: "-fstack-protector"
-    compiler_flag: "-fstack-protector-all"
   }
   make_variable {
     name: "STACK_FRAME_UNLIMITED"
@@ -8627,23 +8500,6 @@ toolchain {
     name: "dbg"
   }
   feature {
-    name: "use_glibcxx_dbg_opts"
-    flag_set {
-      action: "c-compile"
-      action: "c++-compile"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-D_GLIBCXX_DEBUG"
-        flag: "-D_GLIBCXX_DEBUG_PEDANTIC"
-        flag: "-D_GLIBCPP_CONCEPT_CHECKS"
-      }
-    }
-    requires {
-      feature: "dbg"
-    }
-  }
-  feature {
     name: "compile_all_modules"
   }
   feature {
@@ -10260,17 +10116,10 @@ toolchain {
     compiler_flag: "-DNDEBUG"
     compiler_flag: "-ffunction-sections"
     compiler_flag: "-fdata-sections"
-    compiler_flag: "-Wno-unused-variable"
-    compiler_flag: "-Winit-self"
-    compiler_flag: "-Wno-extra"
   }
   compilation_mode_flags {
     mode: DBG
     compiler_flag: "-g"
-    compiler_flag: "-DDEBUG"
-    compiler_flag: "-O0"
-    compiler_flag: "-fstack-protector"
-    compiler_flag: "-fstack-protector-all"
   }
   make_variable {
     name: "STACK_FRAME_UNLIMITED"
@@ -10301,23 +10150,6 @@ toolchain {
     name: "dbg"
   }
   feature {
-    name: "use_glibcxx_dbg_opts"
-    flag_set {
-      action: "c-compile"
-      action: "c++-compile"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-D_GLIBCXX_DEBUG"
-        flag: "-D_GLIBCXX_DEBUG_PEDANTIC"
-        flag: "-D_GLIBCPP_CONCEPT_CHECKS"
-      }
-    }
-    requires {
-      feature: "dbg"
-    }
-  }
-  feature {
     name: "compile_all_modules"
   }
   feature {
@@ -11936,18 +11768,11 @@ toolchain {
     compiler_flag: "-DNDEBUG"
     compiler_flag: "-ffunction-sections"
     compiler_flag: "-fdata-sections"
-    compiler_flag: "-Wno-unused-variable"
-    compiler_flag: "-Winit-self"
-    compiler_flag: "-Wno-extra"
     compiler_flag: "-DNS_BLOCK_ASSERTIONS=1"
   }
   compilation_mode_flags {
     mode: DBG
     compiler_flag: "-g"
-    compiler_flag: "-DDEBUG"
-    compiler_flag: "-O0"
-    compiler_flag: "-fstack-protector"
-    compiler_flag: "-fstack-protector-all"
   }
   make_variable {
     name: "STACK_FRAME_UNLIMITED"
@@ -11978,23 +11803,6 @@ toolchain {
     name: "dbg"
   }
   feature {
-    name: "use_glibcxx_dbg_opts"
-    flag_set {
-      action: "c-compile"
-      action: "c++-compile"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-D_GLIBCXX_DEBUG"
-        flag: "-D_GLIBCXX_DEBUG_PEDANTIC"
-        flag: "-D_GLIBCPP_CONCEPT_CHECKS"
-      }
-    }
-    requires {
-      feature: "dbg"
-    }
-  }
-  feature {
     name: "compile_all_modules"
   }
   feature {
@@ -13641,17 +13449,10 @@ toolchain {
     compiler_flag: "-DNDEBUG"
     compiler_flag: "-ffunction-sections"
     compiler_flag: "-fdata-sections"
-    compiler_flag: "-Wno-unused-variable"
-    compiler_flag: "-Winit-self"
-    compiler_flag: "-Wno-extra"
   }
   compilation_mode_flags {
     mode: DBG
     compiler_flag: "-g"
-    compiler_flag: "-DDEBUG"
-    compiler_flag: "-O0"
-    compiler_flag: "-fstack-protector"
-    compiler_flag: "-fstack-protector-all"
   }
   make_variable {
     name: "STACK_FRAME_UNLIMITED"
@@ -13682,23 +13483,6 @@ toolchain {
     name: "dbg"
   }
   feature {
-    name: "use_glibcxx_dbg_opts"
-    flag_set {
-      action: "c-compile"
-      action: "c++-compile"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-D_GLIBCXX_DEBUG"
-        flag: "-D_GLIBCXX_DEBUG_PEDANTIC"
-        flag: "-D_GLIBCPP_CONCEPT_CHECKS"
-      }
-    }
-    requires {
-      feature: "dbg"
-    }
-  }
-  feature {
     name: "compile_all_modules"
   }
   feature {
@@ -15314,18 +15098,11 @@ toolchain {
     compiler_flag: "-DNDEBUG"
     compiler_flag: "-ffunction-sections"
     compiler_flag: "-fdata-sections"
-    compiler_flag: "-Wno-unused-variable"
-    compiler_flag: "-Winit-self"
-    compiler_flag: "-Wno-extra"
     compiler_flag: "-DNS_BLOCK_ASSERTIONS=1"
   }
   compilation_mode_flags {
     mode: DBG
     compiler_flag: "-g"
-    compiler_flag: "-DDEBUG"
-    compiler_flag: "-O0"
-    compiler_flag: "-fstack-protector"
-    compiler_flag: "-fstack-protector-all"
   }
   make_variable {
     name: "STACK_FRAME_UNLIMITED"
@@ -15359,23 +15136,6 @@ toolchain {
     name: "dbg"
   }
   feature {
-    name: "use_glibcxx_dbg_opts"
-    flag_set {
-      action: "c-compile"
-      action: "c++-compile"
-      action: "objc-compile"
-      action: "objc++-compile"
-      flag_group {
-        flag: "-D_GLIBCXX_DEBUG"
-        flag: "-D_GLIBCXX_DEBUG_PEDANTIC"
-        flag: "-D_GLIBCPP_CONCEPT_CHECKS"
-      }
-    }
-    requires {
-      feature: "dbg"
-    }
-  }
-  feature {
     name: "compile_all_modules"
   }
   feature {