26cfd0d699
Win daily builds are failing since then. Also Jenkins is failing intermittently so it needs more investigation Revert "New UBSan failure with Firebird 3.0.11" This reverts commit345f8cc9de. Revert "external/firebird: Reinstate UBSan function-type-mismatch fix" This reverts commitd5445a8c47. Revert "mold: fatal: cannot open loader_path/../Debug/firebird" This reverts commitf2ba02eee9. Revert "firebird: set -mmacosx-version-min to 10.15" This reverts commit6998eacf54. Revert "tdf#134526 Firebird: upgrade to release 3.0.11" This reverts commit00eae23267. Change-Id: Id4b0600965953051f6947f570c9b9a1f56044502 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162200 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
63 lines
1.6 KiB
Diff
63 lines
1.6 KiB
Diff
--- builds/posix/fbintl.vers
|
|
+++ builds/posix/fbintl.vers
|
|
@@ -29,3 +29,4 @@
|
|
LD_lookup_texttype
|
|
LD_setup_attributes
|
|
LD_version
|
|
+_ZTI*
|
|
--- builds/posix/fbplugin.vers
|
|
+++ builds/posix/fbplugin.vers
|
|
@@ -26,3 +26,4 @@
|
|
#
|
|
|
|
firebird_plugin
|
|
+_ZTI*
|
|
--- builds/posix/firebird.vers
|
|
+++ builds/posix/firebird.vers
|
|
@@ -367,3 +367,4 @@
|
|
|
|
KEYWORD_stringIsAToken
|
|
KEYWORD_getTokens
|
|
+_ZTI*
|
|
--- builds/posix/make.defaults
|
|
+++ builds/posix/make.defaults
|
|
@@ -252,7 +252,7 @@
|
|
# LINKER OPTIONS
|
|
#
|
|
|
|
-UNDEF_PLATFORM = -Wl,--no-undefined
|
|
+UNDEF_PLATFORM =
|
|
ifeq ($(TARGET),Debug)
|
|
UNDEF_FLAGS = $(UNDEF_PLATFORM)
|
|
endif
|
|
@@ -291,7 +291,7 @@
|
|
LIB_LINK_MAPFILE= -Wl,--version-script,$(1)
|
|
FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient $(MATHLIB)
|
|
|
|
-EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(LINK_EMPTY_SYMBOLS)
|
|
+EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS)
|
|
LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared
|
|
|
|
FB_DAEMON = $(BIN)/firebird$(EXEC_EXT)
|
|
--- src/common/classes/alloc.cpp
|
|
+++ src/common/classes/alloc.cpp
|
|
@@ -2535,7 +2535,7 @@
|
|
const char* myStack = &probeVar;
|
|
const char* thisLocation = (const char*) this;
|
|
ptrdiff_t distance = thisLocation - myStack;
|
|
- fb_assert(absVal(distance) < 128 * 1024);
|
|
+ //fb_assert(absVal(distance) < 128 * 1024);
|
|
}
|
|
#endif
|
|
|
|
--- src/common/os/posix/mod_loader.cpp
|
|
+++ src/common/os/posix/mod_loader.cpp
|
|
@@ -92,7 +92,7 @@
|
|
|
|
ModuleLoader::Module* ModuleLoader::loadModule(ISC_STATUS* status, const Firebird::PathName& modPath)
|
|
{
|
|
- void* module = dlopen(modPath.nullStr(), FB_RTLD_MODE);
|
|
+ void* module = dlopen(modPath.nullStr(), FB_RTLD_MODE | RTLD_GLOBAL);
|
|
if (module == NULL)
|
|
{
|
|
if (status)
|