strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix build on armhf with gcc 14

Browse source 
/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.mcnamara@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Rene Engelhard 2024-08-08 17:36:14 +02:00 committed by Caolán McNamara
parent 4cb1849ebd
commit d9e818f3d7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
View file

@ -298,7 +298,7 @@ void callVirtualMethod(
"mov %[r1], r1\n\t" "mov %[r1], r1\n\t"
: [r0]"=r" (r0), [r1]"=r" (r1) : [r0]"=r" (r0), [r1]"=r" (r1)
: [pmethod]"m" (pMethod), [pgpr]"m" (pGPR), [pfpr]"m" (pFPR) : [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)); MapReturn(r0, r1, pReturnType, static_cast<sal_uInt32*>(pRegisterReturn));
} }