Re: Log for attempted build of webkit2gtk_2.6.2+dfsg1-4 on m68k (dist=unstable)
This patch works for me.
Andreas.
Index: webkitgtk-2.8.0/CMakeLists.txt
===================================================================
--- webkitgtk-2.8.0.orig/CMakeLists.txt
+++ webkitgtk-2.8.0/CMakeLists.txt
@@ -100,6 +100,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
set(WTF_CPU_S390 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
set(WTF_CPU_S390X 1)
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "m68k")
+ set(WTF_CPU_M68K 1)
else ()
message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'")
endif ()
Index: webkitgtk-2.8.0/Source/JavaScriptCore/CMakeLists.txt
===================================================================
--- webkitgtk-2.8.0.orig/Source/JavaScriptCore/CMakeLists.txt
+++ webkitgtk-2.8.0/Source/JavaScriptCore/CMakeLists.txt
@@ -1152,6 +1152,7 @@ elseif (WTF_CPU_PPC64LE)
elseif (WTF_CPU_S390)
elseif (WTF_CPU_S390X)
elseif (WTF_CPU_MIPS)
+elseif (WTF_CPU_M68K)
elseif (WTF_CPU_SH4)
elseif (WTF_CPU_X86)
elseif (WTF_CPU_X86_64)
Index: webkitgtk-2.8.0/Source/WTF/wtf/Platform.h
===================================================================
--- webkitgtk-2.8.0.orig/Source/WTF/wtf/Platform.h
+++ webkitgtk-2.8.0/Source/WTF/wtf/Platform.h
@@ -344,6 +344,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 ==== */
Index: webkitgtk-2.8.0/Source/WTF/wtf/dtoa/utils.h
===================================================================
--- webkitgtk-2.8.0.orig/Source/WTF/wtf/dtoa/utils.h
+++ webkitgtk-2.8.0/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: webkitgtk-2.8.0/Source/WebCore/css/CSSProperty.cpp
===================================================================
--- webkitgtk-2.8.0.orig/Source/WebCore/css/CSSProperty.cpp
+++ webkitgtk-2.8.0/Source/WebCore/css/CSSProperty.cpp
@@ -35,7 +35,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);
CSSPropertyID StylePropertyMetadata::shorthandID() const
{
Index: webkitgtk-2.8.0/Source/WebCore/css/RuleSet.h
===================================================================
--- webkitgtk-2.8.0.orig/Source/WebCore/css/RuleSet.h
+++ webkitgtk-2.8.0/Source/WebCore/css/RuleSet.h
@@ -141,7 +141,7 @@ struct SameSizeAsRuleData {
unsigned d[4];
};
-COMPILE_ASSERT(sizeof(RuleData) == sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
+COMPILE_ASSERT(sizeof(RuleData) <= sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
class RuleSet {
WTF_MAKE_NONCOPYABLE(RuleSet); WTF_MAKE_FAST_ALLOCATED;
Index: webkitgtk-2.8.0/Source/WebCore/dom/ElementRareData.cpp
===================================================================
--- webkitgtk-2.8.0.orig/Source/WebCore/dom/ElementRareData.cpp
+++ webkitgtk-2.8.0/Source/WebCore/dom/ElementRareData.cpp
@@ -42,6 +42,6 @@ struct SameSizeAsElementRareData : NodeR
void* pointers[8];
};
-static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
+static_assert(sizeof(ElementRareData) <= sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
} // namespace WebCore
Index: webkitgtk-2.8.0/Source/WebCore/dom/NodeRareData.cpp
===================================================================
--- webkitgtk-2.8.0.orig/Source/WebCore/dom/NodeRareData.cpp
+++ webkitgtk-2.8.0/Source/WebCore/dom/NodeRareData.cpp
@@ -38,6 +38,6 @@ struct SameSizeAsNodeRareData {
void* m_pointer[3];
};
-COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
+COMPILE_ASSERT(sizeof(NodeRareData) <= sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
} // namespace WebCore
Index: webkitgtk-2.8.0/Source/WebCore/dom/ShadowRoot.cpp
===================================================================
--- webkitgtk-2.8.0.orig/Source/WebCore/dom/ShadowRoot.cpp
+++ webkitgtk-2.8.0/Source/WebCore/dom/ShadowRoot.cpp
@@ -42,7 +42,7 @@ struct SameSizeAsShadowRoot : public Doc
void* host;
};
-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: webkitgtk-2.8.0/Source/WebCore/rendering/style/RenderStyle.cpp
===================================================================
--- webkitgtk-2.8.0.orig/Source/WebCore/rendering/style/RenderStyle.cpp
+++ webkitgtk-2.8.0/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -63,7 +63,7 @@ struct SameSizeAsBorderValue {
int m_restBits;
};
-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];
@@ -78,7 +78,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: webkitgtk-2.8.0/Source/WebCore/rendering/style/StyleBoxData.cpp
===================================================================
--- webkitgtk-2.8.0.orig/Source/WebCore/rendering/style/StyleBoxData.cpp
+++ webkitgtk-2.8.0/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())
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Reply to: