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 b3da5ad440b104faa893f002eabdcb09fd21bc9c..f04f0771b148d2e750e1f7e61aca0be7f1df96aa 100644 (file)
--- 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 90f3ff126eb910fa90f6361726fec97c1370fc85..d03aa04f33177238d6df62a856bcb591b69766d0 100644 (file)
--- 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 (file)
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 */