remove gb_LinkTarget_add_noexception_object

Change-Id: I44f7df6e5f816cfcf7a44c6c4c76e80924237d45
Reviewed-on: https://gerrit.libreoffice.org/4955
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

7 files changed, 1 insertions, 21 deletions

diff --git a/bin/update_pch.sh b/bin/update_pch.sh
index bfd86c5b5fa1..8e37b0001f77 100755
--- a/bin/update_pch.sh
+++ b/bin/update_pch.sh
@@ -34,7 +34,7 @@ for x in $headers; do
         while read line ; do
             if test "$line" = "))" ; then
                 inobjects=
-            elif echo $line | grep -q -e add_exception_objects -e add_noexception_objects -e add_cxxobject -e add_cxxobjects ; then
+            elif echo $line | grep -q -e add_exception_objects -e add_cxxobject -e add_cxxobjects ; then
                 inobjects=1
                 if test $ifstack -ne 0 ; then
                     echo Sources in a conditional, ignoring for now. >&2
diff --git a/solenv/doc/gbuild/solenv/gbuild/types.mk b/solenv/doc/gbuild/solenv/gbuild/types.mk
index 8cdf80259570..cf10d4db8bdf 100644
--- a/solenv/doc/gbuild/solenv/gbuild/types.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/types.mk
@@ -111,9 +111,6 @@ namespace gb { namespace types
             void add_linked_libs(List<Library> linked_libs);
             /// Add libraries to link against statically.
             void add_linked_static_libs(List<StaticLibrary> linked_static_libs);
-            /// Add multiple CxxObject s to be compiled and linked (without exceptions enabled).
-            /// @deprecated We should not care about disabling exception.
-            void add_noexception_objects(List<CxxObject> cobject);
             /// Set auxiliary files that are produced by linking (for cleanup and copying).
             void set_auxtargets(List<Path> auxtargets);
             /// Set the location for the produced DLL (used on Windows only).
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 2e5d4df710b4..7ab9259dcec8 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -349,7 +349,6 @@ $(eval $(foreach method,\
 	use_libraries \
 	add_linked_static_libs \
 	use_static_libraries \
-	add_noexception_objects \
 	add_objcobject \
 	add_objcobjects \
 	add_objcxxobject \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index d616e1ccaced..e083c0dccbc9 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -112,7 +112,6 @@ $(eval $(foreach method,\
 	add_scanner \
 	add_scanners \
 	add_exception_objects \
-	add_noexception_objects \
 	add_generated_cobjects \
 	add_generated_cxxobjects \
 	add_generated_exception_objects \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index f7a05b0c276d..17163a1b2866 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -201,7 +201,6 @@ $(eval $(foreach method,\
 	add_asmobjects \
 	add_exception_objects \
 	add_x64_generated_exception_objects \
-	add_noexception_objects \
 	add_generated_cobjects \
 	add_generated_cxxobjects \
 	add_generated_exception_objects \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 5316b0915699..e1854fb50bac 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1077,15 +1077,6 @@ $(foreach scanner,$(2),$(call gb_LinkTarget_add_scanner,$(1),$(scanner),$(4)))
 
 endef
 
-define gb_LinkTarget_add_noexception_object
-$(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_NOEXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)))
-ifeq ($(gb_ENABLE_PCH),$(true))
-# noexception objects are rare, so generate matching .pch only when needed
-$(call gb_CxxObject_get_target,$(2)) : $(call gb_NoexPrecompiledHeader_get_timestamp,$(1))
-$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $$(PCHOBJEX) $$(PCHOBJNOEX)
-endif
-endef
-
 define gb_LinkTarget_add_exception_object
 $(call gb_LinkTarget_add_cxxobject,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)))
 endef
@@ -1149,10 +1140,6 @@ define gb_LinkTarget_add_asmobjects
 $(foreach obj,$(2),$(call gb_LinkTarget_add_asmobject,$(1),$(obj),$(3)))
 endef
 
-define gb_LinkTarget_add_noexception_objects
-$(foreach obj,$(2),$(call gb_LinkTarget_add_noexception_object,$(1),$(obj),$(4)))
-endef
-
 define gb_LinkTarget_add_exception_objects
 $(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj),$(4)))
 endef
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index e25328b94b19..02a358ac11c7 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -70,7 +70,6 @@ $(eval $(foreach method,\
 	add_asmobjects \
 	add_exception_objects \
 	add_x64_generated_exception_objects \
-	add_noexception_objects \
 	add_generated_cobjects \
 	add_x64_generated_cobjects \
 	add_generated_cxxobjects \