diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a8f5212..d4c5b31 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-04-24  Clement Chigot  <clement.chigot@atos.net>
+
+	* config/rs6000/aix71.h (SUBTARGET_OVERRIDE_OPTIONS): Disable
+	OPTION_MASK_VSX and OPTION_MASK_ALTIVEC from rs6000_isa_flags
+	for Go on 32 bit AIX.
+	* config/rs6000/aix72.h: Likewise.
+
 2019-04-24  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/90193
diff --git a/gcc/config/rs6000/aix71.h b/gcc/config/rs6000/aix71.h
index b30e719..263cc42 100644
--- a/gcc/config/rs6000/aix71.h
+++ b/gcc/config/rs6000/aix71.h
@@ -56,6 +56,12 @@
     {									\
       rs6000_current_cmodel = CMODEL_LARGE;				\
     }									\
+  if (! strcmp (lang_hooks.name, "GNU Go")				\
+      && TARGET_32BIT)							\
+    {									\
+      /* aix/ppc doesn't support -mvsx and -maltivec with Go */		\
+      rs6000_isa_flags &= ~(OPTION_MASK_VSX | OPTION_MASK_ALTIVEC);	\
+    }									\
 } while (0)
 
 #undef ASM_SPEC
diff --git a/gcc/config/rs6000/aix72.h b/gcc/config/rs6000/aix72.h
index 9f02aea..065e1eb 100644
--- a/gcc/config/rs6000/aix72.h
+++ b/gcc/config/rs6000/aix72.h
@@ -56,6 +56,12 @@
     {									\
       rs6000_current_cmodel = CMODEL_LARGE;				\
     }									\
+  if (! strcmp (lang_hooks.name, "GNU Go")				\
+      && TARGET_32BIT)							\
+    {									\
+      /* aix/ppc doesn't support -mvsx and -maltivec with Go */		\
+      rs6000_isa_flags &= ~(OPTION_MASK_VSX | OPTION_MASK_ALTIVEC);	\
+    }									\
 } while (0)
 
 #undef ASM_SPEC