OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

S/390: Rename __S390_ARCH_LEVEL__ to __ARCH__. 

We have recently added the predefined macro __S390_ARCH_LEVEL__ to
expand to a numerical value representing the architecture document
level currently in use.  However, the IBM XL compiler already has a
macro named __ARCH__ for that purpose.  So we change our macro to that
in order to improve portability.

gcc/ChangeLog:

2017-01-31  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* config/s390/s390-c.c (s390_cpu_cpp_builtins_internal): Rename
	__S390_ARCH_LEVEL__ to __ARCH__.

gcc/testsuite/ChangeLog:

2017-01-31  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* gcc.target/s390/s390.exp: Rename __S390_ARCH_LEVEL__ to
	__ARCH__.

From-SVN: r245055
This commit is contained in:
Andreas Krebbel 2017-01-31 09:14:36 +00:00 committed by Andreas Krebbel
parent b6dae84928
commit 4727e06bb7
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2017-01-31 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* config/s390/s390-c.c (s390_cpu_cpp_builtins_internal): Rename
__S390_ARCH_LEVEL__ to __ARCH__.
2017-01-31 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/79267

4
gcc/config/s390/s390-c.c
View File

@ -340,8 +340,8 @@ s390_cpu_cpp_builtins_internal (cpp_reader *pfile,
arch_level--;
/* Review when a new arch is added and increase the value. */
char dummy[23 - 2 * PROCESSOR_max] __attribute__((unused));
sprintf (macro_def, "__S390_ARCH_LEVEL__=%d", arch_level);
cpp_undef (pfile, "__S390_ARCH_LEVEL__");
sprintf (macro_def, "__ARCH__=%d", arch_level);
cpp_undef (pfile, "__ARCH__");
cpp_define (pfile, macro_def);
}

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2017-01-31 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* gcc.target/s390/s390.exp: Rename __S390_ARCH_LEVEL__ to
__ARCH__.
2017-01-31 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/79267

14
gcc/testsuite/gcc.target/s390/s390.exp
View File

@ -100,19 +100,19 @@ proc check_effective_target_s390_useable_hw { } {
int main (void)
{
asm (".machinemode zarch" : : );
#if __S390_ARCH_LEVEL__ >= 11
#if __ARCH__ >= 11
asm ("lcbb %%r2,0(%%r15),0" : : );
#elif __S390_ARCH_LEVEL__ >= 10
#elif __ARCH__ >= 10
asm ("risbgn %%r2,%%r2,0,0,0" : : );
#elif __S390_ARCH_LEVEL__ >= 9
#elif __ARCH__ >= 9
asm ("sgrk %%r2,%%r2,%%r2" : : );
#elif __S390_ARCH_LEVEL__ >= 8
#elif __ARCH__ >= 8
asm ("rosbg %%r2,%%r2,0,0,0" : : );
#elif __S390_ARCH_LEVEL__ >= 7
#elif __ARCH__ >= 7
asm ("nilf %%r2,0" : : );
#elif __S390_ARCH_LEVEL__ >= 6
#elif __ARCH__ >= 6
asm ("lay %%r2,0(%%r15)" : : );
#elif __S390_ARCH_LEVEL__ >= 5
#elif __ARCH__ >= 5
asm ("tam" : : );
#endif
#ifdef __HTM__