[Committed] S/390: Rename __S390_VX__ to __VX__.

[Andreas Krebbel]

gcc/ChangeLog:

2017-02-02  Andreas Krebbel  <kreb...@linux.vnet.ibm.com>

        * config/s390/s390-c.c (s390_cpu_cpp_builtins_internal): Rename
        __S390_VX__ to __VX__.

gcc/testsuite/ChangeLog:

2017-02-02  Andreas Krebbel  <kreb...@linux.vnet.ibm.com>

        * gcc.target/s390/s390.exp: Rename __S390_VX__ to __VX__.
---
 gcc/config/s390/s390-c.c               | 2 +-
 gcc/testsuite/gcc.target/s390/s390.exp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/config/s390/s390-c.c b/gcc/config/s390/s390-c.c
index 8f184ea..8cdac7e 100644
--- a/gcc/config/s390/s390-c.c
+++ b/gcc/config/s390/s390-c.c
@@ -321,7 +321,7 @@ s390_cpu_cpp_builtins_internal (cpp_reader *pfile,
   s390_def_or_undef_macro (pfile, MASK_OPT_HTM, old_opts, opts,
                           "__HTM__", "__HTM__");
   s390_def_or_undef_macro (pfile, MASK_OPT_VX, old_opts, opts,
-                          "__S390_VX__", "__S390_VX__");
+                          "__VX__", "__VX__");
   s390_def_or_undef_macro (pfile, MASK_ZVECTOR, old_opts, opts,
                           "__VEC__=10301", "__VEC__");
   s390_def_or_undef_macro (pfile, MASK_ZVECTOR, old_opts, opts,
diff --git a/gcc/testsuite/gcc.target/s390/s390.exp 
b/gcc/testsuite/gcc.target/s390/s390.exp
index 107ba98..26bb18c 100644
--- a/gcc/testsuite/gcc.target/s390/s390.exp
+++ b/gcc/testsuite/gcc.target/s390/s390.exp
@@ -121,7 +121,7 @@ proc check_effective_target_s390_useable_hw { } {
            asm ("etnd %0" : "=d" (nd));
          }
        #endif
-       #ifdef __S390_VX__
+       #ifdef __VX__
            asm ("vzero %%v0" : : );
        #endif
          return 0;
-- 
2.9.1