diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 055ff045e0f..d75c646ba34 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2019-08-16  Alexandre Oliva <oliva@adacore.com>
 
+	* gcc.target/i386/asm-4.c: Use amd64 natural addressing mode
+	on all __LP64__ targets.
+
 	* gcc.target/arc/interrupt-6.c: Use __builtin_alloca, require
 	effective target support for alloca, drop include of alloca.h.
 	* gcc.target/i386/pr80969-3.c: Likewise.
diff --git a/gcc/testsuite/gcc.target/i386/asm-4.c b/gcc/testsuite/gcc.target/i386/asm-4.c
index b86801032bc..69dd1d3df0b 100644
--- a/gcc/testsuite/gcc.target/i386/asm-4.c
+++ b/gcc/testsuite/gcc.target/i386/asm-4.c
@@ -29,7 +29,7 @@ baz (void)
 {
   /* Darwin loads 64-bit regions above the 4GB boundary so
      we need to use this instead.  */
-#if defined (__LP64__) && defined (__MACH__)
+#if defined (__LP64__)
   __asm ("leaq foo(%%rip), %0" : "=r" (fn));
 #else
   __asm ("movl $foo, %k0" : "=r" (fn));