# undef amd64
# endif
# if defined(__arm__)
-# define Arm32Architecture
+# define ARMArchitecture
# undef __arm__
# if defined(zaurus)
# undef zaurus
# define AMD64Architecture
# endif
# endif
-# if defined(__arm__)
-# undef __arm__
+# if defined(__arm__) || defined(__arm32__)
# define ARMArchitecture
+# undef __arm__
+# undef __arm32__
# endif
# if defined(__sparc__) || defined(sparc)
# define SparcArchitecture
# undef sparc
# endif
+# if defined(__aarch64__)
+# define AArch64Architecture
+# undef __aarch64__
+# endif
#endif /* linux */
#if defined(sequent) || defined(_SEQUENT_)
# endif
#endif /* AMD64Architecture */
+#ifdef AArch64Architecture
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags -fmessage-length=0 -grecord-gcc-switches -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables -fstack-clash-protection -g -fno-strict-aliasing
+# endif
+# define LinuxMachineDefines -D__aarch64__
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+#endif /* AArch64Architecture */
+
+
#ifdef PpcArchitecture
# ifndef OptimizedCDebugFlags
# define OptimizedCDebugFlags DefaultGcc2i386Opt