From c63f996d0b04005f9d3d2096f5121b707487f14f Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Fri, 6 Oct 2023 08:34:10 -0500 Subject: [PATCH] Merge pull request #2142 from mitza-oci/macos-long-double macOS: sizeof long double is different on ARM64 (cherry picked from commit 1affc2bd31c38b55cd0b11a5665055821890c541) # Conflicts: # ACE/ace/config-macosx-leopard.h # ACE/ace/config-macosx-tiger.h --- ACE/ace/config-macosx-leopard.h | 8 +------- ACE/ace/config-macosx-tiger.h | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index f86314bda3a89..abce6ef4c0061 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -16,13 +16,7 @@ #endif /* ! __ACE_INLINE__ */ #if !defined (ACE_SIZEOF_LONG_DOUBLE) -# if (__GNUC__ == 3 && __GNUC_MINOR__ == 3) - // Size of long double in GCC 3.3 is 8. -# define ACE_SIZEOF_LONG_DOUBLE 8 -# else // Else, the compiler is GCC4 - // For GCC4, the size is 16. -# define ACE_SIZEOF_LONG_DOUBLE 16 -# endif // GCC 3.3 +# define ACE_SIZEOF_LONG_DOUBLE __SIZEOF_LONG_DOUBLE__ #endif // ACE_SIZEOF_LONG_DOUBLE #if defined (__GNUG__) diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h index c737a582cb57a..0eca5b6d0e498 100644 --- a/ACE/ace/config-macosx-tiger.h +++ b/ACE/ace/config-macosx-tiger.h @@ -9,13 +9,7 @@ #endif /* ! __ACE_INLINE__ */ #if !defined (ACE_SIZEOF_LONG_DOUBLE) -# if (__GNUC__ == 3 && __GNUC_MINOR__ == 3) - // Size of long double in GCC 3.3 is 8. -# define ACE_SIZEOF_LONG_DOUBLE 8 -# else // Else, the compiler is GCC4 - // For GCC4, the size is 16. -# define ACE_SIZEOF_LONG_DOUBLE 16 -# endif // GCC 3.3 +# define ACE_SIZEOF_LONG_DOUBLE __SIZEOF_LONG_DOUBLE__ #endif // ACE_SIZEOF_LONG_DOUBLE #if defined (__GNUG__)