You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
1.8 KiB
56 lines
1.8 KiB
7 years ago
|
From 9bcfc74b3097eb84973b7b91fd676f116e206938 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stefan Liebler <stli@linux.vnet.ibm.com>
|
||
|
|
Date: Thu, 8 Oct 2015 10:45:58 +0200
|
||
|
|
Subject: [PATCH 07/30] S390: Add new s390 platform.
|
||
|
|
|
||
|
|
upstream-commit-id: a1b0488fc9df3d895a2e5eefbcd348d3f7fe0e52
|
||
|
|
https://www.sourceware.org/ml/libc-alpha/2015-07/msg00081.html
|
||
|
|
|
||
|
|
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.
|
||
|
|
---
|
||
|
|
sysdeps/s390/dl-procinfo.c | 4 ++--
|
||
|
|
sysdeps/s390/dl-procinfo.h | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c
|
||
|
|
index 96d438a..f353528 100644
|
||
|
|
--- a/sysdeps/s390/dl-procinfo.c
|
||
|
|
+++ b/sysdeps/s390/dl-procinfo.c
|
||
|
|
@@ -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
|
||
|
|
diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h
|
||
|
|
index 89766e0..80747f0 100644
|
||
|
|
--- a/sysdeps/s390/dl-procinfo.h
|
||
|
|
+++ b/sysdeps/s390/dl-procinfo.h
|
||
|
|
@@ -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
|
||
|
|
--
|
||
|
|
2.3.0
|