diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-08-11 11:06:02 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-08-11 11:06:02 +0100 |
| commit | e93a38d535f2c29b55a5756d2de99425986b0bf3 (patch) | |
| tree | c0fa85c173d211181d0093e7dc031623e7b8a9a3 /eclass | |
| parent | fbbf0ee3d56a6fd27adf182c6907dc745623aeaa (diff) | |
gentoo auto-resync : 11:08:2024 - 11:06:01
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 39540 -> 39542 bytes | |||
| -rw-r--r-- | eclass/toolchain-funcs.eclass | 15 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 5 |
3 files changed, 16 insertions, 4 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex f89aea1edc6e..310ca38e64ed 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 9f0953c079e3..50eb310b4bf1 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -251,7 +251,7 @@ tc-detect-is-softfloat() { case ${CTARGET:-${CHOST}} in # Avoid autodetection for bare-metal targets. bug #666896 - *-newlib|*-elf|*-eabi) + *-newlib|*-elf|*-eabi|arm64-apple-darwin*) return 1 ;; # arm-unknown-linux-gnueabi is ambiguous. We used to treat it as @@ -295,6 +295,8 @@ tc-tuple-is-softfloat() { # bare-metal targets have their defaults. bug #666896 *-newlib|*-elf|*-eabi) echo "no" ;; + arm64-apple-darwin*) + echo "no" ;; arm*) echo "yes" ;; *) @@ -626,7 +628,14 @@ tc-has-tls() { -*) die "Usage: tc-has-tls [-c|-l] [toolchain prefix]";; esac - : "${flags:=-fPIC -shared -Wl,-z,defs}" + case "${CHOST}" in + *-darwin*) + # bug #612370 + : ${flags:=-dynamiclib} + ;; + *) + : ${flags:=-fPIC -shared -Wl,-z,defs} + esac [[ $1 == -* ]] && shift $(tc-getCC "$@") ${flags} "${base}.c" -o "${base}" >&/dev/null local ret=$? @@ -645,6 +654,7 @@ tc-ninja_magic_to_arch() { [[ -z ${host} ]] && host=${CTARGET:-${CHOST}} case ${host} in + arm64*) echo arm64;; aarch64*) echo arm64;; alpha*) echo alpha;; arc*) echo arc;; @@ -1032,6 +1042,7 @@ gen_usr_ldscript() { [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/ tc-is-static-only && return + use prefix && return # We only care about stuffing / for the native ABI, bug #479448 if [[ $(type -t multilib_is_native_abi) == "function" ]] ; then diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 2acade8e4ca8..bfb087146864 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1966,7 +1966,9 @@ toolchain_src_test() { # TODO: Does this handle s390 (-m31) correctly? # TODO: What if there are multiple ABIs like x32 too? - is_multilib && GCC_TESTS_RUNTESTFLAGS+=" --target_board=unix{,-m32}" + # XXX: Disabled until validate_failures.py can handle 'variants' + # XXX: https://gcc.gnu.org/PR116260 + #is_multilib && GCC_TESTS_RUNTESTFLAGS+=" --target_board=unix{,-m32}" # nonfatal here as we die if the comparison below fails. Also, note that # the exit code of targets other than 'check' may be unreliable. @@ -1996,7 +1998,6 @@ toolchain_src_test() { ) # Produce an updated failure manifest. - # XXX: Manifests aren't ideal w/ multilib because of https://gcc.gnu.org/PR116260 einfo "Generating a new failure manifest ${T}/${CHOST}.xfail" rm -f "${T}"/${CHOST}.xfail edo "${T}"/validate_failures.py \ |