shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-08-30 05:50:12 +03:00
Code Activity

boot: Fix armhf build failure

Browse Source 
Fixes: #21842
This commit is contained in:
Jan Janssen
2021-12-21 13:44:47 +01:00
committed by Luca Boccassi
parent 3112d756a3
commit e67e6691e5
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/boot/efi/meson.build
View File

@ -294,6 +294,20 @@ else
efi_format = ['--target=efi-app-@0@'.format(efi_arch[1])] efi_format = ['--target=efi-app-@0@'.format(efi_arch[1])]
endif endif
if efi_arch[1] == 'arm'
# On arm, the compiler (correctly) gives us the following warning:
# libgcc.a(_popcountsi2.o) uses 4-byte wchar_t yet the output is to
# use 2-byte wchar_t; use of wchar_t values across objects may fail
#
# libgcc does not have any occurences of wchar_t in its sources or the
# documentation, so it's safe to assume that we can ignore this warning.
#
# So far, this only happens with arm due to popcount even though x86 and
# x86_64 also have to rely on libgcc's popcount. Therefore, we only disable
# this for arm to make sure this doesn't mask other issues in the future.
efi_ldflags += ['-Wl,--no-warn-mismatch']
endif
if run_command('grep', '-q', '__CTOR_LIST__', efi_lds).returncode() == 0 if run_command('grep', '-q', '__CTOR_LIST__', efi_lds).returncode() == 0
# fedora has a patched gnu-efi that adds support for ELF constructors. # fedora has a patched gnu-efi that adds support for ELF constructors.
# If ld is called by gcc something about these symbols breaks, resulting # If ld is called by gcc something about these symbols breaks, resulting