GNU C Library master sources branch master updated. glibc-2.25-200-gfda19e0

[hjl at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  fda19e04387359e1bc8c30f0eda5a61d976942ff (commit)
      from  6d4adeb700840bab65165223e058ddc459cf07b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=fda19e04387359e1bc8c30f0eda5a61d976942ff

commit fda19e04387359e1bc8c30f0eda5a61d976942ff
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Mon Apr 10 12:01:30 2017 -0700

    Add sysdeps/x86/dl-procinfo.c
    
    Add sysdeps/x86/dl-procinfo.c for x86 version of processor capability
    information to reduce duplication between i386 and x86_64 dl-procinfo.c.
    
    	* sysdeps/i386/dl-procinfo.c: Include
    	<sysdeps/x86/dl-procinfo.c>.
    	* sysdeps/x86_64/dl-procinfo.c: Likewise.
    	* sysdeps/x86/dl-procinfo.c: New file.

diff --git a/ChangeLog b/ChangeLog
index 134da60..ce57b65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-04-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/i386/dl-procinfo.c: Include
+	<sysdeps/x86/dl-procinfo.c>.
+	* sysdeps/x86_64/dl-procinfo.c: Likewise.
+	* sysdeps/x86/dl-procinfo.c: New file.
+
 2017-04-10  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
 	* sysdeps/generic/math_private.h: Remove declarations of
diff --git a/sysdeps/i386/dl-procinfo.c b/sysdeps/i386/dl-procinfo.c
index cec7dcc..b832830 100644
--- a/sysdeps/i386/dl-procinfo.c
+++ b/sysdeps/i386/dl-procinfo.c
@@ -43,21 +43,7 @@
 # define PROCINFO_CLASS
 #endif
 
-#if !IS_IN (ldconfig)
-# if !defined PROCINFO_DECL && defined SHARED
-  ._dl_x86_cpu_features
-# else
-PROCINFO_CLASS struct cpu_features _dl_x86_cpu_features
-# endif
-# ifndef PROCINFO_DECL
-= { }
-# endif
-# if !defined SHARED || defined PROCINFO_DECL
-;
-# else
-,
-# endif
-#endif
+#include <sysdeps/x86/dl-procinfo.c>
 
 #if !defined PROCINFO_DECL && defined SHARED
   ._dl_x86_cap_flags
diff --git a/sysdeps/x86_64/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c
similarity index 80%
copy from sysdeps/x86_64/dl-procinfo.c
copy to sysdeps/x86/dl-procinfo.c
index a76624f..9d154bf 100644
--- a/sysdeps/x86_64/dl-procinfo.c
+++ b/sysdeps/x86/dl-procinfo.c
@@ -1,5 +1,5 @@
-/* Data for x86-64 version of processor capability information.
-   Copyright (C) 2015-2017 Free Software Foundation, Inc.
+/* Data for x86 version of processor capability information.
+   Copyright (C) 2017 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
@@ -35,23 +35,18 @@
        needed.
   */
 
-#ifndef PROCINFO_CLASS
-# define PROCINFO_CLASS
-#endif
-
-#if !defined PROCINFO_DECL && defined SHARED
+#if !IS_IN (ldconfig)
+# if !defined PROCINFO_DECL && defined SHARED
   ._dl_x86_cpu_features
-#else
+# else
 PROCINFO_CLASS struct cpu_features _dl_x86_cpu_features
-#endif
-#ifndef PROCINFO_DECL
+# endif
+# ifndef PROCINFO_DECL
 = { }
-#endif
-#if !defined SHARED || defined PROCINFO_DECL
+# endif
+# if !defined SHARED || defined PROCINFO_DECL
 ;
-#else
+# else
 ,
+# endif
 #endif
-
-#undef PROCINFO_DECL
-#undef PROCINFO_CLASS
diff --git a/sysdeps/x86_64/dl-procinfo.c b/sysdeps/x86_64/dl-procinfo.c
index a76624f..17ae800 100644
--- a/sysdeps/x86_64/dl-procinfo.c
+++ b/sysdeps/x86_64/dl-procinfo.c
@@ -39,19 +39,7 @@
 # define PROCINFO_CLASS
 #endif
 
-#if !defined PROCINFO_DECL && defined SHARED
-  ._dl_x86_cpu_features
-#else
-PROCINFO_CLASS struct cpu_features _dl_x86_cpu_features
-#endif
-#ifndef PROCINFO_DECL
-= { }
-#endif
-#if !defined SHARED || defined PROCINFO_DECL
-;
-#else
-,
-#endif
+#include <sysdeps/x86/dl-procinfo.c>
 
 #undef PROCINFO_DECL
 #undef PROCINFO_CLASS

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |    7 +++++++
 sysdeps/i386/dl-procinfo.c                         |   16 +---------------
 .../{unix/sysv/linux/aarch64 => x86}/dl-procinfo.c |   14 +++-----------
 sysdeps/x86_64/dl-procinfo.c                       |   14 +-------------
 4 files changed, 12 insertions(+), 39 deletions(-)
 copy sysdeps/{unix/sysv/linux/aarch64 => x86}/dl-procinfo.c (85%)


hooks/post-receive
-- 
GNU C Library master sources