shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-11 21:57:53 +03:00
Code

sd-boot: Fix efi_arch checks

Browse Source 
efi_arch is set to whatever meson returns from host_machine.cpu_family() and
gnu_efi_arch is then set accordingly.

On x86, efi_arch == x86 and gnu_efi_arch == ia32. Surprisingly, compilation
worked (without disabling some instruction sets) and nobody ever complained
about systemd-bootia32.efi not working.
This commit is contained in:
Jan Janssen 2021-11-02 10:47:41 +01:00
parent 1840dfc327
commit d1da890004
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ stub_sources = '''
cpio.c
'''.split()
if ['ia32', 'x86_64'].contains(efi_arch)
if efi_arch in ['x86', 'x86_64']
stub_sources += 'linux_x86.c'
else
stub_sources += 'linux.c'
@ -229,7 +229,7 @@ if have_gnu_efi
compile_args += ['-mno-red-zone',
'-mno-sse',
'-mno-mmx']
elif efi_arch == 'ia32'
elif efi_arch == 'x86'
compile_args += ['-mno-sse',
'-mno-mmx']
elif efi_arch == 'arm'