tools/nolibc: export environ as a weak symbol on i386

The environ is retrieved from the _start code and is easy to store at
this moment. Let's declare the variable weak and store the value into
it. By not being static it will be visible to all units. By being weak,
if some programs already declared it, they will continue to be able to
use it. This was tested both with environ inherited from _start and
extracted from envp.

Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>

diff --git a/tools/include/nolibc/arch-i386.h b/tools/include/nolibc/arch-i386.h
index ef2a836ee66707f927e5d40c55382344e162575b..60b586120727a118055bfb8cf437def2416fcb3a 100644 (file)
--- a/tools/include/nolibc/arch-i386.h
+++ b/tools/include/nolibc/arch-i386.h
@@ -178,6 +178,8 @@ struct sys_stat_struct {
        _eax;                                                   \
 })
 
+char **environ __attribute__((weak));
+
 /* startup code */
 /*
  * i386 System V ABI mandates:
@@ -191,6 +193,7 @@ void __attribute__((weak,noreturn,optimize("omit-frame-pointer"))) _start(void)
                "pop %eax\n"                // argc   (first arg, %eax)
                "mov %esp, %ebx\n"          // argv[] (second arg, %ebx)
                "lea 4(%ebx,%eax,4),%ecx\n" // then a NULL then envp (third arg, %ecx)
+               "mov %ecx, environ\n"       // save environ
                "xor %ebp, %ebp\n"          // zero the stack frame
                "and $-16, %esp\n"          // x86 ABI : esp must be 16-byte aligned before
                "sub $4, %esp\n"            // the call instruction (args are aligned)