diff --git a/linux-user/user-internals.h b/linux-user/user-internals.h
index 24d35998f0..e65373b204 100644
--- a/linux-user/user-internals.h
+++ b/linux-user/user-internals.h
@@ -136,7 +136,7 @@ void print_termios2(void *arg);
 #endif
 
 /* ARM EABI and MIPS expect 64bit types aligned even on pairs or registers */
-#ifdef TARGET_ARM
+#if defined(TARGET_ARM) && !defined(TARGET_AARCH64)
 static inline int regpairs_aligned(CPUArchState *cpu_env, int num)
 {
     return cpu_env->eabi;