proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-08 07:09:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: detect cpuid.h and also look for host architecture

Browse Source 
Fixes cross compilation for arm with clang which provides cpuid.h
but helpfully has this error:
```
 #if !(__x86_64__ || __i386__)
 #error this header is for x86 only
 #endif
```

Fixes: #2131
This commit is contained in:
Mario Limonciello 2020-05-26 14:49:51 -05:00 committed by Mario Limonciello
parent 1a52051471
commit d39bcee29d
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meson.build
View File

@ -243,6 +243,8 @@ if build_standalone and get_option('plugin_altos')
libelf = dependency('libelf') libelf = dependency('libelf')
endif endif
host_cpu = host_machine.cpu_family()
if cc.has_header('sys/utsname.h') if cc.has_header('sys/utsname.h')
conf.set('HAVE_UTSNAME_H', '1') conf.set('HAVE_UTSNAME_H', '1')
endif endif
@ -258,7 +260,7 @@ endif
if cc.has_header('fnmatch.h') if cc.has_header('fnmatch.h')
conf.set('HAVE_FNMATCH_H', '1') conf.set('HAVE_FNMATCH_H', '1')
endif endif
if cc.has_header('cpuid.h') if cc.has_header('cpuid.h') and (host_cpu == 'x86' or host_cpu == 'x86_64')
conf.set('HAVE_CPUID_H', '1') conf.set('HAVE_CPUID_H', '1')
endif endif
if cc.has_function('getuid') if cc.has_function('getuid')
@ -305,17 +307,16 @@ if build_standalone and get_option('plugin_uefi')
conf.set_quoted ('FWUPD_EFI_DBXDIR', efi_dbxdir) conf.set_quoted ('FWUPD_EFI_DBXDIR', efi_dbxdir)
endif endif
efi_arch = host_machine.cpu_family() if host_cpu == 'x86'
if efi_arch == 'x86'
EFI_MACHINE_TYPE_NAME = 'ia32' EFI_MACHINE_TYPE_NAME = 'ia32'
gnu_efi_arch = 'ia32' gnu_efi_arch = 'ia32'
elif efi_arch == 'x86_64' elif host_cpu == 'x86_64'
EFI_MACHINE_TYPE_NAME = 'x64' EFI_MACHINE_TYPE_NAME = 'x64'
gnu_efi_arch = 'x86_64' gnu_efi_arch = 'x86_64'
elif efi_arch == 'arm' elif host_cpu == 'arm'
EFI_MACHINE_TYPE_NAME = 'arm' EFI_MACHINE_TYPE_NAME = 'arm'
gnu_efi_arch = 'arm' gnu_efi_arch = 'arm'
elif efi_arch == 'aarch64' elif host_cpu == 'aarch64'
EFI_MACHINE_TYPE_NAME = 'aa64' EFI_MACHINE_TYPE_NAME = 'aa64'
gnu_efi_arch = 'aarch64' gnu_efi_arch = 'aarch64'
else else

6
plugins/uefi/efi/meson.build
View File

@ -90,13 +90,13 @@ compile_args = ['-Og',
if get_option('werror') if get_option('werror')
compile_args += '-Werror' compile_args += '-Werror'
endif endif
if efi_arch == 'x86_64' if host_cpu == 'x86_64'
compile_args += ['-mno-red-zone', compile_args += ['-mno-red-zone',
'-mno-sse', '-mno-sse',
'-mno-mmx', '-mno-mmx',
'-DEFI_FUNCTION_WRAPPER', '-DEFI_FUNCTION_WRAPPER',
'-DGNU_EFI_USE_MS_ABI'] '-DGNU_EFI_USE_MS_ABI']
elif efi_arch == 'ia32' elif host_cpu == 'x86'
compile_args += ['-mno-sse', compile_args += ['-mno-sse',
'-mno-mmx', '-mno-mmx',
'-mno-red-zone', '-mno-red-zone',
@ -113,7 +113,7 @@ efi_ldflags = ['-T',
'-L', efi_ldsdir, '-L', efi_ldsdir,
'-L', efi_libdir, '-L', efi_libdir,
join_paths(efi_ldsdir, arch_crt)] join_paths(efi_ldsdir, arch_crt)]
if efi_arch == 'aarch64' or efi_arch == 'arm' if host_cpu == 'aarch64' or host_cpu == 'arm'
# Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' # Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary'
# instead, and add required symbols manually. # instead, and add required symbols manually.
efi_ldflags += ['--defsym=EFI_SUBSYSTEM=0xa'] efi_ldflags += ['--defsym=EFI_SUBSYSTEM=0xa']