Restore 1.0.17 and make 1.0.18 experimental.

1.0.18 changed the dependencies for the static libraries, notably
in libc/Makefile.in. This resulted in packing a lot of unrelated
stuff into libc.a, including (sic!) a nested .a library and stuff
from other libraries such as libdl. This results in a failure to
statically link with thus created libc.a:

.../libc.a(libdl.os):(.literal+0x74): undefined reference to `_dl_tlsdesc_return'

This was breaking xtensa-*-uclibc sample.

Signed-off-by: Alexey Neyman <stilor@att.net>
This commit is contained in:
Alexey Neyman 2016-10-05 15:23:40 -07:00
parent 1cb9253dd7
commit 1d43ed3151

View File

@ -60,6 +60,8 @@ config LIBC_UCLIBC_CUSTOM_VERSION
prompt "Custom uClibc Version"
help
Enter the version number for your custom uClibc.
Version 1.0.18 is only enabled in EXPERIMENTAL builds due to issues
with static libraries.
config LIBC_VERSION
string
@ -75,9 +77,16 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
# List 1.0.17 first to make it default. 1.0.18 has issues with static libs.
config LIBC_UCLIBC_NG_V_1_0_17
bool
prompt "1.0.17"
select LIBC_UCLIBC_NG_1_0_15_or_later
config LIBC_UCLIBC_NG_V_1_0_18
bool
prompt "1.0.18"
depends on EXPERIMENTAL
select LIBC_UCLIBC_NG_1_0_15_or_later
config LIBC_UCLIBC_V_0_9_33_2
@ -92,6 +101,7 @@ config LIBC_VERSION
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
default "1.0.18" if LIBC_UCLIBC_NG_V_1_0_18
default "1.0.17" if LIBC_UCLIBC_NG_V_1_0_17
default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2
endif # ! LIBC_UCLIBC_CUSTOM