This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26.9000-585-g3d26560
- From: azanella at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 17 Oct 2017 14:03:48 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26.9000-585-g3d26560
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 3d265601358974c9be8264e53dadd8f9aea5690c (commit)
via 4e17c78e4a5da41b3cfefdd49ab760b051b65029 (commit)
from 56a752ab6aa89088a787d852358cdd8f0a0d57f1 (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=3d265601358974c9be8264e53dadd8f9aea5690c
commit 3d265601358974c9be8264e53dadd8f9aea5690c
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Oct 9 15:53:33 2017 -0300
Add build-many-glibcs.py arm-linux-gnueabihf-v7{-disable-multiarch}
This patch adds two extra configuration for arm-linux-gnueabihf to
cover for multiarch support:
1. arm-linux-gnueabihf-v7a: enables multiarch support by using
-march=armv7a.
2. Same as 1. but with --disable-multiarch.
Check with build-many-glibcs.py for both options.
* scripts/build-many-glibcs.py (Context.add_all_configs):
Add arm-linux-gnueabihf multiarch extra_glibcs.
diff --git a/ChangeLog b/ChangeLog
index 2ca679a..64f5ca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2017-10-17 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+ * scripts/build-many-glibcs.py (Context.add_all_configs):
+ Add arm-linux-gnueabihf multiarch extra_glibcs.
+
* sysdeps/generic/ifunc-init.h: New file.
* sysdeps/x86/init-arch.h: Use generic ifunc-init.h.
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index a6c01f9..4cd0a81 100755
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -174,7 +174,12 @@ class Context(object):
variant='be8',
gcc_cfg=['--with-arch=armv7-a'])
self.add_config(arch='arm',
- os_name='linux-gnueabihf')
+ os_name='linux-gnueabihf',
+ extra_glibcs=[{'variant': 'v7a',
+ 'ccopts': '-march=armv7a'},
+ {'variant': 'v7a-disable-multi-arch',
+ 'ccopts': '-march=armv7a',
+ 'cfg': ['--disable-multi-arch']}])
self.add_config(arch='armeb',
os_name='linux-gnueabihf')
self.add_config(arch='armeb',
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4e17c78e4a5da41b3cfefdd49ab760b051b65029
commit 4e17c78e4a5da41b3cfefdd49ab760b051b65029
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu Oct 12 16:24:44 2017 -0300
Add common ifunc-init.h header
This patch moves the generic definition from x86_64 init-arch
to a common header ifunc-init.h. No functional changes is expected.
Checked on a x86_64-linux-gnu build.
* sysdeps/generic/ifunc-init.h: New file.
* sysdeps/x86/init-arch.h: Use generic ifunc-init.h.
diff --git a/ChangeLog b/ChangeLog
index 0a51afd..2ca679a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-10-17 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+
+ * sysdeps/generic/ifunc-init.h: New file.
+ * sysdeps/x86/init-arch.h: Use generic ifunc-init.h.
+
2017-10-17 Mike FABIAN <mfabian@redhat.com>
[BZ #22019]
diff --git a/sysdeps/x86/init-arch.h b/sysdeps/generic/ifunc-init.h
similarity index 57%
copy from sysdeps/x86/init-arch.h
copy to sysdeps/generic/ifunc-init.h
index 15d3f09..59d5ac6 100644
--- a/sysdeps/x86/init-arch.h
+++ b/sysdeps/generic/ifunc-init.h
@@ -1,5 +1,6 @@
-/* This file is part of the GNU C Library.
- Copyright (C) 2008-2017 Free Software Foundation, Inc.
+/* IFUNC generic definitions.
+ This file is part of the GNU C Library.
+ Copyright (C) 2017 Free Software Foundation, Inc.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -15,38 +16,29 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#ifdef __ASSEMBLER__
-# include <cpu-features.h>
-#else
-# include <ldsodefs.h>
-#endif
-
/* These macros are used to implement ifunc selection in C. To implement
- an ifunc function, foo, which returns the address of __foo_sse2 or
- __foo_avx2:
+ an ifunc function, foo, which returns the address of __foo_impl1 or
+ __foo_impl2:
#define foo __redirect_foo
- #define __foo __redirect___foo
#include <foo.h>
#undef foo
- #undef __foo
#define SYMBOL_NAME foo
- #include <init-arch.h>
+ #include <ifunc-init.h>
- extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden;
- extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2) attribute_hidden;
+ extern __typeof (REDIRECT_NAME) OPTIMIZE (impl1) attribute_hidden;
+ extern __typeof (REDIRECT_NAME) OPTIMIZE (impl2) attribute_hidden;
static inline void *
foo_selector (void)
{
- if (use AVX2)
- return OPTIMIZE (avx2);
+ if (condition)
+ return OPTIMIZE (impl2);
- return OPTIMIZE (sse2);
+ return OPTIMIZE (impl1);
}
- libc_ifunc_redirected (__redirect_foo, foo, foo_selector ());
-
+ libc_ifunc_redirected (__redirect_foo, foo, IFUNC_SELECTOR ());
*/
#define PASTER1(x,y) x##_##y
@@ -60,16 +52,3 @@
#define REDIRECT_NAME EVALUATOR1 (__redirect, SYMBOL_NAME)
#define OPTIMIZE(name) EVALUATOR2 (SYMBOL_NAME, name)
#define IFUNC_SELECTOR EVALUATOR1 (SYMBOL_NAME, ifunc_selector)
-
-#ifndef __x86_64__
-/* Due to the reordering and the other nifty extensions in i686, it is
- not really good to use heavily i586 optimized code on an i686. It's
- better to use i486 code if it isn't an i586. */
-# if MINIMUM_ISA == 686
-# define USE_I586 0
-# define USE_I686 1
-# else
-# define USE_I586 (HAS_ARCH_FEATURE (I586) && !HAS_ARCH_FEATURE (I686))
-# define USE_I686 HAS_ARCH_FEATURE (I686)
-# endif
-#endif
diff --git a/sysdeps/x86/init-arch.h b/sysdeps/x86/init-arch.h
index 15d3f09..06a21cc 100644
--- a/sysdeps/x86/init-arch.h
+++ b/sysdeps/x86/init-arch.h
@@ -20,46 +20,7 @@
#else
# include <ldsodefs.h>
#endif
-
-/* These macros are used to implement ifunc selection in C. To implement
- an ifunc function, foo, which returns the address of __foo_sse2 or
- __foo_avx2:
-
- #define foo __redirect_foo
- #define __foo __redirect___foo
- #include <foo.h>
- #undef foo
- #undef __foo
- #define SYMBOL_NAME foo
- #include <init-arch.h>
-
- extern __typeof (REDIRECT_NAME) OPTIMIZE (sse2) attribute_hidden;
- extern __typeof (REDIRECT_NAME) OPTIMIZE (avx2) attribute_hidden;
-
- static inline void *
- foo_selector (void)
- {
- if (use AVX2)
- return OPTIMIZE (avx2);
-
- return OPTIMIZE (sse2);
- }
-
- libc_ifunc_redirected (__redirect_foo, foo, foo_selector ());
-
-*/
-
-#define PASTER1(x,y) x##_##y
-#define EVALUATOR1(x,y) PASTER1 (x,y)
-#define PASTER2(x,y) __##x##_##y
-#define EVALUATOR2(x,y) PASTER2 (x,y)
-
-/* Basically set '__redirect_<symbol>' to use as type definition,
- '__<symbol>_<variant>' as the optimized implementation and
- '<symbol>_ifunc_selector' as the IFUNC selector. */
-#define REDIRECT_NAME EVALUATOR1 (__redirect, SYMBOL_NAME)
-#define OPTIMIZE(name) EVALUATOR2 (SYMBOL_NAME, name)
-#define IFUNC_SELECTOR EVALUATOR1 (SYMBOL_NAME, ifunc_selector)
+#include <ifunc-init.h>
#ifndef __x86_64__
/* Due to the reordering and the other nifty extensions in i686, it is
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++
scripts/build-many-glibcs.py | 7 +++-
sysdeps/{x86/init-arch.h => generic/ifunc-init.h} | 45 ++++++---------------
sysdeps/x86/init-arch.h | 41 +------------------
4 files changed, 27 insertions(+), 74 deletions(-)
copy sysdeps/{x86/init-arch.h => generic/ifunc-init.h} (57%)
hooks/post-receive
--
GNU C Library master sources