This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, ibm/2.12/master, updated. glibc-2.12.1-8-gf44ace3
- From: rsa at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 26 Oct 2010 21:33:21 -0000
- Subject: GNU C Library master sources branch, ibm/2.12/master, updated. glibc-2.12.1-8-gf44ace3
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, ibm/2.12/master has been updated
via f44ace3d499d91b194e9d9701ab0d397b8aeddda (commit)
from fc0ed7b647474cdd16efe8cbbc9eb9ccf8a7b3c8 (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f44ace3d499d91b194e9d9701ab0d397b8aeddda
commit f44ace3d499d91b194e9d9701ab0d397b8aeddda
Author: Ryan Arnold <ryanarn@etna.rchland.ibm.com>
Date: Tue Oct 26 16:26:43 2010 -0500
Allow AT_PLATFORM=foo as an env variable to the loader to override the
AT_PLATFORM value coming out of the aux vector.
diff --git a/ChangeLog b/ChangeLog
index b3da5ad..f04f077 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-26 Peter Bergner <bergner@vnet.ibm.com>
+
+ * elf/rtld.c (process_envvars): Added conditional EXTRA_LD_ENVVARS_11
+ macro which allows overriding of AT_PLATFORM using an environment
+ variable.
+ * sysdeps/unix/sysv/linux/powerpc/dl-librecon.h: New file adding
+ definition for the EXTRA_LD_ENVVARS_11 macro.
+
2010-10-06 Ulrich Drepper <drepper@gmail.com>
* string/bug-strstr1.c: New file.
diff --git a/elf/rtld.c b/elf/rtld.c
index 90f3ff1..d03aa04 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2600,6 +2600,11 @@ process_envvars (enum mode *modep)
break;
case 11:
+#ifdef EXTRA_LD_ENVVARS_11
+ /* We might have some extra environment variables with length 11
+ to handle. */
+ EXTRA_LD_ENVVARS_11
+#endif
/* Path where the binary is found. */
if (!INTUSE(__libc_enable_secure)
&& memcmp (envline, "ORIGIN_PATH", 11) == 0)
diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-librecon.h b/sysdeps/unix/sysv/linux/powerpc/dl-librecon.h
new file mode 100644
index 0000000..19dafac
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/dl-librecon.h
@@ -0,0 +1,36 @@
+/* Optional code to distinguish library flavours.
+ Copyright (C) 2010 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Peter Bergner <bergner@linux.vnet.ibm.com>
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _DL_LIBRECON_H
+
+#include <sysdeps/unix/sysv/linux/dl-librecon.h>
+
+/* Recognizing extra environment variables. */
+#define EXTRA_LD_ENVVARS_11 \
+ if (memcmp (envline, "AT_PLATFORM", 11) == 0) \
+ { \
+ GLRO(dl_platform) = &envline[12]; \
+ /* Determine the length of the platform name. */ \
+ if (GLRO(dl_platform) != NULL) \
+ GLRO(dl_platformlen) = strlen (GLRO(dl_platform)); \
+ break; \
+ }
+
+#endif /* dl-librecon.h */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
elf/rtld.c | 5 +++++
.../sysv/linux/powerpc}/dl-librecon.h | 18 ++++++++++++++----
3 files changed, 27 insertions(+), 4 deletions(-)
copy sysdeps/{generic => unix/sysv/linux/powerpc}/dl-librecon.h (60%)
hooks/post-receive
--
GNU C Library master sources