diff options
| author | Stafford Horne <shorne@gmail.com> | 2017-02-06 23:38:40 +0900 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2017-02-13 09:16:51 +0100 |
| commit | 135c0c83680d5d39bfe326e497ace47c0bff1650 (patch) | |
| tree | 9311f0c7688d53a67d85c4fb20a93a9c4d80fd7b | |
| parent | ff7b7b8945b8ca356710abe67a867ed6fb81f74a (diff) | |
| download | cygnal-135c0c83680d5d39bfe326e497ace47c0bff1650.tar.gz cygnal-135c0c83680d5d39bfe326e497ace47c0bff1650.tar.bz2 cygnal-135c0c83680d5d39bfe326e497ace47c0bff1650.zip | |
libgloss: Remove duplicate definition of environ
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.
| -rw-r--r-- | libgloss/or1k/syscalls.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libgloss/or1k/syscalls.c b/libgloss/or1k/syscalls.c index 3e2ad22af..92bff497b 100644 --- a/libgloss/or1k/syscalls.c +++ b/libgloss/or1k/syscalls.c @@ -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) |