[PATCH] ppc update dl-procinfo to match RFC.

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] ppc update dl-procinfo to match RFC.

Steven Munroe
This patch updates the dl-procinfo for powerpc to match the RFC (less
the BOOKE bits).



2006-01-11  Steven Munroe  <[hidden email]>

        * sysdeps/powerpc/dl-procinfo.c: Rename "cell" to "cellbe".
        * sysdeps/powerpc/dl-procinfo.h (HWCAP_IMPORTANT): Drop
        PPC_FEATURE_POWER4, PC_FEATURE_POWER5, and PPC_FEATURE_POWER5_PLUS.
        Use PPC_FEATURE_CELL_BE.
        * sysdeps/powerpc/sysdep.h: Rename PPC_FEATURE_CELL to
        PPC_FEATURE_CELL_BE.  Remove PPC_FEATURE_970.  Updates the
        PPC_FEATURE_* descriptions.


diff -urN libc24-cvstip-20060111/sysdeps/powerpc/dl-procinfo.c libc24/sysdeps/powerpc/dl-procinfo.c
--- libc24-cvstip-20060111/sysdeps/powerpc/dl-procinfo.c 2005-12-13 03:26:13.000000000 -0600
+++ libc24/sysdeps/powerpc/dl-procinfo.c 2006-01-13 17:08:55.101388592 -0600
@@ -1,5 +1,5 @@
 /* Data for processor capability information.  PowerPC version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -50,7 +50,7 @@
 #endif
 #ifndef PROCINFO_DECL
 = {
-    "cell", "power5+", "power5", "power4",
+    "cellbe", "power5+", "power5", "power4",
     "notb", "efpdouble", "efpsingle", "spe",
     "ucache", "4xxmac", "mmu", "fpu",
     "altivec", "ppc601", "ppc64", "ppc32",
diff -urN libc24-cvstip-20060111/sysdeps/powerpc/dl-procinfo.h libc24/sysdeps/powerpc/dl-procinfo.h
--- libc24-cvstip-20060111/sysdeps/powerpc/dl-procinfo.h 2005-12-13 03:26:13.000000000 -0600
+++ libc24/sysdeps/powerpc/dl-procinfo.h 2006-01-13 17:13:23.844400144 -0600
@@ -1,5 +1,5 @@
 /* Processor capability information handling macros.  PowerPC version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -28,11 +28,8 @@
 #define _DL_HWCAP_COUNT 32
 
 /* These bits influence library search.  */
-#define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC      \
- | PPC_FEATURE_POWER4      \
- | PPC_FEATURE_POWER5      \
- | PPC_FEATURE_POWER5_PLUS      \
- | PPC_FEATURE_CELL)
+#define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC      \
+ | PPC_FEATURE_CELL_BE)
 
 /* We don't use AT_PLATFORM.  */
 #define _DL_HWCAP_PLATFORM 0
diff -urN libc24-cvstip-20060111/sysdeps/powerpc/sysdep.h libc24/sysdeps/powerpc/sysdep.h
--- libc24-cvstip-20060111/sysdeps/powerpc/sysdep.h 2005-11-17 17:36:13.000000000 -0600
+++ libc24/sysdeps/powerpc/sysdep.h 2006-01-13 17:12:56.196478904 -0600
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001, 2002, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -29,15 +29,14 @@
 #define PPC_FEATURE_HAS_MMU 0x04000000 /* Memory Management Unit.  */
 #define PPC_FEATURE_HAS_4xxMAC 0x02000000 /* 4xx Multiply Accumulator.  */
 #define PPC_FEATURE_UNIFIED_CACHE 0x01000000 /* Unified I/D cache.  */
-#define PPC_FEATURE_HAS_SPE 0x00800000
-#define PPC_FEATURE_HAS_EFP_SINGLE 0x00400000
-#define PPC_FEATURE_HAS_EFP_DOUBLE 0x00200000
+#define PPC_FEATURE_HAS_SPE 0x00800000 /* Signal Processing ext.  */
+#define PPC_FEATURE_HAS_EFP_SINGLE 0x00400000 /* SPE Float.  */
+#define PPC_FEATURE_HAS_EFP_DOUBLE 0x00200000 /* SPE Double.  */
 #define PPC_FEATURE_NO_TB 0x00100000 /* 601/403gx have no timebase */
-#define PPC_FEATURE_POWER4 0x00080000 /* POWER4 microarch level */
-#define PPC_FEATURE_POWER5 0x00040000 /* POWER5 microarch level */
-#define PPC_FEATURE_POWER5_PLUS 0x00020000 /* POWER5+ microarch level */
-#define PPC_FEATURE_CELL 0x00010000 /* CELL PU microarch level */
-#define PPC_FEATURE_970 (PPC_FEATURE_POWER4 + PPC_FEATURE_HAS_ALTIVEC)
+#define PPC_FEATURE_POWER4 0x00080000 /* POWER4 ISA 2.00  */
+#define PPC_FEATURE_POWER5 0x00040000 /* POWER5 ISA 2.01  */
+#define PPC_FEATURE_POWER5_PLUS 0x00020000 /* POWER5+ ISA 2.02  */
+#define PPC_FEATURE_CELL_BE 0x00010000 /* CELL Broadband Engine.  */
 
 #ifdef __ASSEMBLER__