glibc-2.14.1-elf-rtld.c.1.diff

diff -ur glibc-2.14.1-orig/elf/rtld.c glibc-2.14.1/elf/rtld.c
--- glibc-2.14.1-orig/elf/rtld.c	2011-10-07 12:48:55.000000000 +0300
+++ glibc-2.14.1/elf/rtld.c	2011-11-16 17:00:19.000000000 +0200
@@ -930,6 +930,7 @@
 
   if (*user_entry == (ElfW(Addr)) ENTRY_POINT)
     {
+      const char *forced_argv0 = NULL;
       /* Ho ho.  We are not the program interpreter!  We are the program
 	 itself!  This means someone ran ld.so as a command.  Well, that
 	 might be convenient to do sometimes.  We support it by
@@ -994,6 +995,14 @@
 	    _dl_argc -= 2;
 	    INTUSE(_dl_argv) += 2;
 	  }
+	else if (! strcmp (INTUSE(_dl_argv)[1], "--argv0") && _dl_argc > 2)
+	  {
+	    forced_argv0 = INTUSE(_dl_argv)[2];
+
+	    _dl_skip_args += 2;
+	    _dl_argc -= 2;
+	    INTUSE(_dl_argv) += 2;
+	  }
 	else
 	  break;
 
@@ -1021,6 +1030,7 @@
 			variable LD_LIBRARY_PATH\n\
   --inhibit-rpath LIST  ignore RUNPATH and RPATH information in object names\n\
 			in LIST\n\
+  --argv0 STRING        use STRING as argv[0]\n\
   --audit LIST          use objects named in LIST as auditors\n");
 
       ++_dl_skip_args;
@@ -1073,6 +1083,8 @@
 	  HP_TIMING_DIFF (load_time, start, stop);
 	}
 
+      if (forced_argv0 != NULL) _dl_argv[0] = forced_argv0;
+
       /* Now the map for the main executable is available.  */
       main_map = GL(dl_ns)[LM_ID_BASE]._ns_loaded;