Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by Andreas Schwab.
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
index c088a0f..faa53d6 100644
--- a/Include/unicodeobject.h
+++ b/Include/unicodeobject.h
@@ -343,6 +343,9 @@
the data pointer is filled out. The bit is redundant, and helps
to minimize the test in PyUnicode_IS_READY(). */
unsigned int ready:1;
+ /* Padding to ensure that PyUnicode_DATA() is always aligned to
+ 4 bytes (see issue #19537 on m68k). */
+ unsigned int :24;
} state;
wchar_t *wstr; /* wchar_t representation (null-terminated) */
} PyASCIIObject;
diff --git a/Misc/ACKS b/Misc/ACKS
index 8875389..68617ce 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1170,6 +1170,7 @@
Chad J. Schroeder
Christian Schubert
Sam Schulenburg
+Andreas Schwab
Stefan Schwarzer
Dietmar Schwertberger
Federico Schwindt
diff --git a/Misc/NEWS b/Misc/NEWS
index b20e458..0ec7388 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by
+ Andreas Schwab.
+
- Issue #20929: Add a type cast to avoid shifting a negative number.
- Issue #20731: Properly position in source code files even if they