diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2849ce84e69..25c38f391c3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-23  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* config/sparc/sparc-c.c (sparc_target_macros): Replace TARGET_64BIT
+	with TARGET_ARCH64.  Define __VIS to 0x400 if TARGET_VIS4.
+
 2016-10-21  Andrew Pinski  <apinski@cavium.com>
 
 	* config/aarch64/aarch64-cores.def: Rewrite so IMP and PART are
diff --git a/gcc/config/sparc/sparc-c.c b/gcc/config/sparc/sparc-c.c
index d9f9c15d2e3..8af031299c4 100644
--- a/gcc/config/sparc/sparc-c.c
+++ b/gcc/config/sparc/sparc-c.c
@@ -29,7 +29,7 @@ sparc_target_macros (void)
 {
   builtin_define_std ("sparc");
 
-  if (TARGET_64BIT)
+  if (TARGET_ARCH64)
     {
       cpp_assert (parse_in, "cpu=sparc64");
       cpp_assert (parse_in, "machine=sparc64");
@@ -43,7 +43,7 @@ sparc_target_macros (void)
   if (TARGET_VIS4)
     {
       cpp_define (parse_in, "__VIS__=0x400");
-      cpp_define (parse_in, "__VIS__=0x400");
+      cpp_define (parse_in, "__VIS=0x400");
     }
   else if (TARGET_VIS3)
     {