Fix required for build with RelWithDebInfo (#774)

nanoframework · Jun 28, 2018 · ea096a5 · ea096a5
1 parent 2837c15
commit ea096a5
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 0 deletions.
diff --git a/src/CLR/Core/CLR_RT_Interop.cpp b/src/CLR/Core/CLR_RT_Interop.cpp
@@ -697,11 +697,20 @@ unsigned int &Interop_Marshal_GetField_UINT32( CLR_RT_HeapBlock *pThis, unsigned
     return pThis[ fieldIndex ].NumericByRef().u4;
 }
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+
 unsigned __int64 &Interop_Marshal_GetField_UINT64( CLR_RT_HeapBlock *pThis, unsigned int fieldIndex )
 {
     return (unsigned __int64 &)pThis[ fieldIndex ].NumericByRef().u8;
 }
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 char &Interop_Marshal_GetField_CHAR(   CLR_RT_HeapBlock *pThis, unsigned int fieldIndex )
 {
     return (char &)pThis[ fieldIndex ].NumericByRef().s1;
@@ -722,11 +731,20 @@ signed int &Interop_Marshal_GetField_INT32(  CLR_RT_HeapBlock *pThis, unsigned i
     return pThis[ fieldIndex ].NumericByRef().s4;
 }
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+
 signed __int64 &Interop_Marshal_GetField_INT64(  CLR_RT_HeapBlock *pThis, unsigned int fieldIndex )
 {
     return (signed __int64 &)pThis[ fieldIndex ].NumericByRef().s8;
 }
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 //----------------- Float point types - float and double
 #if !defined(NANOCLR_EMULATED_FLOATINGPOINT)
 
@@ -735,10 +753,20 @@ float &Interop_Marshal_GetField_float(  CLR_RT_HeapBlock *pThis, unsigned int fi
     return pThis[ fieldIndex ].NumericByRef().r4;
 }
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+
 double &Interop_Marshal_GetField_double( CLR_RT_HeapBlock *pThis, unsigned int fieldIndex )
 {
     return (double &)pThis[ fieldIndex ].NumericByRef().r8;
 }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 #else
 
 signed int &Interop_Marshal_GetField_float(  CLR_RT_HeapBlock *pThis, unsigned int fieldIndex )

diff --git a/src/CLR/Include/nanoCLR_Runtime__HeapBlock.h b/src/CLR/Include/nanoCLR_Runtime__HeapBlock.h
@@ -862,7 +862,18 @@ struct CLR_RT_HeapBlock
 #if !defined(NANOCLR_EMULATED_FLOATINGPOINT)
     void SetFloat  ( const float       num ) { CLR_RT_HEAPBLOCK_ASSIGN_FLOAT32           (DATATYPE_R4, num); }
     void SetDouble ( const double      num ) { CLR_RT_HEAPBLOCK_ASSIGN_FLOAT64           (DATATYPE_R8, num); }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+
     void SetFloatFromBits ( const CLR_UINT32  num ) { SetFloat ( *(const float *)&num ); }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
     void SetDoubleFromBits( const CLR_UINT64& num ) { SetDouble( *(const double*)&num ); }
 #else
     void SetFloat  ( const CLR_INT32   num ) { CLR_RT_HEAPBLOCK_ASSIGN_FLOAT32           (DATATYPE_R4, num); }

diff --git a/src/CLR/Include/nanoCLR_Types.h b/src/CLR/Include/nanoCLR_Types.h
@@ -1052,6 +1052,12 @@ struct CLR_RECORD_METHODDEF
     CLR_SIG    sig;             // TBL_Signatures
 };
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
+// pragma required here because compiler is not too happy with the cast to CLR_UINT32* from a CLR_UINT16 variable
+
 struct CLR_RECORD_ATTRIBUTE
 {
     CLR_UINT16 ownerType;       // one of TBL_TypeDef, TBL_MethodDef, or TBL_FieldDef.
@@ -1062,6 +1068,10 @@ struct CLR_RECORD_ATTRIBUTE
     CLR_UINT32 Key() const { return *(CLR_UINT32*)&ownerType; }
 };
 
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
 struct CLR_RECORD_TYPESPEC
 {
     CLR_SIG    sig;             // TBL_Signatures