Merge pull request #21542 from grpc/revert-21481-net-csharp

Revert "Support CentOS 7 for gRPC.NET"

CMakeLists.txt

@@ -5855,7 +5855,6 @@ if(gRPC_BUILD_CSHARP_EXT)
 
 add_library(grpc_csharp_ext SHARED
   src/csharp/ext/grpc_csharp_ext.c
-  src/csharp/ext/std++compat.cc
 )
 
 set_target_properties(grpc_csharp_ext PROPERTIES

Makefile

@@ -8145,7 +8145,6 @@ $(OBJDIR)/$(CONFIG)/test/cpp/qps/usage_timer.o: $(GENDIR)/src/proto/grpc/testing
 
 LIBGRPC_CSHARP_EXT_SRC = \
     src/csharp/ext/grpc_csharp_ext.c \
-    src/csharp/ext/std++compat.cc \
 
 PUBLIC_HEADERS_C += \
 
@@ -23368,7 +23367,6 @@ src/cpp/server/secure_server_credentials.cc: $(OPENSSL_DEP)
 src/cpp/util/core_stats.cc: $(OPENSSL_DEP)
 src/cpp/util/error_details.cc: $(OPENSSL_DEP)
 src/csharp/ext/grpc_csharp_ext.c: $(OPENSSL_DEP)
-src/csharp/ext/std++compat.cc: $(OPENSSL_DEP)
 test/core/bad_client/bad_client.cc: $(OPENSSL_DEP)
 test/core/bad_ssl/server_common.cc: $(OPENSSL_DEP)
 test/core/end2end/data/client_certs.cc: $(OPENSSL_DEP)

build.yaml

@@ -2258,7 +2258,6 @@ libs:
   language: csharp
   src:
   - src/csharp/ext/grpc_csharp_ext.c
-  - src/csharp/ext/std++compat.cc
   deps:
   - grpc
   - gpr

grpc.gyp

@@ -2309,7 +2309,6 @@
       ],
       'sources': [
         'src/csharp/ext/grpc_csharp_ext.c',
-        'src/csharp/ext/std++compat.cc',
       ],
     },
     {

src/csharp/ext/std++compat.cc

@@ -1,46 +0,0 @@
-/*
- *
- * Copyright 2019 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <cstdarg>
-#include <cstdio>
-#include <vector>
-
-#if defined(__GNUC__)
-
-namespace std {
-
-// CentOS 7 (GLIBC_2.17 / GLIBCXX_3.4.19) doesn't have a following symbol
-// which was added to GLIBCXX_3.4.20. gRPC uses Debian 8 which has
-// GLIBCXX_3.4.20 when building .net artifacts so artifacts can have symbols
-// which are not available on CentOS 7.
-// To support CentOS 7, missing symbols are provided as weak symbols.
-void __attribute__((weak)) __throw_out_of_range_fmt(char const* fmt, ...) {
-  va_list ap;
-  char buf[1024];  // That should be big enough.
-
-  va_start(ap, fmt);
-  vsnprintf(buf, sizeof(buf), fmt, ap);
-  buf[sizeof(buf) - 1] = 0;
-  va_end(ap);
-
-  __throw_range_error(buf);
-}
-
-}  // namespace std
-
-#endif  // defined(__GNUC__)

tools/run_tests/artifacts/distribtest_targets.py

@@ -275,8 +275,8 @@ class CppDistribTest(object):
         if self.platform == 'linux':
             return create_docker_jobspec(
                 self.name,
-                'tools/dockerfile/distribtest/cpp_%s_%s' % (self.docker_suffix,
-                                                            self.arch),
+                'tools/dockerfile/distribtest/cpp_%s_%s' %
+                (self.docker_suffix, self.arch),
                 'test/distrib/cpp/run_distrib_test_%s.sh' % self.testcase,
                 timeout_seconds=45 * 60)
         elif self.platform == 'windows':