From da7ed761450b2e9ce963cb87f91f3224499d4b61 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 31 May 2018 18:38:40 +0100 Subject: [PATCH] Fix FTBFS in m68k =================================================================== Gbp-Pq: Name fix-ftbfs-m68k.patch --- Source/WTF/wtf/Platform.h | 8 +++++++- Source/WTF/wtf/dtoa/utils.h | 2 ++ Source/WebCore/css/CSSProperty.cpp | 4 ++++ Source/WebCore/dom/ElementRareData.cpp | 4 ++++ Source/WebCore/dom/NodeRareData.cpp | 4 ++++ Source/WebCore/dom/ShadowRoot.cpp | 4 ++++ Source/WebCore/rendering/style/RenderStyle.cpp | 8 ++++++++ Source/WebCore/rendering/style/StyleBoxData.cpp | 4 ++++ 8 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index 581632b..acd3878 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -355,6 +355,12 @@ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif +/* CPU(M68K) - m68k */ +#if defined(__mc68000__) +#define WTF_CPU_M68K 1 +#define WTF_CPU_BIG_ENDIAN 1 +#endif + /* ==== OS() - underlying operating system; only to be used for mandated low-level services like virtual memory, not to choose a GUI toolkit ==== */ @@ -846,7 +852,7 @@ #define ENABLE_REGEXP_TRACING 0 /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ -#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) +#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !CPU(M68K) #define ENABLE_YARR_JIT 1 /* Setting this flag compares JIT results with interpreter results. */ diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h index c4eb5e6..7b845ec 100644 --- a/Source/WTF/wtf/dtoa/utils.h +++ b/Source/WTF/wtf/dtoa/utils.h @@ -60,6 +60,8 @@ defined(_MIPS_ARCH_MIPS32R2) #endif // _WIN32 #elif defined(WINCE) || defined(_WIN32_WCE) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +#elif defined(__mc68000__) +#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS #else #error Target architecture was not detected as supported by Double-Conversion. #endif diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp index 0dd27c1..d0e84f3 100644 --- a/Source/WebCore/css/CSSProperty.cpp +++ b/Source/WebCore/css/CSSProperty.cpp @@ -34,7 +34,11 @@ struct SameSizeAsCSSProperty { void* value; }; +#if CPU(M68K) +COMPILE_ASSERT(sizeof(CSSProperty) <= sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small); +#else COMPILE_ASSERT(sizeof(CSSProperty) == sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small); +#endif CSSPropertyID StylePropertyMetadata::shorthandID() const { diff --git a/Source/WebCore/dom/ElementRareData.cpp b/Source/WebCore/dom/ElementRareData.cpp index d35215e..7a1158f 100644 --- a/Source/WebCore/dom/ElementRareData.cpp +++ b/Source/WebCore/dom/ElementRareData.cpp @@ -42,6 +42,10 @@ struct SameSizeAsElementRareData : NodeRareData { void* pointers[7]; }; +#if CPU(M68K) +COMPILE_ASSERT(sizeof(ElementRareData) <= sizeof(SameSizeAsElementRareData), ElementRareDataShouldStaySmall); +#else COMPILE_ASSERT(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), ElementRareDataShouldStaySmall); +#endif } // namespace WebCore diff --git a/Source/WebCore/dom/NodeRareData.cpp b/Source/WebCore/dom/NodeRareData.cpp index 821db17..eccf3a3 100644 --- a/Source/WebCore/dom/NodeRareData.cpp +++ b/Source/WebCore/dom/NodeRareData.cpp @@ -38,6 +38,10 @@ struct SameSizeAsNodeRareData { void* m_pointer[3]; }; +#if CPU(M68K) +COMPILE_ASSERT(sizeof(NodeRareData) <= sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall); +#else COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall); +#endif } // namespace WebCore diff --git a/Source/WebCore/dom/ShadowRoot.cpp b/Source/WebCore/dom/ShadowRoot.cpp index 8115139..a4e72bf 100644 --- a/Source/WebCore/dom/ShadowRoot.cpp +++ b/Source/WebCore/dom/ShadowRoot.cpp @@ -43,7 +43,11 @@ struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope { void* host; }; +#if CPU(M68K) +COMPILE_ASSERT(sizeof(ShadowRoot) <= sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small); +#else COMPILE_ASSERT(sizeof(ShadowRoot) == sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small); +#endif enum ShadowRootUsageOriginType { ShadowRootUsageOriginWeb = 0, diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp index fffd1c1..e267288 100644 --- a/Source/WebCore/rendering/style/RenderStyle.cpp +++ b/Source/WebCore/rendering/style/RenderStyle.cpp @@ -58,7 +58,11 @@ struct SameSizeAsBorderValue { unsigned m_width; }; +#if CPU(M68K) +COMPILE_ASSERT(sizeof(BorderValue) <= sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow); +#else COMPILE_ASSERT(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow); +#endif struct SameSizeAsRenderStyle : public RefCounted { void* dataRefs[7]; @@ -75,7 +79,11 @@ struct SameSizeAsRenderStyle : public RefCounted { } noninherited_flags; }; +#if CPU(M68K) +COMPILE_ASSERT(sizeof(RenderStyle) <= sizeof(SameSizeAsRenderStyle), RenderStyle_should_stay_small); +#else COMPILE_ASSERT(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), RenderStyle_should_stay_small); +#endif inline RenderStyle& defaultStyle() { diff --git a/Source/WebCore/rendering/style/StyleBoxData.cpp b/Source/WebCore/rendering/style/StyleBoxData.cpp index a1187ff..bf8b151 100644 --- a/Source/WebCore/rendering/style/StyleBoxData.cpp +++ b/Source/WebCore/rendering/style/StyleBoxData.cpp @@ -33,7 +33,11 @@ struct SameSizeAsStyleBoxData : public RefCounted { uint32_t bitfields; }; +#if CPU(M68K) +COMPILE_ASSERT(sizeof(StyleBoxData) <= sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow); +#else COMPILE_ASSERT(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow); +#endif StyleBoxData::StyleBoxData() : m_minWidth(RenderStyle::initialMinSize()) -- 2.30.2