sys-libs/glibc: Sync with Gentoo

It's from Gentoo commit 231dfc565596f427a5966a27c6fe85c5bdf105ea.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2025-09-15 07:11:24 +00:00 committed by Krzesimir Nowak
parent deb5d1403d
commit ef27dad146
16 changed files with 34 additions and 34 deletions

View File

@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors # Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -250,7 +250,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404"
fi fi
@ -616,7 +616,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors # Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
@ -293,7 +293,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -652,7 +652,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -310,7 +310,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -669,7 +669,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -322,7 +322,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -738,7 +738,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -317,7 +317,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -747,7 +747,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -329,7 +329,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -766,7 +766,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -331,7 +331,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -797,7 +797,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -346,7 +346,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -806,7 +806,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -347,7 +347,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -817,7 +817,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -363,7 +363,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -838,7 +838,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -343,7 +343,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -818,7 +818,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -350,7 +350,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -821,7 +821,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -350,7 +350,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -821,7 +821,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -351,7 +351,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -817,7 +817,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -351,7 +351,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -817,7 +817,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"

View File

@ -351,7 +351,7 @@ setup_target_flags() {
[[ ${t} == "x86_64" ]] && t="x86-64" [[ ${t} == "x86_64" ]] && t="x86-64"
filter-flags '-march=*' filter-flags '-march=*'
# ugly, ugly, ugly. ugly. # ugly, ugly, ugly. ugly.
CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}") CFLAGS_x86=$(CFLAGS=${CFLAGS_x86}; filter-flags '-march=*'; echo "${CFLAGS}")
export CFLAGS_x86="${CFLAGS_x86} -march=${t}" export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})" einfo "Auto adding -march=${t} to CFLAGS_x86 #185404 (ABI=${ABI})"
fi fi
@ -817,7 +817,7 @@ sanity_prechecks() {
# ABI-specific checks follow here. Hey, we have a lot more specific conditions that # ABI-specific checks follow here. Hey, we have a lot more specific conditions that
# we test for... # we test for...
if ! is_crosscompile ; then if ! is_crosscompile && ! tc-is-cross-compiler ; then
if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then if use amd64 && use multilib && [[ ${MERGE_TYPE} != "binary" ]] ; then
ebegin "Checking if the system can execute 32-bit binaries" ebegin "Checking if the system can execute 32-bit binaries"
echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c" echo 'int main(){return 0;}' > "${T}/check-ia32-emulation.c"