* sysdeps/generic/setenv.c (__environ): Change conditional for #define from [!HAVE_GNU_LD] to [!_LIBC]. [_LIBC]: Include <libc-lock.h> and define a lock. (LOCK, UNLOCK): New macros, no-ops for [! _LIBC]. (setenv, unsetenv): Use them.