Hi! Attaching an updated patch by Andreas Schwab (CC'ed). I haven't tested the patch yet besides the fact that it applies cleanly to the 5.6.1 package currently in Debian unstable. However, I will test the patch over the weekend. It just takes some time to build the package on m68k.
Could we have this patch added (and merged upstream) as well to get qtwebkit- opensource-src building on m68k again? Thanks, Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaub...@debian.org `. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Index: qtwebkit-opensource-src-5.4.1/Source/WTF/wtf/Platform.h =================================================================== --- qtwebkit-opensource-src-5.4.1.orig/Source/WTF/wtf/Platform.h +++ qtwebkit-opensource-src-5.4.1/Source/WTF/wtf/Platform.h @@ -353,6 +353,12 @@ #endif #endif +/* CPU(M68K) - m68k */ +#if defined(__mc68000__) +#define WTF_CPU_M68K 1 +#define WTF_CPU_BIG_ENDIAN 1 +#endif + #if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif Index: qtwebkit-opensource-src-5.4.1/Source/WTF/wtf/dtoa/utils.h =================================================================== --- qtwebkit-opensource-src-5.4.1.orig/Source/WTF/wtf/dtoa/utils.h +++ qtwebkit-opensource-src-5.4.1/Source/WTF/wtf/dtoa/utils.h @@ -58,6 +58,8 @@ defined(_MIPS_ARCH_MIPS32R2) #else #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS #endif // _WIN32 +#elif defined(__mc68000__) +#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS #else #error Target architecture was not detected as supported by Double-Conversion. #endif Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/css/CSSProperty.cpp =================================================================== --- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/css/CSSProperty.cpp +++ qtwebkit-opensource-src-5.4.1/Source/WebCore/css/CSSProperty.cpp @@ -38,7 +38,7 @@ struct SameSizeAsCSSProperty { void* value; }; -COMPILE_ASSERT(sizeof(CSSProperty) == sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small); +COMPILE_ASSERT(sizeof(CSSProperty) <= sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small); void CSSProperty::wrapValueInCommaSeparatedList() { Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/ElementRareData.cpp =================================================================== --- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/dom/ElementRareData.cpp +++ qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/ElementRareData.cpp @@ -44,6 +44,6 @@ struct SameSizeAsElementRareData : NodeR void* pointers[7]; }; -COMPILE_ASSERT(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), ElementRareDataShouldStaySmall); +COMPILE_ASSERT(sizeof(ElementRareData) <= sizeof(SameSizeAsElementRareData), ElementRareDataShouldStaySmall); } // namespace WebCore Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/NodeRareData.cpp =================================================================== --- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/dom/NodeRareData.cpp +++ qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/NodeRareData.cpp @@ -41,6 +41,6 @@ struct SameSizeAsNodeRareData { #endif }; -COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall); +COMPILE_ASSERT(sizeof(NodeRareData) <= sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall); } // namespace WebCore Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/ShadowRoot.cpp =================================================================== --- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/dom/ShadowRoot.cpp +++ qtwebkit-opensource-src-5.4.1/Source/WebCore/dom/ShadowRoot.cpp @@ -42,7 +42,7 @@ struct SameSizeAsShadowRoot : public Doc unsigned countersAndFlags[1]; }; -COMPILE_ASSERT(sizeof(ShadowRoot) == sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small); +COMPILE_ASSERT(sizeof(ShadowRoot) <= sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small); enum ShadowRootUsageOriginType { ShadowRootUsageOriginWeb = 0, Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/RenderStyle.cpp =================================================================== --- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/rendering/style/RenderStyle.cpp +++ qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/RenderStyle.cpp @@ -57,7 +57,7 @@ struct SameSizeAsBorderValue { unsigned m_width; }; -COMPILE_ASSERT(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow); +COMPILE_ASSERT(sizeof(BorderValue) <= sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow); struct SameSizeAsRenderStyle : public RefCounted<SameSizeAsRenderStyle> { void* dataRefs[7]; @@ -74,7 +74,7 @@ struct SameSizeAsRenderStyle : public Re } noninherited_flags; }; -COMPILE_ASSERT(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), RenderStyle_should_stay_small); +COMPILE_ASSERT(sizeof(RenderStyle) <= sizeof(SameSizeAsRenderStyle), RenderStyle_should_stay_small); inline RenderStyle* defaultStyle() { Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/StyleBoxData.cpp =================================================================== --- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/rendering/style/StyleBoxData.cpp +++ qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/StyleBoxData.cpp @@ -33,7 +33,7 @@ struct SameSizeAsStyleBoxData : public R uint32_t bitfields; }; -COMPILE_ASSERT(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow); +COMPILE_ASSERT(sizeof(StyleBoxData) <= sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow); StyleBoxData::StyleBoxData() : m_minWidth(RenderStyle::initialMinSize()) Index: qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/StyleRareInheritedData.cpp =================================================================== --- qtwebkit-opensource-src-5.4.1.orig/Source/WebCore/rendering/style/StyleRareInheritedData.cpp +++ qtwebkit-opensource-src-5.4.1/Source/WebCore/rendering/style/StyleRareInheritedData.cpp @@ -59,7 +59,7 @@ struct SameSizeAsStyleRareInheritedData #endif }; -COMPILE_ASSERT(sizeof(StyleRareInheritedData) == sizeof(SameSizeAsStyleRareInheritedData), StyleRareInheritedData_should_bit_pack); +COMPILE_ASSERT(sizeof(StyleRareInheritedData) <= sizeof(SameSizeAsStyleRareInheritedData), StyleRareInheritedData_should_bit_pack); StyleRareInheritedData::StyleRareInheritedData() : listStyleImage(RenderStyle::initialListStyleImage())