diff options
| author | Alexey Neyman <stilor@att.net> | 2016-09-19 18:50:08 -0700 |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2016-10-04 17:47:15 -0700 |
| commit | 8121be5b217d1b354db856f8c4ca1b94ce7cffd4 (patch) | |
| tree | 1e9a33c146483ffe26d07d316f5d77f230baf9af /config/libc | |
| parent | 03730997ae01710a55988d6129d937c21eb24608 (diff) | |
| download | crosstool-ng-8121be5b217d1b354db856f8c4ca1b94ce7cffd4.tar.gz crosstool-ng-8121be5b217d1b354db856f8c4ca1b94ce7cffd4.tar.bz2 crosstool-ng-8121be5b217d1b354db856f8c4ca1b94ce7cffd4.zip | |
Fix m68k with uClibc-ng >= 1.0.15.
1.0.15 only kept a single LINUXTHREADS option, and renamed it, making it
no longer option-compatible with uClibc.
The option for "1.0.14 or later" version of uClibc-ng is not currently
used; rename it to "1.0.15 or later" and use it to handle newer
uClibc-ng's linuxthreads.
m68k happens to be the only sample using linuxthreads.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'config/libc')
| -rw-r--r-- | config/libc/uClibc.in | 4 | ||||
| -rw-r--r-- | config/libc/uClibc.in.2 | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index 3a76a426..14564bab 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -78,7 +78,7 @@ choice config LIBC_UCLIBC_NG_V_1_0_17 bool prompt "1.0.17" - select LIBC_UCLIBC_NG_1_0_14_or_later + select LIBC_UCLIBC_NG_1_0_15_or_later config LIBC_UCLIBC_V_0_9_33_2 bool @@ -96,7 +96,7 @@ config LIBC_VERSION endif # ! LIBC_UCLIBC_CUSTOM -config LIBC_UCLIBC_NG_1_0_14_or_later +config LIBC_UCLIBC_NG_1_0_15_or_later bool select LIBC_UCLIBC_NG_1_0_0_or_later diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2 index 3a5fe345..dc024201 100644 --- a/config/libc/uClibc.in.2 +++ b/config/libc/uClibc.in.2 @@ -1,6 +1,6 @@ # uClibc second-part option -if THREADS_LT +if THREADS_LT && !LIBC_UCLIBC_NG_1_0_15_or_later choice bool @@ -30,10 +30,12 @@ endchoice endif # THREADS_LT +# uClibc-ng 1.0.15 did away with 2 implementations of linuxthreads config LIBC_UCLIBC_LNXTHRD string default "" if THREADS_NONE default "" if THREADS_NATIVE + default "" if LIBC_UCLIBC_NG_1_0_15_or_later default "old" if LIBC_UCLIBC_LNXTHRD_OLD default "new" if LIBC_UCLIBC_LNXTHRD_NEW |