boot: Fix armhf build failure

Fixes: #21842

meson.build

@@ -468,7 +468,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>'))
 conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>'))
 conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>'))
 conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>'))
-conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include <sys/timex.h>'))
+conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>'))
 
 decl_headers = '''
 #include <uchar.h>

src/boot/efi/meson.build

@@ -294,6 +294,20 @@ else
         efi_format = ['--target=efi-app-@0@'.format(efi_arch[1])]
 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
         # fedora has a patched gnu-efi that adds support for ELF constructors.
         # If ld is called by gcc something about these symbols breaks, resulting

src/shared/dissect-image.c

@@ -627,12 +627,8 @@ int dissect_image(
                 DissectedImage **ret) {
 
 #if HAVE_BLKID
-#ifdef GPT_ROOT_NATIVE
         sd_id128_t root_uuid = SD_ID128_NULL, root_verity_uuid = SD_ID128_NULL;
-#endif
-#ifdef GPT_USR_NATIVE
         sd_id128_t usr_uuid = SD_ID128_NULL, usr_verity_uuid = SD_ID128_NULL;
-#endif
         bool is_gpt, is_mbr, multiple_generic = false,
                 generic_rw = false,  /* initialize to appease gcc */
                 generic_growfs = false;
@@ -682,19 +678,13 @@ int dissect_image(
 
                 /* If the verity data declares it's for the /usr partition, then search for that, in all
                  * other cases assume it's for the root partition. */
-#ifdef GPT_USR_NATIVE
                 if (verity->designator == PARTITION_USR) {
                         usr_uuid = fsuuid;
                         usr_verity_uuid = vuuid;
                 } else {
-#endif
-#ifdef GPT_ROOT_NATIVE
                         root_uuid = fsuuid;
                         root_verity_uuid = vuuid;
-#endif
-#ifdef GPT_USR_NATIVE
                 }
-#endif
         }
 
         if (fstat(fd, &st) < 0)