diff --git a/.gitmodules b/.gitmodules index 2b085e15059..e40c3362830 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,14 +34,6 @@ [submodule "third_party/abseil-cpp"] path = third_party/abseil-cpp url = https://github.com/abseil/abseil-cpp -[submodule "third_party/libcxxabi"] - path = third_party/libcxxabi - url = https://github.com/llvm-mirror/libcxxabi.git - branch = release_60 -[submodule "third_party/libcxx"] - path = third_party/libcxx - url = https://github.com/llvm-mirror/libcxx.git - branch = release_60 [submodule "third_party/envoy-api"] path = third_party/envoy-api url = https://github.com/envoyproxy/data-plane-api.git diff --git a/Makefile b/Makefile index 9358cc3205d..fb283e0c902 100644 --- a/Makefile +++ b/Makefile @@ -1416,7 +1416,7 @@ plugins: $(PROTOC_PLUGINS) privatelibs: privatelibs_c privatelibs_cxx -privatelibs_c: $(LIBDIR)/$(CONFIG)/libalts_test_util.a $(LIBDIR)/$(CONFIG)/libcxxabi.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libz.a $(LIBDIR)/$(CONFIG)/libares.a $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a +privatelibs_c: $(LIBDIR)/$(CONFIG)/libalts_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc_test_util_unsecure.a $(LIBDIR)/$(CONFIG)/libreconnect_server.a $(LIBDIR)/$(CONFIG)/libtest_tcp_server.a $(LIBDIR)/$(CONFIG)/libz.a $(LIBDIR)/$(CONFIG)/libares.a $(LIBDIR)/$(CONFIG)/libbad_ssl_test_server.a $(LIBDIR)/$(CONFIG)/libend2end_tests.a $(LIBDIR)/$(CONFIG)/libend2end_nosec_tests.a pc_c: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc.pc $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc pc_c_unsecure: $(LIBDIR)/$(CONFIG)/pkgconfig/grpc_unsecure.pc $(LIBDIR)/$(CONFIG)/pkgconfig/gpr.pc @@ -3395,50 +3395,6 @@ endif endif -LIBCXXABI_SRC = \ - third_party/libcxxabi/src/abort_message.cpp \ - third_party/libcxxabi/src/cxa_aux_runtime.cpp \ - third_party/libcxxabi/src/cxa_default_handlers.cpp \ - third_party/libcxxabi/src/cxa_demangle.cpp \ - third_party/libcxxabi/src/cxa_exception_storage.cpp \ - third_party/libcxxabi/src/cxa_guard.cpp \ - third_party/libcxxabi/src/cxa_handlers.cpp \ - third_party/libcxxabi/src/cxa_noexception.cpp \ - third_party/libcxxabi/src/cxa_thread_atexit.cpp \ - third_party/libcxxabi/src/cxa_unexpected.cpp \ - third_party/libcxxabi/src/cxa_vector.cpp \ - third_party/libcxxabi/src/cxa_virtual.cpp \ - third_party/libcxxabi/src/fallback_malloc.cpp \ - third_party/libcxxabi/src/private_typeinfo.cpp \ - third_party/libcxxabi/src/stdlib_exception.cpp \ - third_party/libcxxabi/src/stdlib_new_delete.cpp \ - third_party/libcxxabi/src/stdlib_stdexcept.cpp \ - third_party/libcxxabi/src/stdlib_typeinfo.cpp \ - -PUBLIC_HEADERS_C += \ - -LIBCXXABI_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBCXXABI_SRC)))) - -$(LIBCXXABI_OBJS): CPPFLAGS += -D_LIBCPP_DISABLE_EXTERN_TEMPLATE -D_LIBCXXABI_BUILDING_LIBRARY -D_LIBCXXABI_NO_EXCEPTIONS -Ithird_party/libcxxabi/include -nostdinc++ -Ithird_party/libcxx/include $(W_NO_UNUSED_BUT_SET_VARIABLE) $(W_NO_MAYBE_UNINITIALIZED) -fvisibility=hidden -$(LIBCXXABI_OBJS): CXXFLAGS += $(W_NO_CXX14_COMPAT) - -$(LIBDIR)/$(CONFIG)/libcxxabi.a: $(ZLIB_DEP) $(CARES_DEP) $(ADDRESS_SORTING_DEP) $(LIBCXXABI_OBJS) - $(E) "[AR] Creating $@" - $(Q) mkdir -p `dirname $@` - $(Q) rm -f $(LIBDIR)/$(CONFIG)/libcxxabi.a - $(Q) $(AR) $(AROPTS) $(LIBDIR)/$(CONFIG)/libcxxabi.a $(LIBCXXABI_OBJS) -ifeq ($(SYSTEM),Darwin) - $(Q) ranlib -no_warning_for_no_symbols $(LIBDIR)/$(CONFIG)/libcxxabi.a -endif - - - - -ifneq ($(NO_DEPS),true) --include $(LIBCXXABI_OBJS:.o=.dep) -endif - - LIBGPR_SRC = \ src/core/lib/gpr/alloc.cc \ src/core/lib/gpr/atm.cc \ diff --git a/build.yaml b/build.yaml index 285a33a0140..0b512e5e2d9 100644 --- a/build.yaml +++ b/build.yaml @@ -1626,32 +1626,6 @@ libs: deps: - grpc secure: true -- name: cxxabi - build: private - language: c - src: - - third_party/libcxxabi/src/abort_message.cpp - - third_party/libcxxabi/src/cxa_aux_runtime.cpp - - third_party/libcxxabi/src/cxa_default_handlers.cpp - - third_party/libcxxabi/src/cxa_demangle.cpp - - third_party/libcxxabi/src/cxa_exception_storage.cpp - - third_party/libcxxabi/src/cxa_guard.cpp - - third_party/libcxxabi/src/cxa_handlers.cpp - - third_party/libcxxabi/src/cxa_noexception.cpp - - third_party/libcxxabi/src/cxa_thread_atexit.cpp - - third_party/libcxxabi/src/cxa_unexpected.cpp - - third_party/libcxxabi/src/cxa_vector.cpp - - third_party/libcxxabi/src/cxa_virtual.cpp - - third_party/libcxxabi/src/fallback_malloc.cpp - - third_party/libcxxabi/src/private_typeinfo.cpp - - third_party/libcxxabi/src/stdlib_exception.cpp - - third_party/libcxxabi/src/stdlib_new_delete.cpp - - third_party/libcxxabi/src/stdlib_stdexcept.cpp - - third_party/libcxxabi/src/stdlib_typeinfo.cpp - build_system: - - Makefile - defaults: cxxabi - secure: false - name: gpr build: all language: c @@ -6192,11 +6166,6 @@ defaults: CPPFLAGS: -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX CXXFLAGS: -fno-rtti -fno-exceptions - cxxabi: - CPPFLAGS: -D_LIBCPP_DISABLE_EXTERN_TEMPLATE -D_LIBCXXABI_BUILDING_LIBRARY -D_LIBCXXABI_NO_EXCEPTIONS - -Ithird_party/libcxxabi/include -nostdinc++ -Ithird_party/libcxx/include $(W_NO_UNUSED_BUT_SET_VARIABLE) - $(W_NO_MAYBE_UNINITIALIZED) -fvisibility=hidden - CXXFLAGS: $(W_NO_CXX14_COMPAT) global: CFLAGS: -g COREFLAGS: -fno-rtti -fno-exceptions diff --git a/grpc.gyp b/grpc.gyp index 4d08d766bc8..73967f47532 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -172,32 +172,6 @@ 'test/core/tsi/alts/handshaker/alts_handshaker_service_api_test_lib.cc', ], }, - { - 'target_name': 'cxxabi', - 'type': 'static_library', - 'dependencies': [ - ], - 'sources': [ - 'third_party/libcxxabi/src/abort_message.cpp', - 'third_party/libcxxabi/src/cxa_aux_runtime.cpp', - 'third_party/libcxxabi/src/cxa_default_handlers.cpp', - 'third_party/libcxxabi/src/cxa_demangle.cpp', - 'third_party/libcxxabi/src/cxa_exception_storage.cpp', - 'third_party/libcxxabi/src/cxa_guard.cpp', - 'third_party/libcxxabi/src/cxa_handlers.cpp', - 'third_party/libcxxabi/src/cxa_noexception.cpp', - 'third_party/libcxxabi/src/cxa_thread_atexit.cpp', - 'third_party/libcxxabi/src/cxa_unexpected.cpp', - 'third_party/libcxxabi/src/cxa_vector.cpp', - 'third_party/libcxxabi/src/cxa_virtual.cpp', - 'third_party/libcxxabi/src/fallback_malloc.cpp', - 'third_party/libcxxabi/src/private_typeinfo.cpp', - 'third_party/libcxxabi/src/stdlib_exception.cpp', - 'third_party/libcxxabi/src/stdlib_new_delete.cpp', - 'third_party/libcxxabi/src/stdlib_stdexcept.cpp', - 'third_party/libcxxabi/src/stdlib_typeinfo.cpp', - ], - }, { 'target_name': 'gpr', 'type': 'static_library', diff --git a/third_party/libcxx b/third_party/libcxx deleted file mode 160000 index 6599cac0965..00000000000 --- a/third_party/libcxx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6599cac0965be8e5a835ab7a5684bbef033d5ad0 diff --git a/third_party/libcxxabi b/third_party/libcxxabi deleted file mode 160000 index 9245d481eb3..00000000000 --- a/third_party/libcxxabi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9245d481eb3e890f708ff2d7dadf2a10c04748ba diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py index 68e470e06c3..491efcbfd14 100755 --- a/tools/run_tests/run_performance_tests.py +++ b/tools/run_tests/run_performance_tests.py @@ -193,13 +193,7 @@ def create_netperf_jobspec(server_host='localhost', def archive_repo(languages): """Archives local version of repo including submodules.""" - # Directory contains symlinks that can't be correctly untarred on Windows - # so we just skip them as a workaround. - # See https://github.com/grpc/grpc/issues/16334 - bad_symlinks_dir = '../grpc/third_party/libcxx/test/std/experimental/filesystem/Inputs/static_test_env' - cmdline = [ - 'tar', '--exclude', bad_symlinks_dir, '-cf', '../grpc.tar', '../grpc/' - ] + cmdline = ['tar', '-cf', '../grpc.tar', '../grpc/'] if 'java' in languages: cmdline.append('../grpc-java') if 'go' in languages: diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index e49ddc8950e..7994b20ea14 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -36,8 +36,6 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules" 28f50e0fed19872e0fd50dd23ce2ee8cd759338e third_party/gflags (v2.2.0-5-g30dbc81) 80ed4d0bbf65d57cc267dfc63bd2584557f11f9b third_party/googleapis (common-protos-1_3_1-915-g80ed4d0bb) c9ccac7cb7345901884aabf5d1a786cfa6e2f397 third_party/googletest (6e2f397) - 6599cac0965be8e5a835ab7a5684bbef033d5ad0 third_party/libcxx (heads/release_60) - 9245d481eb3e890f708ff2d7dadf2a10c04748ba third_party/libcxxabi (heads/release_60) 09745575a923640154bcf307fba8aedff47f240a third_party/protobuf (v3.7.0-rc.2-247-g09745575) e143189bf6f37b3957fb31743df6a1bcf4a8c685 third_party/protoc-gen-validate (v0.0.10) 94324803a497c8f76dbc78df393ef629d3a9f3c3 third_party/udpa (heads/master)