core.git: Branch 'libreoffice-24-2' - bridges/source

[Rene Engelhard (via logerrit)]

 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c2f1d03e73fa42ffcfd6817e32be472cef62e23
Author:     Rene Engelhard <r...@rene-engelhard.de>
AuthorDate: Thu Aug 8 17:36:14 2024 +0200
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Aug 9 09:17:32 2024 +0200

    fix build on armhf with gcc 14
    
    /uno2cpp.cxx: In function ‘void {anonymous}::callVirtualMethod(void*, 
sal_Int32, void*, typelib_TypeDescriptionReference*, sal_uInt32*, sal_uInt32, 
sal_uInt32*, sal_uInt32, double*)’:
    /<<PKGBUILDDIR>>/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx:278:5: 
error: ‘asm’ operand has impossible constraints or there are not enough 
registers
      278 |     __asm__ __volatile__ (
          |     ^~~~~~~
    make[2]: *** [/<<PKGBUILDDIR>>/solenv/gbuild/LinkTarget.mk:338: 
/<<PKGBUILDDIR>>/workdir/CxxObject/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.o]
 Error 1
    
    Just removing them makes it work, they are mentioned before anyway, too
    (thanks Caolan)
    
    Change-Id: Ibb9118b268a587ebdcfce343e2ee2605ac979915
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171650
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit d9e818f3d706145aba95587d685cbcfdeb797edb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171668
    Tested-by: Jenkins

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 001384e005fc..e08ec4ad8f85 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -298,7 +298,7 @@ void callVirtualMethod(
         "mov %[r1], r1
        "
         : [r0]"=r" (r0), [r1]"=r" (r1)
         : [pmethod]"m" (pMethod), [pgpr]"m" (pGPR), [pfpr]"m" (pFPR)
-        : "r0", "r1", "r2", "r3", "r4", "r5");
+        : "r2", "r3", "r4", "r5");
 
     MapReturn(r0, r1, pReturnType, static_cast<sal_uInt32*>(pRegisterReturn));
 }