JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libgloss: Remove duplicate definition of environ

Browse Source 
Environ is defined in libgloss and libc:
 - libgloss/or1k/syscalls.c
 - libc/stdlib/environ.c

When linking we sometimes get errors:
or1k-elf-g++ test.o -mnewlib -mboard=or1ksim -lm -o  test
/opt/shorne/software/or1k/lib/gcc/or1k-elf/5.3.0/../../../../or1k-elf/lib/libor1k.a(syscalls.o):(.data+0x0):
multiple definition of `environ'
/opt/shorne/software/or1k/lib/gcc/or1k-elf/5.3.0/../../../../or1k-elf/lib/libc.a(lib_a-environ.o):(.data+0x0):
first defined here
collect2: error: ld returned 1 exit status

This doesnt happen after the fix. Basic things build fine too.
This commit is contained in:
Stafford Horne 2017-02-06 23:38:40 +09:00 committed by Corinna Vinschen
parent ff7b7b8945
commit 135c0c8368
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libgloss/or1k/syscalls.c
View File

@ -56,9 +56,6 @@ _close_r(struct _reent *reent, int fildes)
return -1;
}
char *__env[1] = { 0 };
char **environ = __env;
int
_execve_r(struct _reent *reent, const char *name, char * const *argv,
char * const *env)