[Libreoffice-commits] core.git: Branch 'feature/cib_contract138e' - external/libtommath

[Gabor Kelemen (via logerrit)]

 external/libtommath/UnpackedTarball_libtommath.mk |    2 --
 external/libtommath/clang-cl.patch                |   16 ----------------
 external/libtommath/libtommath-msvc.patch         |   12 ------------
 3 files changed, 30 deletions(-)

New commits:
commit a87eea481acda502a1017acab0ef79750f325171
Author:     Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Fri Oct 13 11:49:42 2023 +0200
Commit:     Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Fri Oct 13 11:49:42 2023 +0200

    Resolve libtommath build breakage
    
    Change-Id: Ic92e28bf1c8062ccb631220183d6d9ae30df2110

diff --git a/external/libtommath/UnpackedTarball_libtommath.mk 
b/external/libtommath/UnpackedTarball_libtommath.mk
index bb0b9e352930..8961a46162c5 100644
--- a/external/libtommath/UnpackedTarball_libtommath.mk
+++ b/external/libtommath/UnpackedTarball_libtommath.mk
@@ -14,8 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libtommath,$(LIBTOMMATH_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libtommath,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libtommath,\
-       external/libtommath/libtommath-msvc.patch \
-       external/libtommath/clang-cl.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libtommath/clang-cl.patch 
b/external/libtommath/clang-cl.patch
deleted file mode 100644
index 1cc92d380c62..000000000000
--- a/external/libtommath/clang-cl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- tommath.h
-+++ tommath.h
-@@ -15,6 +15,13 @@
- #ifndef BN_H_
- #define BN_H_
- 
-+// Work around clang-cl issue when mp_word is a typedef for unsigned 
__int128, see
-+// <https://bugs.llvm.org/show_bug.cgi?id=25305> "Clang-cl generates a call 
to an undefined symbol
-+// _udivti3":
-+#if defined _WIN32 && defined __clang__
-+#define MP_8BIT
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdint.h>
diff --git a/external/libtommath/libtommath-msvc.patch 
b/external/libtommath/libtommath-msvc.patch
deleted file mode 100644
index 07884871aac9..000000000000
--- a/external/libtommath/libtommath-msvc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- makefile.msvc      2016-02-05 23:25:32.000000000 +0100
-+++ makefile.msvc      2016-07-21 11:34:20.618390100 +0200
-@@ -38,3 +38,9 @@
- 
- library: $(OBJECTS)
-       lib /out:tommath.lib $(OBJECTS)
-+
-+.cc.obj:
-+      $(CC) /nologo $(CFLAGS) /c $<
-+
-+.c.obj:
-+      $(CC) /nologo $(CFLAGS) /c $<