diff options
| author |   Chris Packham <judge.packham@gmail.com> | 2020-09-20 09:17:28 (GMT) |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2020-09-20 09:17:28 (GMT) |
| commit | ea386017b60b38b17b13044544eeb268c1c3ee28 (patch) | |
| tree | 4515d4ef7bb8ce41acbcb2ba971230f53e7825cd /scripts | |
| parent | 89ec0e109e0dc2ef43abd215768977179aa8661a (diff) | |
| parent | e802686d86bac3899347602c180e3dbe5e90ced8 (diff) | |
Merge branch 'picolibc-multiarch' of git://github.com/keith-packard/crosstool-ng into master
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/arch/powerpc.sh | 4 | ||||
| -rw-r--r-- | scripts/build/libc/picolibc.sh | 10 | ||||
| -rw-r--r-- | scripts/functions | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/scripts/build/arch/powerpc.sh b/scripts/build/arch/powerpc.sh index 36a727a..85c64d1 100644 --- a/scripts/build/arch/powerpc.sh +++ b/scripts/build/arch/powerpc.sh @@ -7,12 +7,12 @@ CT_DoArchTupleValues () { # Only override values when ABI is not the default case "${CT_ARCH_powerpc_ABI}" in eabi) - # EABI is only for bare-metal, so libc ∈ [none,newlib] + # EABI is only for bare-metal, so libc ∈ [none,newlib,picolibc] CT_TARGET_SYS="eabi" ;; spe) case "${CT_LIBC}" in - none|newlib) CT_TARGET_SYS="elfspe";; + none|newlib|picolibc) CT_TARGET_SYS="elfspe";; *glibc) CT_TARGET_SYS="gnuspe";; uClibc) CT_TARGET_SYS="uclibcgnuspe";; esac diff --git a/scripts/build/libc/picolibc.sh b/scripts/build/libc/picolibc.sh index 3c22def..152125c 100644 --- a/scripts/build/libc/picolibc.sh +++ b/scripts/build/libc/picolibc.sh @@ -22,7 +22,7 @@ picolibc_main() CT_mkdir_pushd "${CT_BUILD_DIR}/build-libc" - CT_DoLog EXTRA "Configuring C library" + CT_DoLog EXTRA "Configuring Picolibc library" # Multilib is the default, so if it is not enabled, disable it. if [ "${CT_MULTILIB}" != "y" ]; then @@ -81,10 +81,10 @@ as = '${CT_TARGET}-as' strip = '${CT_TARGET}-strip' [host_machine] -system = 'none' -cpu_family = 'arm' -cpu = 'arm' -endian = 'little' +system = '${CT_TARGET_VENDOR}' +cpu_family = '${CT_TARGET_ARCH}' +cpu = '${CT_TARGET_ARCH}' +endian = '${CT_ARCH_ENDIAN}' [properties] c_args = [ ${meson_cflags} '-nostdlib', '-fno-common', '-ftls-model=local-exec' ] diff --git a/scripts/functions b/scripts/functions index 4b3aab9..4ea3c5a 100644 --- a/scripts/functions +++ b/scripts/functions @@ -1135,7 +1135,7 @@ CT_DoBuildTargetTuple() uClibc) CT_TARGET_SYS=uclibc;; musl) CT_TARGET_SYS=musl;; bionic) CT_TARGET_SYS=android;; - none|newlib) CT_TARGET_SYS=elf;; + none|newlib|picolibc) CT_TARGET_SYS=elf;; *) # Keep empty for the libraries like mingw or avr-libc CT_TARGET_SYS= |