diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-21 21:38:46 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-22 13:10:05 +0200 |
| commit | 8ff57504f75ddd35c3f585cf2224c6fcc3863ca3 (patch) | |
| tree | d89965f0b66d309439ae4baf9ca8d7dca6f12853 /bridges | |
| parent | 096e28acff82948eef6c5425593f0929c9367a6f (diff) | |
WaE: protect clang diagnostic push/pop with if defined __clang__
Change-Id: I8360aa96097a13b6bad1283edddc7c2fd1ed510d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120832
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index a22ac393b5f7..001384e005fc 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -187,24 +187,32 @@ static void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionRefer #if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__)) pRegisterReturn[0] = r0; #else +#if defined __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wuninitialized" +#endif register float fret asm("s0"); *reinterpret_cast<float *>(pRegisterReturn) = fret; +#if defined __clang__ #pragma clang diagnostic pop #endif +#endif break; case typelib_TypeClass_DOUBLE: #if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__)) pRegisterReturn[1] = r1; pRegisterReturn[0] = r0; #else +#if defined __clang__ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wuninitialized" +#endif register double dret asm("d0"); *reinterpret_cast<double *>(pRegisterReturn) = dret; +#if defined __clang__ #pragma clang diagnostic pop #endif +#endif break; case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: |