29e444
From 4b4084b99e6553784a53a2ea683cc768c343d63a Mon Sep 17 00:00:00 2001
29e444
From: "Ryan S. Arnold" <rsa@linux.vnet.ibm.com>
29e444
Date: Mon, 24 Jun 2013 15:33:32 -0500
29e444
Subject: [PATCH 37/42] PowerPC: Enable POWER8 platform sans hwcap bits.
29e444
 (cherry picked from commit
29e444
 2f063a6e843c788a05667e6d362d229b3b671920)
29e444
29e444
---
29e444
 sysdeps/powerpc/dl-procinfo.c                          |  5 +++--
29e444
 sysdeps/powerpc/dl-procinfo.h                          |  6 +++++-
29e444
 sysdeps/powerpc/powerpc32/power8/Implies               |  2 ++
29e444
 sysdeps/powerpc/powerpc64/power8/Implies               |  2 ++
29e444
 .../unix/sysv/linux/powerpc/powerpc32/power8/Implies   |  2 ++
29e444
 .../unix/sysv/linux/powerpc/powerpc64/power8/Implies   |  2 ++
29e444
 7 files changed, 34 insertions(+), 3 deletions(-)
29e444
 create mode 100644 sysdeps/powerpc/powerpc32/power8/Implies
29e444
 create mode 100644 sysdeps/powerpc/powerpc64/power8/Implies
29e444
 create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/power8/Implies
29e444
 create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/power8/Implies
29e444
29e444
diff --git a/sysdeps/powerpc/dl-procinfo.c b/sysdeps/powerpc/dl-procinfo.c
29e444
index 8488799..efab165 100644
29e444
--- a/sysdeps/powerpc/dl-procinfo.c
29e444
+++ b/sysdeps/powerpc/dl-procinfo.c
29e444
@@ -67,7 +67,7 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[25][10]
29e444
 #if !defined PROCINFO_DECL && defined SHARED
29e444
   ._dl_powerpc_platforms
29e444
 #else
29e444
-PROCINFO_CLASS const char _dl_powerpc_platforms[13][12]
29e444
+PROCINFO_CLASS const char _dl_powerpc_platforms[14][12]
29e444
 #endif
29e444
 #ifndef PROCINFO_DECL
29e444
 = {
29e444
@@ -83,7 +83,8 @@ PROCINFO_CLASS const char _dl_powerpc_platforms[13][12]
29e444
     [PPC_PLATFORM_PPC405] = "ppc405",
29e444
     [PPC_PLATFORM_PPC440] = "ppc440",
29e444
     [PPC_PLATFORM_PPC464] = "ppc464",
29e444
-    [PPC_PLATFORM_PPC476] = "ppc476"
29e444
+    [PPC_PLATFORM_PPC476] = "ppc476",
29e444
+    [PPC_PLATFORM_POWER8] = "power8",
29e444
   }
29e444
 #endif
29e444
 #if !defined SHARED || defined PROCINFO_DECL
29e444
diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h
29e444
index 6d904ad..0939dcf 100644
29e444
--- a/sysdeps/powerpc/dl-procinfo.h
29e444
+++ b/sysdeps/powerpc/dl-procinfo.h
29e444
@@ -30,7 +30,7 @@
29e444
 #define HWCAP_IMPORTANT		(PPC_FEATURE_HAS_ALTIVEC \
29e444
 				+ PPC_FEATURE_HAS_DFP)
29e444
 
29e444
-#define _DL_PLATFORMS_COUNT	13
29e444
+#define _DL_PLATFORMS_COUNT	14
29e444
 
29e444
 #define _DL_FIRST_PLATFORM	32
29e444
 /* Mask to filter out platforms.  */
29e444
@@ -51,6 +51,7 @@
29e444
 #define PPC_PLATFORM_PPC440		10
29e444
 #define PPC_PLATFORM_PPC464		11
29e444
 #define PPC_PLATFORM_PPC476		12
29e444
+#define PPC_PLATFORM_POWER8		13
29e444
 
29e444
 static inline const char *
29e444
 __attribute__ ((unused))
29e444
@@ -111,6 +112,9 @@ _dl_string_platform (const char *str)
29e444
 	case '7':
29e444
 	  ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER7;
29e444
 	  break;
29e444
+	case '8':
29e444
+	  ret = _DL_FIRST_PLATFORM + PPC_PLATFORM_POWER8;
29e444
+	  break;
29e444
 	default:
29e444
 	  return -1;
29e444
 	}
29e444
diff --git a/sysdeps/powerpc/powerpc32/power8/Implies b/sysdeps/powerpc/powerpc32/power8/Implies
29e444
new file mode 100644
29e444
index 0000000..083f3e9
29e444
--- /dev/null
29e444
+++ b/sysdeps/powerpc/powerpc32/power8/Implies
29e444
@@ -0,0 +1,2 @@
29e444
+powerpc/powerpc32/power7/fpu
29e444
+powerpc/powerpc32/power7
29e444
diff --git a/sysdeps/powerpc/powerpc64/power8/Implies b/sysdeps/powerpc/powerpc64/power8/Implies
29e444
new file mode 100644
29e444
index 0000000..9a5e3c7
29e444
--- /dev/null
29e444
+++ b/sysdeps/powerpc/powerpc64/power8/Implies
29e444
@@ -0,0 +1,2 @@
29e444
+powerpc/powerpc64/power7/fpu
29e444
+powerpc/powerpc64/power7
29e444
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/power8/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power8/Implies
29e444
new file mode 100644
29e444
index 0000000..066dea2
29e444
--- /dev/null
29e444
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/power8/Implies
29e444
@@ -0,0 +1,2 @@
29e444
+powerpc/powerpc32/power8/fpu
29e444
+powerpc/powerpc32/power8
29e444
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/power8/Implies b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power8/Implies
29e444
new file mode 100644
29e444
index 0000000..fad2505
29e444
--- /dev/null
29e444
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/power8/Implies
29e444
@@ -0,0 +1,2 @@
29e444
+powerpc/powerpc64/power8/fpu
29e444
+powerpc/powerpc64/power8
29e444
-- 
29e444
1.7.11.7
29e444