diff options
| author |   Alexey Neyman <stilor@att.net> | 2019-04-05 21:09:14 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-04-05 21:09:14 (GMT) |
| commit | d0f484f2566cfda1faaef193ef7316bca5dc8fb7 (patch) | |
| tree | 34ba07e25a2b2dc718e800b94f7512b4fc4c088e | |
| parent | e593d1e68d3c3645a725f3b3100cce849541a80c (diff) | |
| parent | 4f360146eb582d7c994080a64e9e9e9e817bdbdb (diff) | |
Merge pull request #1169 from jcmvbkbc/xtensa-fixes
noMMU xtensa fixes
| -rw-r--r-- | scripts/build/kernel/linux.sh | 6 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 30 |
2 files changed, 19 insertions, 17 deletions
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index f098765..bfeadf0 100644 --- a/scripts/build/kernel/linux.sh +++ b/scripts/build/kernel/linux.sh @@ -9,9 +9,9 @@ CT_DoKernelTupleValues() # while others must have a -linux tuple. Other targets # should be added here when someone starts to care about them. case "${CT_ARCH}" in - arm*) CT_TARGET_KERNEL="linux" ;; - m68k) CT_TARGET_KERNEL="uclinux" ;; - *) CT_Abort "Unsupported no-mmu arch '${CT_ARCH}'" + arm*) CT_TARGET_KERNEL="linux" ;; + m68k|xtensa*) CT_TARGET_KERNEL="uclinux" ;; + *) CT_Abort "Unsupported no-mmu arch '${CT_ARCH}'" esac fi } diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index fbee4aa..2ae6e0c 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -153,20 +153,22 @@ uClibc_backend_once() CT_DoExecLog ALL make ${jflag} "${make_args[@]}" \ lib/crt1.o lib/crti.o lib/crtn.o - # From: http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=ad5668a7ac7e0436db92e55caaf3fdf782b6ba3b - # libm.so is needed for ppc, as libgcc is linked against libm.so - # No problem to create it for other archs. - CT_DoLog EXTRA "Building dummy shared libs" - CT_DoExecLog ALL "${CT_TARGET}-${CT_CC}" -nostdlib -nostartfiles \ - -shared ${multi_flags} -x c /dev/null -o libdummy.so - - CT_DoLog EXTRA "Installing start files" - CT_DoExecLog ALL install -m 0644 lib/crt1.o lib/crti.o lib/crtn.o \ - "${startfiles_dir}" - - CT_DoLog EXTRA "Installing dummy shared libs" - CT_DoExecLog ALL install -m 0755 libdummy.so "${startfiles_dir}/libc.so" - CT_DoExecLog ALL install -m 0755 libdummy.so "${startfiles_dir}/libm.so" + if [ "${CT_SHARED_LIBS}" = "y" ]; then + # From: http://git.openembedded.org/cgit.cgi/openembedded/commit/?id=ad5668a7ac7e0436db92e55caaf3fdf782b6ba3b + # libm.so is needed for ppc, as libgcc is linked against libm.so + # No problem to create it for other archs. + CT_DoLog EXTRA "Building dummy shared libs" + CT_DoExecLog ALL "${CT_TARGET}-${CT_CC}" -nostdlib -nostartfiles \ + -shared ${multi_flags} -x c /dev/null -o libdummy.so + + CT_DoLog EXTRA "Installing start files" + CT_DoExecLog ALL install -m 0644 lib/crt1.o lib/crti.o lib/crtn.o \ + "${startfiles_dir}" + + CT_DoLog EXTRA "Installing dummy shared libs" + CT_DoExecLog ALL install -m 0755 libdummy.so "${startfiles_dir}/libc.so" + CT_DoExecLog ALL install -m 0755 libdummy.so "${startfiles_dir}/libm.so" + fi # CT_SHARED_LIBS == y fi # CT_THREADS == nptl fi # libc_mode == startfiles |