The idl __attribute__((__weak__)) hack doesn't seem necessary for --enable-lto

dbfc495a9ace0865d764dad7404633a12cda2873 "Add config option used when we try to
link one huge object file" had added it for the --enable-lto case, but without
documenting exactly what it should help with.  And at least my local Linux
--enable-lto --enable-dbgutil etc. build successfully does `make check &&
make screenshot` without it.

This removes the only use of STATIC_LINKING, so remove it completely.  (And
basctl/source/basicide/basidesh.cxx still needs to include config_options.h for
ENABLE_MERGELIBS.)

Change-Id: I3820e1cacccc92f5ac0c9c7fcc539c29a6864694
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90804
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

8 files changed, 1 insertions, 17 deletions

diff --git a/basctl/IwyuFilter_basctl.yaml b/basctl/IwyuFilter_basctl.yaml
index 114e025c2f10..89b634781849 100644
--- a/basctl/IwyuFilter_basctl.yaml
+++ b/basctl/IwyuFilter_basctl.yaml
@@ -2,8 +2,6 @@
 assumeFilename: basctl/source/basicide/baside2b.cxx
 blacklist:
     basctl/source/basicide/basidesh.cxx:
-    # Needed for STATIC_LINKING
-    - config_options.h
     # Needed for TypedWhichId defines is basslots.hxx
     - sfx2/dinfdlg.hxx
     - sfx2/minfitem.hxx
diff --git a/config_host/config_options.h.in b/config_host/config_options.h.in
index 8e6bc70f8d63..e87c119e648a 100644
--- a/config_host/config_options.h.in
+++ b/config_host/config_options.h.in
@@ -5,12 +5,6 @@
 #ifndef CONFIG_OPTIONS_H
 #define CONFIG_OPTIONS_H
 
-/*
- * Whether we want to link as many object files as possible into one big object.
- * True in case of --enable-lto.
- */
-#define STATIC_LINKING 0
-
 #define ENABLE_MERGELIBS 0
 
 #define ENABLE_RUNTIME_OPTIMIZATIONS 0
diff --git a/configure.ac b/configure.ac
index eb2befed5276..57caa0d9ae6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,7 +351,6 @@ AC_MSG_CHECKING([whether to use link-time optimization])
 if test -n "$enable_lto" -a "$enable_lto" != "no"; then
     ENABLE_LTO="TRUE"
     AC_MSG_RESULT([yes])
-    AC_DEFINE(STATIC_LINKING)
 else
     ENABLE_LTO=""
     AC_MSG_RESULT([no])
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 34b0e3b78847..9cb1684caffc 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -251,7 +251,7 @@ void SvMetaType::WriteSfxItem(
 
     // write the implementation part
     rOutStm.WriteCharPtr( "#ifdef SFX_TYPEMAP" ) << endl;
-    rOutStm.WriteCharPtr( "#if !defined(_WIN32) && ((defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(LINUX))) || STATIC_LINKING)" ) << endl;
+    rOutStm.WriteCharPtr( "#if !defined(_WIN32) && (defined(DISABLE_DYNLOADING) && (defined(ANDROID) || defined(IOS) || defined(LINUX)))" ) << endl;
     rOutStm.WriteCharPtr( "__attribute__((__weak__))" ) << endl;
     rOutStm.WriteCharPtr( "#endif" ) << endl;
     rOutStm.WriteOString( aTypeName ).WriteOString( aVarName )
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 2743efdd96f2..aec7c018fdca 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -775,8 +775,6 @@ blacklist:
     # Needed for direct member access
     - ooo/vba/XSinkCaller.hpp
     sc/source/ui/app/typemap.cxx:
-    # Needed for STATIC_LINKING to be there for scslots.hxx
-    - config_options.h
     # Needed for MID* macros
     - mid.h
     - editeng/memberids.h
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index bf40d09962b7..a6a9e689d865 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_options.h>
-
 #include <mid.h>
 #include <editeng/memberids.h>
 #include <svx/unomid.hxx>
diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml
index 16c922da30a7..e3cab84a6efc 100644
--- a/sfx2/IwyuFilter_sfx2.yaml
+++ b/sfx2/IwyuFilter_sfx2.yaml
@@ -74,8 +74,6 @@ blacklist:
     - sfx2/frame.hxx
     - sfx2/msg.hxx
     - sorgitm.hxx
-    # Needed for STATIC_LINKING to work
-    - config_options.h
     sfx2/source/appl/newhelp.cxx:
     # Actually used
     - com/sun/star/i18n/XBreakIterator.hpp
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index b1fd03e925b1..1dec99095687 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <config_features.h>
-#include <config_options.h>
 
 #include <sal/config.h>