Skip to content

Commit bb20434

Browse files
StefanBruensThaddeus Letnes
authored andcommitted
Fix ILP32 data model detection with GCC on 32bit ARM
Unfortunately, GCC does not define `__ILP32__` on 32 bit ARM (contrary to e.g. x86), so rely on `__arm__` instead. This does not change API/ABI, but fixes a compilation error for one specific architecture and compiler combination. Avoids broken workarounds in every downstream user of mfxdefs.h, e.g.: intel/libvpl@6182082a12#diff-1e7de1ae2d05 intel/cartwheel-ffmpeg#215
1 parent 7e0d3fd commit bb20434

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

source/elements/oneVPL/include/vpl/mfxdefs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ extern "C"
6868
#define MFX_PACK_BEGIN_STRUCT_W_PTR() MFX_PACK_BEGIN_X(4)
6969
#define MFX_PACK_BEGIN_STRUCT_W_L_TYPE() MFX_PACK_BEGIN_X(8)
7070
/* 32-bit ILP32 data model Linux* */
71-
#elif defined(__ILP32__)
71+
#elif defined(__ILP32__) || defined(__arm__)
7272
#define MFX_PACK_BEGIN_STRUCT_W_PTR() MFX_PACK_BEGIN_X(4)
7373
#define MFX_PACK_BEGIN_STRUCT_W_L_TYPE() MFX_PACK_BEGIN_X(4)
7474
#else

0 commit comments

Comments
 (0)