diff options
| -rw-r--r-- | config/libc/uClibc.in | 1 | ||||
| -rw-r--r-- | samples/arm-cortexa5-linux-uclibcgnueabihf/reported.by | 2 | ||||
| -rw-r--r-- | samples/arm-unknown-linux-uclibcgnueabi/reported.by | 2 | ||||
| -rw-r--r-- | samples/riscv64-unknown-linux-gnu/crosstool.config | 1 | ||||
| -rw-r--r-- | scripts/build/kernel/linux.sh | 6 | ||||
| -rw-r--r-- | scripts/build/libc/uClibc.sh | 30 |
6 files changed, 23 insertions, 19 deletions
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in index 2b11e0c9..21da64fe 100644 --- a/config/libc/uClibc.in +++ b/config/libc/uClibc.in @@ -107,6 +107,7 @@ config LIBC_UCLIBC_DEBUG_LEVEL default 0 if LIBC_UCLIBC_DEBUG_LEVEL_0 default 1 if LIBC_UCLIBC_DEBUG_LEVEL_1 default 2 if LIBC_UCLIBC_DEBUG_LEVEL_2 + default 3 if LIBC_UCLIBC_DEBUG_LEVEL_3 config LIBC_UCLIBC_CONFIG_FILE string diff --git a/samples/arm-cortexa5-linux-uclibcgnueabihf/reported.by b/samples/arm-cortexa5-linux-uclibcgnueabihf/reported.by index 57a07cb6..7fc2c885 100644 --- a/samples/arm-cortexa5-linux-uclibcgnueabihf/reported.by +++ b/samples/arm-cortexa5-linux-uclibcgnueabihf/reported.by @@ -1,3 +1,3 @@ reporter_name="Alexandre Belloni" -reporter_url="https://plus.google.com/+AlexandreBelloni" +reporter_url="https://bootlin.com" reporter_comment="Cortex-A5 using the hard-float GNU EABI (VFPV4-D16 without NEON)." diff --git a/samples/arm-unknown-linux-uclibcgnueabi/reported.by b/samples/arm-unknown-linux-uclibcgnueabi/reported.by index 01ce94f9..99087293 100644 --- a/samples/arm-unknown-linux-uclibcgnueabi/reported.by +++ b/samples/arm-unknown-linux-uclibcgnueabi/reported.by @@ -1,3 +1,3 @@ reporter_name="Thomas Petazzoni" -reporter_url="https://plus.google.com/+ThomasPetazzoni" +reporter_url="https://bootlin.com" reporter_comment="" diff --git a/samples/riscv64-unknown-linux-gnu/crosstool.config b/samples/riscv64-unknown-linux-gnu/crosstool.config index a03f6e88..c12993c2 100644 --- a/samples/riscv64-unknown-linux-gnu/crosstool.config +++ b/samples/riscv64-unknown-linux-gnu/crosstool.config @@ -5,6 +5,7 @@ CT_ARCH_RISCV=y CT_ARCH_USE_MMU=y CT_ARCH_64=y CT_ARCH_ARCH="rv64gc" +CT_CC_LANG_CXX=y CT_KERNEL_LINUX=y CT_DEBUG_GDB=y # CT_GDB_CROSS_PYTHON is not set diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh index f0987653..bfeadf07 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 76003163..5c04b328 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 |