diff --git a/src/runtime/arch_xtensa.go b/src/runtime/arch_xtensa.go
index 2bb58476c..03ca8c651 100644
--- a/src/runtime/arch_xtensa.go
+++ b/src/runtime/arch_xtensa.go
@@ -9,9 +9,9 @@ const TargetBits = 32
 
 const deferExtraRegs = 0
 
-// Align on a word boundary.
+// The largest alignment according to the Xtensa ABI is 8 (long long, double).
 func align(ptr uintptr) uintptr {
-	return (ptr + 3) &^ 3
+	return (ptr + 7) &^ 7
 }
 
 func getCurrentStackPointer() uintptr {