Skip to content

Commit

Permalink
S390: Add new s390 platform.
Browse files Browse the repository at this point in the history
The new IBM z13 is added to platform string array.
The macro _DL_PLATFORMS_COUNT is incremented to 8,
because it was not incremented by commit
"S/390: Sync AUXV capabilities and archs with kernel".

ChangeLog:

	* sysdeps/s390/dl-procinfo.c (_dl_s390_cap_flags): Add z13.
	* sysdeps/s390/dl-procinfo.h (_DL_PLATFORMS_COUNT): Increased.
  • Loading branch information
Stefan Liebler authored and Andreas Krebbel committed Aug 26, 2015
1 parent 4e28fa8 commit a1b0488
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2015-08-26 Stefan Liebler <stli@linux.vnet.ibm.com>

* sysdeps/s390/dl-procinfo.c (_dl_s390_cap_flags): Add z13.
* sysdeps/s390/dl-procinfo.h (_DL_PLATFORMS_COUNT): Increased.

2015-08-26 Stefan Liebler <stli@linux.vnet.ibm.com>

* sysdeps/s390/dl-procinfo.c (_dl_s390_platforms): Add vector flag.
Expand Down
4 changes: 2 additions & 2 deletions sysdeps/s390/dl-procinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ PROCINFO_CLASS const char _dl_s390_cap_flags[12][9]
#if !defined PROCINFO_DECL && defined SHARED
._dl_s390_platforms
#else
PROCINFO_CLASS const char _dl_s390_platforms[7][7]
PROCINFO_CLASS const char _dl_s390_platforms[8][7]
#endif
#ifndef PROCINFO_DECL
= {
"g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12"
"g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13"
}
#endif
#if !defined SHARED || defined PROCINFO_DECL
Expand Down
2 changes: 1 addition & 1 deletion sysdeps/s390/dl-procinfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#define _DL_HWCAP_COUNT 12

#define _DL_PLATFORMS_COUNT 5
#define _DL_PLATFORMS_COUNT 8

/* The kernel provides up to 32 capability bits with elf_hwcap. */
#define _DL_FIRST_PLATFORM 32
Expand Down

0 comments on commit a1b0488

Please sign in to comment.