This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/pr22363/master created. glibc-2.26.9000-677-g7d6fbf5
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 29 Oct 2017 21:16:17 -0000
- Subject: GNU C Library master sources branch hjl/pr22363/master created. glibc-2.26.9000-677-g7d6fbf5
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, hjl/pr22363/master has been created
at 7d6fbf5876d66e319ed4d1e0881528b70d84c44e (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7d6fbf5876d66e319ed4d1e0881528b70d84c44e
commit 7d6fbf5876d66e319ed4d1e0881528b70d84c44e
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Sun Oct 29 14:12:01 2017 -0700
x32: Set GLRO(dl_platform) to "x86_64" by default [BZ #22363]
Set dl_platform to "x86_64" for x32 by default since kernel may set it
to "i686". This fixed:
FAIL: elf/tst-platform-1
on x32. Tested on x86-64 and x32.
[BZ #22363]
* sysdeps/x86/cpu-features.c (init_cpu_features): Set
GLRO(dl_platform) to "x86_64" by default for x32.
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
index 87aaa86..0ca2936 100644
--- a/sysdeps/x86/cpu-features.c
+++ b/sysdeps/x86/cpu-features.c
@@ -430,6 +430,11 @@ no_cpuid:
if (platform != NULL)
GLRO(dl_platform) = platform;
+# ifdef __ILP32__
+ /* Set dl_platform to "x86_64" since kernel may set it to "i686". */
+ else
+ GLRO(dl_platform) = "x86_64";
+# endif
}
#else
GLRO(dl_hwcap) = 0;
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources