Fix compiler warnings for 32-bit ARM
Subsystems (5)
v3 cover Fix compiler warnings for 32-bit ARM
These were noticed when building sandbox on a Raspberry Pi 400, which uses 32-bit linux.
To make this work, I enabled CONFIG_HOST_32BIT in 'make menuconfig'. It would be nice if that were automatic, since we have the logic already in arch/sandbox/config.mk
So this series adds that.
It also fixes the unicode warnings of the form:
/usr/bin/ld: warning: arch/sandbox/cpu/start.o uses 2-byte wchar_t yet the output is to use 4-byte wchar_t; use of wchar_t values across objects may fail
as suggested by Heinrich.
Changes in v3:
- Mention the link to the new upstream patch
- Change some things EFI things missed (or new since) last time
- Use 'bitness' instead of 'bit'
- Add a new patch to change non-EFI occurences
Changes in v2:
- Add new patch to reduce checkpatch unicode-string spam
- Drop patches previously applied
- Put all the packages in gcc.rst
Joe Perches (1):
checkpatch: Support wide strings
Simon Glass (4):
efi: Use 16-bit unicode strings
sandbox: Detect the host bit size automatically
treewide: Use 16-bit unicode strings
RFC: treewide: Drop -fshort-char
Makefile | 13 ++- arch/arm/config.mk | 2 +- arch/sandbox/Kconfig | 13 ++- arch/x86/config.mk | 2 +- arch/x86/cpu/Makefile | 2 +- arch/x86/lib/Makefile | 6 +- cmd/efidebug.c | 12 +- include/efi_loader.h | 2 +- include/efi_selftest.h | 4 +- lib/efi/Makefile | 4 +- lib/efi_loader/efi_bootmgr.c | 12 +- lib/efi_loader/efi_boottime.c | 2 +- lib/efi_loader/efi_capsule.c | 20 ++-- lib/efi_loader/efi_helper.c | 2 +- lib/efi_loader/efi_image_loader.c | 8 +- lib/efi_loader/efi_setup.c | 20 ++-- lib/efi_loader/efi_signature.c | 4 +- lib/efi_loader/efi_string.c | 2 +- lib/efi_loader/efi_var_common.c | 14 +-- lib/efi_loader/efi_variable.c | 6 +- lib/efi_loader/efi_variable_tee.c | 2 +- lib/efi_loader/helloworld.c | 40 +++---- lib/efi_selftest/dtbdump.c | 82 +++++++------- lib/efi_selftest/efi_selftest.c | 2 +- lib/efi_selftest/efi_selftest_block_device.c | 6 +- lib/efi_selftest/efi_selftest_devicepath.c | 2 +- lib/efi_selftest/efi_selftest_exception.c | 2 +- lib/efi_selftest/efi_selftest_fdt.c | 6 +- lib/efi_selftest/efi_selftest_hii.c | 8 +- lib/efi_selftest/efi_selftest_load_file.c | 4 +- lib/efi_selftest/efi_selftest_loadimage.c | 4 +- .../efi_selftest_miniapp_exception.c | 4 +- lib/efi_selftest/efi_selftest_miniapp_exit.c | 8 +- .../efi_selftest_miniapp_return.c | 2 +- lib/efi_selftest/efi_selftest_reset.c | 2 +- lib/efi_selftest/efi_selftest_textoutput.c | 12 +- .../efi_selftest_unicode_collation.c | 38 +++---- lib/efi_selftest/efi_selftest_util.c | 106 +++++++++--------- lib/efi_selftest/efi_selftest_variables.c | 22 ++-- .../efi_selftest_variables_runtime.c | 4 +- lib/efi_selftest/initrddump.c | 60 +++++----- lib/lzma/Types.h | 4 +- scripts/checkpatch.pl | 7 +- scripts/kconfig/Makefile | 14 ++- test/print_ut.c | 2 +- test/unicode_ut.c | 22 ++-- 46 files changed, 320 insertions(+), 295 deletions(-)
Signature · 1 line
2.32.0.554.ge1b32706d8-goog
PATCH v3 1/5 checkpatch: Support wide strings
From: Joe Perches <[email protected]>
Allow prefixing typical strings with L for wide strings and u for unicode strings.
---
This was found on LKML:
https://lore.kernel.org/lkml/[email protected]/T/
It likely wasn't applied because it did not show up in patchwork correctly, due to the patch being inline:
https://lore.kernel.org/patchwork/patch/842121/
In any case, it needed rebasing and updating to support 'u'.
I sent this upstream:
https://lore.kernel.org/patchwork/patch/1470668/
Changes in v3:
- Mention the link to the new upstream patch
Changes in v2:
- Add new patch to reduce checkpatch unicode-string spam
scripts/checkpatch.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
scripts/checkpatch.pl +4 -3
@@ -411,7 +411,7 @@ our $Binary = qr{(?i)0b[01]+$Int_type?}; our $Hex = qr{(?i)0x[0-9a-f]+$Int_type?}; our $Int = qr{[0-9]+$Int_type?}; our $Octal = qr{0[0-7]+$Int_type?}; -our $String = qr{"[X\t]*"}; +our $String = qr{(?:\b[Lu])?"[X\t]*"}; our $Float_hex = qr{(?i)0x[0-9a-f]+p-?[0-9]+[fl]?}; our $Float_dec = qr{(?i)(?:[0-9]+\.[0-9]*|[0-9]*\.[0-9]+)(?:e-?[0-9]+)?[fl]?}; our $Float_int = qr{(?i)[0-9]+e-?[0-9]+[fl]?};
@@ -5673,7 +5673,8 @@ sub process { } # concatenated string without spaces between elements - if ($line =~ /$String[A-Za-z0-9_]/ || $line =~ /[A-Za-z0-9_]$String/) { + if ($line =~ /$String[A-Z_]/ || + ($line =~ /([A-Za-z0-9_]+)$String/ && $1 !~ /^[Lu]$/)) { if (CHK("CONCATENATED_STRING", "Concatenated strings should use spaces between elements\n" . $herecurr) && $fix) {
@@ -5686,7 +5687,7 @@ sub process { } # uncoalesced string fragments - if ($line =~ /$String\s*"/) { + if ($line =~ /$String\s*[Lu]?"/) { if (WARN("STRING_FRAGMENTS", "Consecutive strings are generally better as a single string\n" . $herecurr) && $fix) {
Signature · 1 line
2.32.0.554.ge1b32706d8-goog
PATCH v3 2/5 efi: Use 16-bit unicode strings
In reply to Simon GlassAt present we use wide characters for unicode but this is not necessary. Change the code to use the 'u' literal instead. This helps to fix build warnings for sandbox on rpi.
---
Changes in v3:
- Change some things EFI things missed (or new since) last time
cmd/efidebug.c | 12 +- include/efi_loader.h | 2 +- include/efi_selftest.h | 4 +- lib/efi_loader/efi_bootmgr.c | 12 +- lib/efi_loader/efi_boottime.c | 2 +- lib/efi_loader/efi_capsule.c | 20 ++-- lib/efi_loader/efi_helper.c | 2 +- lib/efi_loader/efi_image_loader.c | 8 +- lib/efi_loader/efi_setup.c | 20 ++-- lib/efi_loader/efi_signature.c | 4 +- lib/efi_loader/efi_string.c | 2 +- lib/efi_loader/efi_var_common.c | 14 +-- lib/efi_loader/efi_variable.c | 6 +- lib/efi_loader/efi_variable_tee.c | 2 +- lib/efi_loader/helloworld.c | 40 +++---- lib/efi_selftest/dtbdump.c | 82 +++++++------- lib/efi_selftest/efi_selftest.c | 2 +- lib/efi_selftest/efi_selftest_block_device.c | 6 +- lib/efi_selftest/efi_selftest_devicepath.c | 2 +- lib/efi_selftest/efi_selftest_exception.c | 2 +- lib/efi_selftest/efi_selftest_fdt.c | 6 +- lib/efi_selftest/efi_selftest_hii.c | 8 +- lib/efi_selftest/efi_selftest_load_file.c | 4 +- lib/efi_selftest/efi_selftest_loadimage.c | 4 +- .../efi_selftest_miniapp_exception.c | 4 +- lib/efi_selftest/efi_selftest_miniapp_exit.c | 8 +- .../efi_selftest_miniapp_return.c | 2 +- lib/efi_selftest/efi_selftest_reset.c | 2 +- lib/efi_selftest/efi_selftest_textoutput.c | 12 +- .../efi_selftest_unicode_collation.c | 38 +++---- lib/efi_selftest/efi_selftest_util.c | 106 +++++++++--------- lib/efi_selftest/efi_selftest_variables.c | 22 ++-- .../efi_selftest_variables_runtime.c | 4 +- lib/efi_selftest/initrddump.c | 60 +++++----- 34 files changed, 262 insertions(+), 262 deletions(-)
cmd/efidebug.c +6 -6
@@ -240,7 +240,7 @@ static int do_efi_capsule_res(struct cmd_tbl *cmdtp, int flag, guid = efi_guid_capsule_report;if (argc ==1 ) { size =sizeof (var_name16); - ret =efi_get_variable_int (L"CapsuleLast" , &guid,NULL , + ret =efi_get_variable_int (u"CapsuleLast" , &guid,NULL , &size, var_name16,NULL );if (ret !=EFI_SUCCESS ) {
@@ -1279,7 +1279,7 @@ static int do_efi_boot_dump(struct cmd_tbl *cmdtp, int flag,return CMD_RET_FAILURE ; } -if (memcmp (var_name16,L"Boot" ,8 )) +if (memcmp (var_name16,u"Boot" ,8 ))continue ;for (id =0 , i =0 ; i <4 ; i++) {
@@ -1315,7 +1315,7 @@ static int show_efi_boot_order(void)efi_status_t ret; size =0 ; - ret =EFI_CALL (efi_get_variable (L"BootOrder" , &efi_global_variable_guid, + ret =EFI_CALL (efi_get_variable (u"BootOrder" , &efi_global_variable_guid,NULL , &size,NULL ));if (ret !=EFI_BUFFER_TOO_SMALL ) {if (ret ==EFI_NOT_FOUND ) {
@@ -1330,7 +1330,7 @@ static int show_efi_boot_order(void)printf ("ERROR: Out of memory\n" );return CMD_RET_FAILURE ; } - ret =EFI_CALL (efi_get_variable (L"BootOrder" , &efi_global_variable_guid, + ret =EFI_CALL (efi_get_variable (u"BootOrder" , &efi_global_variable_guid,NULL , &size, bootorder));if (ret !=EFI_SUCCESS ) { ret =CMD_RET_FAILURE ;
@@ -1419,7 +1419,7 @@ static int do_efi_boot_next(struct cmd_tbl *cmdtp, int flag, guid = efi_global_variable_guid; size =sizeof (u16); - ret = efi_set_variable_int(L"BootNext", &guid, + ret = efi_set_variable_int(u"BootNext", &guid, EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@@ -1480,7 +1480,7 @@ static int do_efi_boot_order(struct cmd_tbl *cmdtp, int flag, } guid = efi_global_variable_guid; - ret = efi_set_variable_int(L"BootOrder", &guid, + ret = efi_set_variable_int(u"BootOrder", &guid, EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
include/efi_loader.h +1 -1
@@ -956,7 +956,7 @@ efi_status_t efi_capsule_authenticate(const void *capsule,efi_uintn_t capsule_size, void **image, efi_uintn_t *image_size); -#define EFI_CAPSULE_DIR L"\\EFI\\UpdateCapsule\\" +#define EFI_CAPSULE_DIR u"\\EFI\\UpdateCapsule\\"/** * Install the ESRT system table.
include/efi_selftest.h +2 -2
@@ -16,7 +16,7 @@#define EFI_ST_SUCCESS 0#define EFI_ST_FAILURE 1 -#define EFI_ST_SUCCESS_STR L"SUCCESS" +#define EFI_ST_SUCCESS_STR u"SUCCESS"/** * efi_st_printf() - print a message
@@ -111,7 +111,7 @@ u16 *efi_st_translate_char(u16 code);* efi_st_translate_code() - translate a scan code to a human readable string * * This function translates the scan code returned by the simple text input -* protocol to a human readable string, e.g. 0x04 is translated to L"Left". +* protocol to a human readable string, e.g. 0x04 is translated to u"Left". * * @code: scan code * Return: Unicode string
lib/efi_loader/efi_bootmgr.c +6 -6
@@ -46,8 +46,8 @@ static efi_status_t try_load_entry(u16 n, efi_handle_t *handle, void **load_options) {struct efi_load_option lo; -u16 varname[] =L"Boot0000" ; -u16 hexmap[] =L"0123456789ABCDEF" ; +u16 varname[] =u"Boot0000" ; +u16 hexmap[] =u"0123456789ABCDEF" ;void *load_option;efi_uintn_t size;efi_status_t ret;
@@ -83,7 +83,7 @@ static efi_status_t try_load_entry(u16 n, efi_handle_t *handle, attributes =EFI_VARIABLE_BOOTSERVICE_ACCESS |EFI_VARIABLE_RUNTIME_ACCESS ; - ret =efi_set_variable_int (L"BootCurrent" , + ret =efi_set_variable_int (u"BootCurrent" , &efi_global_variable_guid, attributes,sizeof (n), &n, false);if (ret !=EFI_SUCCESS )
@@ -149,7 +149,7 @@ efi_status_t efi_bootmgr_load(efi_handle_t *handle, void **load_options)/* BootNext */ size =sizeof (bootnext); - ret =efi_get_variable_int (L"BootNext" , + ret =efi_get_variable_int (u"BootNext" , &efi_global_variable_guid,NULL , &size, &bootnext,NULL );if (ret ==EFI_SUCCESS || ret ==EFI_BUFFER_TOO_SMALL ) {
@@ -158,7 +158,7 @@ efi_status_t efi_bootmgr_load(efi_handle_t *handle, void **load_options)log_err ("BootNext must be 16-bit integer\n" );/* delete BootNext */ - ret =efi_set_variable_int (L"BootNext" , + ret =efi_set_variable_int (u"BootNext" , &efi_global_variable_guid,0 ,0 ,NULL , false);
@@ -178,7 +178,7 @@ efi_status_t efi_bootmgr_load(efi_handle_t *handle, void **load_options) }/* BootOrder */ - bootorder =efi_get_var (L"BootOrder" , &efi_global_variable_guid, &size); + bootorder =efi_get_var (u"BootOrder" , &efi_global_variable_guid, &size);if (!bootorder) {log_info ("BootOrder not defined\n" ); ret =EFI_NOT_FOUND ;
lib/efi_loader/efi_boottime.c +1 -1
@@ -3736,7 +3736,7 @@ static struct efi_boot_services efi_boot_services = { .create_event_ex = efi_create_event_ex, }; -static u16 __efi_runtime_data firmware_vendor[] = L"Das U-Boot"; +static u16 __efi_runtime_data firmware_vendor[] = u"Das U-Boot"; struct efi_system_table __efi_runtime_data systab = { .hdr = {
lib/efi_loader/efi_capsule.c +10 -10
@@ -52,10 +52,10 @@ static __maybe_unused unsigned int get_last_capsule(void)int i; size =sizeof (value16); - ret =efi_get_variable_int (L"CapsuleLast" , &efi_guid_capsule_report, + ret =efi_get_variable_int (u"CapsuleLast" , &efi_guid_capsule_report,NULL , &size, value16,NULL );if (ret !=EFI_SUCCESS || size !=22 || -u16_strncmp (value16,L"Capsule" ,7 )) +u16_strncmp (value16,u"Capsule" ,7 )) goto err;for (i =0 ; i <4 ; ++i) {u16 c = value16[i +7 ];
@@ -109,14 +109,14 @@ void set_capsule_result(int index, struct efi_capsule_header *capsule, }/* Variable CapsuleLast must not include terminating 0x0000 */ - ret =efi_set_variable_int (L"CapsuleLast" , &efi_guid_capsule_report, + ret =efi_set_variable_int (u"CapsuleLast" , &efi_guid_capsule_report,EFI_VARIABLE_READ_ONLY |EFI_VARIABLE_NON_VOLATILE |EFI_VARIABLE_BOOTSERVICE_ACCESS |EFI_VARIABLE_RUNTIME_ACCESS ,22 , variable_name16, false);if (ret !=EFI_SUCCESS ) -log_err ("Setting %ls failed\n" ,L"CapsuleLast" ); +log_err ("Setting %ls failed\n" ,u"CapsuleLast" ); }#ifdef CONFIG_EFI_CAPSULE_FIRMWARE_MANAGEMENT
@@ -683,7 +683,7 @@ static efi_status_t find_boot_device(void)/* find active boot device in BootNext */ bootnext =0 ; size =sizeof (bootnext); - ret =efi_get_variable_int (L"BootNext" , + ret =efi_get_variable_int (u"BootNext" , (efi_guid_t *)&efi_global_variable_guid,NULL , &size, &bootnext,NULL );if (ret ==EFI_SUCCESS || ret ==EFI_BUFFER_TOO_SMALL ) {
@@ -710,7 +710,7 @@ static efi_status_t find_boot_device(void) skip:/* find active boot device in BootOrder */ size =0 ; - ret =efi_get_variable_int (L"BootOrder" , &efi_global_variable_guid, + ret =efi_get_variable_int (u"BootOrder" , &efi_global_variable_guid,NULL , &size,NULL ,NULL );if (ret ==EFI_BUFFER_TOO_SMALL ) { boot_order =malloc (size);
@@ -719,7 +719,7 @@ skip: goto out; } - ret =efi_get_variable_int (L"BootOrder" , + ret =efi_get_variable_int (u"BootOrder" , &efi_global_variable_guid,NULL , &size, boot_order,NULL ); }
@@ -851,8 +851,8 @@ static efi_status_t efi_capsule_scan_dir(u16 ***files, unsigned int *num)break ;if (!(dirent->attribute &EFI_FILE_DIRECTORY ) && -u16_strcmp (dirent->file_name,L"." ) && -u16_strcmp (dirent->file_name,L".." )) +u16_strcmp (dirent->file_name,u"." ) && +u16_strcmp (dirent->file_name,u".." )) tmp_files[count++] =u16_strdup (dirent->file_name); }/* ignore an error */
@@ -1029,7 +1029,7 @@ static bool check_run_capsules(void)return true; size =sizeof (os_indications); - ret =efi_get_variable_int (L"OsIndications" , &efi_global_variable_guid, + ret =efi_get_variable_int (u"OsIndications" , &efi_global_variable_guid,NULL , &size, &os_indications,NULL ); if (ret == EFI_SUCCESS && (os_indications
lib/efi_loader/efi_helper.c +1 -1
@@ -31,7 +31,7 @@ static efi_status_t efi_create_current_boot_var(u16 var_name[],u16 *pos; boot_current_size =sizeof (boot_current); - ret =efi_get_variable_int (L"BootCurrent" , + ret =efi_get_variable_int (u"BootCurrent" , &efi_global_variable_guid,NULL , &boot_current_size, &boot_current,NULL );if (ret !=EFI_SUCCESS )
lib/efi_loader/efi_image_loader.c +4 -4
@@ -532,13 +532,13 @@ static bool efi_image_unsigned_authenticate(struct efi_image_regions *regs)struct efi_signature_store *db =NULL , *dbx =NULL ;bool ret = false; - dbx =efi_sigstore_parse_sigdb (L"dbx" ); + dbx =efi_sigstore_parse_sigdb (u"dbx" );if (!dbx) {EFI_PRINT ("Getting signature database(dbx) failed\n" ); goto out; } - db =efi_sigstore_parse_sigdb (L"db" ); + db =efi_sigstore_parse_sigdb (u"db" );if (!db) {EFI_PRINT ("Getting signature database(db) failed\n" ); goto out;
@@ -621,13 +621,13 @@ static bool efi_image_authenticate(void *efi, size_t efi_size)/* * verify signature using db and dbx */ - db =efi_sigstore_parse_sigdb (L"db" ); + db =efi_sigstore_parse_sigdb (u"db" );if (!db) {EFI_PRINT ("Getting signature database(db) failed\n" ); goto err; } - dbx =efi_sigstore_parse_sigdb (L"dbx" ); + dbx =efi_sigstore_parse_sigdb (u"dbx" );if (!dbx) {EFI_PRINT ("Getting signature database(dbx) failed\n" ); goto err;
lib/efi_loader/efi_setup.c +10 -10
@@ -43,7 +43,7 @@ static efi_status_t efi_init_platform_lang(void)* Variable PlatformLangCodes defines the language codes that the * machine can support. */ - ret = efi_set_variable_int(L"PlatformLangCodes", + ret = efi_set_variable_int(u"PlatformLangCodes", &efi_global_variable_guid, EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS |
@@ -57,7 +57,7 @@ static efi_status_t efi_init_platform_lang(void)* Variable PlatformLang defines the language that the machine has been * configured for. */ - ret =efi_get_variable_int (L"PlatformLang" , + ret =efi_get_variable_int (u"PlatformLang" , &efi_global_variable_guid,NULL , &data_size, &pos,NULL );if (ret ==EFI_BUFFER_TOO_SMALL ) {
@@ -74,7 +74,7 @@ static efi_status_t efi_init_platform_lang(void)if (pos) *pos =0 ; - ret = efi_set_variable_int(L"PlatformLang", + ret = efi_set_variable_int(u"PlatformLang", &efi_global_variable_guid, EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS |
@@ -100,7 +100,7 @@ static efi_status_t efi_init_secure_boot(void) };efi_status_t ret; - ret = efi_set_variable_int(L"SignatureSupport", + ret = efi_set_variable_int(u"SignatureSupport", &efi_global_variable_guid, EFI_VARIABLE_READ_ONLY | EFI_VARIABLE_BOOTSERVICE_ACCESS |
@@ -129,12 +129,12 @@ static efi_status_t efi_init_capsule(void)efi_status_t ret =EFI_SUCCESS ;if (IS_ENABLED (CONFIG_EFI_HAVE_CAPSULE_UPDATE )) { - ret =efi_set_variable_int (L"CapsuleMax" , + ret =efi_set_variable_int (u"CapsuleMax" , &efi_guid_capsule_report,EFI_VARIABLE_READ_ONLY |EFI_VARIABLE_BOOTSERVICE_ACCESS |EFI_VARIABLE_RUNTIME_ACCESS , -22 ,L"CapsuleFFFF" , false); +22 ,u"CapsuleFFFF" , false);if (ret !=EFI_SUCCESS )printf ("EFI: cannot initialize CapsuleMax variable\n" ); }
@@ -165,7 +165,7 @@ static efi_status_t efi_init_os_indications(void) os_indications_supported |=EFI_OS_INDICATIONS_FMP_CAPSULE_SUPPORTED ; - return efi_set_variable_int(L"OsIndicationsSupported", + return efi_set_variable_int(u"OsIndicationsSupported", &efi_global_variable_guid, EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS |
@@ -187,21 +187,21 @@ static efi_status_t efi_clear_os_indications(void)efi_status_t ret; size =sizeof (os_indications); - ret =efi_get_variable_int (L"OsIndications" , &efi_global_variable_guid, + ret =efi_get_variable_int (u"OsIndications" , &efi_global_variable_guid,NULL , &size, &os_indications,NULL );if (ret !=EFI_SUCCESS ) os_indications =0 ;else os_indications &= ~EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED ; - ret =efi_set_variable_int (L"OsIndications" , &efi_global_variable_guid, + ret =efi_set_variable_int (u"OsIndications" , &efi_global_variable_guid,EFI_VARIABLE_NON_VOLATILE |EFI_VARIABLE_BOOTSERVICE_ACCESS |EFI_VARIABLE_RUNTIME_ACCESS ,sizeof (os_indications), &os_indications, false);if (ret !=EFI_SUCCESS ) -log_err ("Setting %ls failed\n" ,L"OsIndications" ); +log_err ("Setting %ls failed\n" ,u"OsIndications" );return ret; }
lib/efi_loader/efi_signature.c +2 -2
@@ -746,9 +746,9 @@ struct efi_signature_store *efi_sigstore_parse_sigdb(u16 *name)efi_uintn_t db_size;efi_status_t ret; -if (!u16_strcmp (name,L"PK" ) || !u16_strcmp (name,L"KEK" )) { +if (!u16_strcmp (name,u"PK" ) || !u16_strcmp (name,u"KEK" )) { vendor = &efi_global_variable_guid; - }else if (!u16_strcmp (name,L"db" ) || !u16_strcmp (name,L"dbx" )) { + }else if (!u16_strcmp (name,u"db" ) || !u16_strcmp (name,u"dbx" )) { vendor = &efi_guid_image_security_database; }else {EFI_PRINT ("unknown signature database, %ls\n" , name);
lib/efi_loader/efi_string.c +1 -1
@@ -16,7 +16,7 @@* @index: Index * * Create a utf-16 string with @name, appending @index. -* For example, L"Capsule0001" +* For example, u"Capsule0001" * * The caller must ensure that the buffer has enough space for the resulting * string including the trailing L'\0'.
lib/efi_loader/efi_var_common.c +7 -7
@@ -229,26 +229,26 @@ static efi_status_t efi_set_secure_state(u8 secure_boot, u8 setup_mode, efi_secure_boot = secure_boot; - ret =efi_set_variable_int (L"SecureBoot" , &efi_global_variable_guid, + ret =efi_set_variable_int (u"SecureBoot" , &efi_global_variable_guid, attributes_ro,sizeof (secure_boot), &secure_boot, false);if (ret !=EFI_SUCCESS ) goto err; - ret =efi_set_variable_int (L"SetupMode" , &efi_global_variable_guid, + ret =efi_set_variable_int (u"SetupMode" , &efi_global_variable_guid, attributes_ro,sizeof (setup_mode), &setup_mode, false);if (ret !=EFI_SUCCESS ) goto err; - ret =efi_set_variable_int (L"AuditMode" , &efi_global_variable_guid, + ret =efi_set_variable_int (u"AuditMode" , &efi_global_variable_guid, audit_mode || setup_mode ? attributes_ro : attributes_rw,sizeof (audit_mode), &audit_mode, false);if (ret !=EFI_SUCCESS ) goto err; - ret = efi_set_variable_int(L"DeployedMode", + ret = efi_set_variable_int(u"DeployedMode", &efi_global_variable_guid, audit_mode || deployed_mode || setup_mode ? attributes_ro : attributes_rw,
@@ -280,7 +280,7 @@ static efi_status_t efi_transfer_secure_state(enum efi_secure_mode mode)if (ret !=EFI_SUCCESS ) goto err; }else if (mode ==EFI_MODE_AUDIT ) { - ret =efi_set_variable_int (L"PK" , &efi_global_variable_guid, + ret =efi_set_variable_int (u"PK" , &efi_global_variable_guid,EFI_VARIABLE_BOOTSERVICE_ACCESS |EFI_VARIABLE_RUNTIME_ACCESS ,0 ,NULL , false);
@@ -319,7 +319,7 @@ efi_status_t efi_init_secure_state(void)efi_uintn_t size =0 ;efi_status_t ret; - ret =efi_get_variable_int (L"PK" , &efi_global_variable_guid, + ret =efi_get_variable_int (u"PK" , &efi_global_variable_guid,NULL , &size,NULL ,NULL );if (ret ==EFI_BUFFER_TOO_SMALL ) {if (IS_ENABLED (CONFIG_EFI_SECURE_BOOT ))
@@ -331,7 +331,7 @@ efi_status_t efi_init_secure_state(void)return ret;/* As we do not provide vendor keys this variable is always 0. */ - ret = efi_set_variable_int(L"VendorKeys", + ret = efi_set_variable_int(u"VendorKeys", &efi_global_variable_guid, EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS |
lib/efi_loader/efi_variable.c +3 -3
@@ -145,15 +145,15 @@ static efi_status_t efi_variable_authenticate(u16 *variable,case EFI_AUTH_VAR_PK :case EFI_AUTH_VAR_KEK :/* with PK */ - truststore =efi_sigstore_parse_sigdb (L"PK" ); + truststore =efi_sigstore_parse_sigdb (u"PK" );if (!truststore) goto err;break ;case EFI_AUTH_VAR_DB :case EFI_AUTH_VAR_DBX :/* with PK and KEK */ - truststore =efi_sigstore_parse_sigdb (L"KEK" ); - truststore2 =efi_sigstore_parse_sigdb (L"PK" ); + truststore =efi_sigstore_parse_sigdb (u"KEK" ); + truststore2 =efi_sigstore_parse_sigdb (u"PK" );if (!truststore) {if (!truststore2) goto err;
lib/efi_loader/efi_variable_tee.c +1 -1
@@ -590,7 +590,7 @@ efi_status_t efi_set_variable_int(u16 *variable_name, const efi_guid_t *vendor,if (alt_ret !=EFI_SUCCESS ) goto out; -if (!u16_strcmp (variable_name,L"PK" )) +if (!u16_strcmp (variable_name,u"PK" )) alt_ret =efi_init_secure_state (); out:free (comm_buf);
lib/efi_loader/helloworld.c +20 -20
@@ -34,7 +34,7 @@ static struct efi_simple_text_output_protocol *con_out;*/ static void print_uefi_revision (void ) { -u16 rev[] =L"0.0.0" ; +u16 rev[] =u"0.0.0" ; rev[0 ] = (systable->hdr.revision >>16 ) +'0' ; rev[4 ] = systable->hdr.revision &0xffff ;
@@ -48,9 +48,9 @@ static void print_uefi_revision(void)else rev[3 ] =0 ; - con_out->output_string (con_out,L"Running on UEFI " ); + con_out->output_string (con_out,u"Running on UEFI " ); con_out->output_string (con_out, rev); - con_out->output_string (con_out,L"\r\n" ); + con_out->output_string (con_out,u"\r\n" ); }/**
@@ -65,15 +65,15 @@ static void print_config_tables(void)if (!memcmp (&systable->tables[i].guid, &fdt_guid,sizeof (efi_guid_t))) con_out->output_string - (con_out,L"Have device tree\r\n" ); + (con_out,u"Have device tree\r\n" );if (!memcmp (&systable->tables[i].guid, &acpi_guid,sizeof (efi_guid_t))) con_out->output_string - (con_out,L"Have ACPI 2.0 table\r\n" ); + (con_out,u"Have ACPI 2.0 table\r\n" );if (!memcmp (&systable->tables[i].guid, &smbios_guid,sizeof (efi_guid_t))) con_out->output_string - (con_out,L"Have SMBIOS table\r\n" ); + (con_out,u"Have SMBIOS table\r\n" ); } }
@@ -86,13 +86,13 @@ static void print_config_tables(void)void print_load_options (struct efi_loaded_image *loaded_image) {/* Output the load options */ - con_out->output_string (con_out,L"Load options: " ); + con_out->output_string (con_out,u"Load options: " );if (loaded_image->load_options_size && loaded_image->load_options) con_out->output_string (con_out, (u16 *)loaded_image->load_options);else - con_out->output_string (con_out,L"<none>" ); - con_out->output_string (con_out,L"\r\n" ); + con_out->output_string (con_out,u"<none>" ); + con_out->output_string (con_out,u"\r\n" ); }/**
@@ -108,21 +108,21 @@ efi_status_t print_device_path(struct efi_device_path *device_path,efi_status_t ret;if (!device_path) { - con_out->output_string (con_out,L"<none>\r\n" ); + con_out->output_string (con_out,u"<none>\r\n" );return EFI_SUCCESS ; } string = dp2txt->convert_device_path_to_text (device_path, true, false);if (!string) { con_out->output_string - (con_out,L"Cannot convert device path to text\r\n" ); + (con_out,u"Cannot convert device path to text\r\n" );return EFI_OUT_OF_RESOURCES ; } con_out->output_string (con_out, string); - con_out->output_string (con_out,L"\r\n" ); + con_out->output_string (con_out,u"\r\n" ); ret = boottime->free_pool (string);if (ret !=EFI_SUCCESS ) { - con_out->output_string (con_out,L"Cannot free pool memory\r\n" ); + con_out->output_string (con_out,u"Cannot free pool memory\r\n" );return ret; }return EFI_SUCCESS ;
@@ -148,7 +148,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle, con_out = systable->con_out;/* UEFI requires CR LF */ - con_out->output_string (con_out,L"Hello, world!\r\n" ); + con_out->output_string (con_out,u"Hello, world!\r\n" );print_uefi_revision ();print_config_tables ();
@@ -158,7 +158,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle, (void **)&loaded_image);if (ret !=EFI_SUCCESS ) { con_out->output_string - (con_out,L"Cannot open loaded image protocol\r\n" ); + (con_out,u"Cannot open loaded image protocol\r\n" ); goto out; }print_load_options (loaded_image);
@@ -168,12 +168,12 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle, NULL, (void **)&device_path_to_text);if (ret !=EFI_SUCCESS ) { con_out->output_string - (con_out,L"Cannot open device path to text protocol\r\n" ); + (con_out,u"Cannot open device path to text protocol\r\n" ); goto out; }if (!loaded_image->device_handle) { con_out->output_string - (con_out,L"Missing device handle\r\n" ); + (con_out,u"Missing device handle\r\n" ); goto out; } ret = boottime->handle_protocol(loaded_image->device_handle,
@@ -181,14 +181,14 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle, (void **)&device_path);if (ret !=EFI_SUCCESS ) { con_out->output_string - (con_out,L"Missing device path for device handle\r\n" ); + (con_out,u"Missing device path for device handle\r\n" ); goto out; } - con_out->output_string (con_out,L"Boot device: " ); + con_out->output_string (con_out,u"Boot device: " ); ret =print_device_path (device_path, device_path_to_text);if (ret !=EFI_SUCCESS ) goto out; - con_out->output_string (con_out,L"File path: " ); + con_out->output_string (con_out,u"File path: " ); ret =print_device_path (loaded_image->file_path, device_path_to_text);if (ret !=EFI_SUCCESS ) goto out;
lib/efi_selftest/dtbdump.c +41 -41
264 lines not on this page · raw message
lib/efi_selftest/efi_selftest.c +1 -1
@@ -18,7 +18,7 @@ static const struct efi_system_table *systable;static const struct efi_boot_services *boottime;static const struct efi_runtime_services *runtime;static efi_handle_t handle; -static u16 reset_message[] =L"Selftest completed" ; +static u16 reset_message[] =u"Selftest completed" ;static int *setup_status;/*
lib/efi_selftest/efi_selftest_block_device.c +3 -3
@@ -407,7 +407,7 @@ static int execute(void) }/* Read file */ - ret = root->open (root, &file,L"hello.txt" ,EFI_FILE_MODE_READ , + ret = root->open (root, &file,u"hello.txt" ,EFI_FILE_MODE_READ ,0 );if (ret !=EFI_SUCCESS ) {efi_st_error ("Failed to open file\n" );
@@ -451,7 +451,7 @@ static int execute(void)#ifdef CONFIG_FAT_WRITE /* Write file */ - ret = root->open (root, &file,L"u-boot.txt" ,EFI_FILE_MODE_READ | + ret = root->open (root, &file,u"u-boot.txt" ,EFI_FILE_MODE_READ |EFI_FILE_MODE_WRITE |EFI_FILE_MODE_CREATE ,0 );if (ret !=EFI_SUCCESS ) {efi_st_error ("Failed to open file\n" );
@@ -483,7 +483,7 @@ static int execute(void)/* Verify file */ boottime->set_mem (buf,sizeof (buf),0 ); - ret = root->open (root, &file,L"u-boot.txt" ,EFI_FILE_MODE_READ , + ret = root->open (root, &file,u"u-boot.txt" ,EFI_FILE_MODE_READ ,0 );if (ret !=EFI_SUCCESS ) {efi_st_error ("Failed to open file\n" );
lib/efi_selftest/efi_selftest_devicepath.c +1 -1
@@ -319,7 +319,7 @@ static int execute(void) {DEVICE_PATH_TYPE_MEDIA_DEVICE ,DEVICE_PATH_SUB_TYPE_FILE_PATH , sizeof(struct efi_device_path) + 12}, -L"u-boot.bin" , +u"u-boot.bin" , }; u16 *string;efi_status_t ret;
lib/efi_selftest/efi_selftest_exception.c +1 -1
@@ -31,7 +31,7 @@ static struct {DEVICE_PATH_SUB_TYPE_FILE_PATH ,sizeof (dp.dp) +sizeof (dp.filename), }, -L"bug.efi" , +u"bug.efi" , {DEVICE_PATH_TYPE_END , DEVICE_PATH_SUB_TYPE_END,
lib/efi_selftest/efi_selftest_fdt.c +3 -3
@@ -198,7 +198,7 @@ static int execute(void)char *str;efi_status_t ret; - str =get_property (L"compatible" ,NULL ); + str =get_property (u"compatible" ,NULL );if (str) {efi_st_printf ("compatible: %s\n" , str); ret = boottime->free_pool (str);
@@ -210,7 +210,7 @@ static int execute(void)efi_st_error ("Missing property 'compatible'\n" );return EFI_ST_FAILURE ; } - str =get_property (L"serial-number" ,NULL ); + str =get_property (u"serial-number" ,NULL );if (str) {efi_st_printf ("serial-number: %s\n" , str); ret = boottime->free_pool (str);
@@ -219,7 +219,7 @@ static int execute(void)return EFI_ST_FAILURE ; } } - str =get_property (L"boot-hartid" ,L"chosen" ); + str =get_property (u"boot-hartid" ,u"chosen" );if (IS_ENABLED (CONFIG_RISCV )) {if (str) { efi_st_printf("boot-hartid: %u\n",
lib/efi_selftest/efi_selftest_hii.c +4 -4
@@ -699,7 +699,7 @@ static int test_hii_string_new_string(void) ret = hii_string_protocol->new_string (hii_string_protocol, handle, &id, (u8 *)"en-US" , -L"Japanese" ,L"Japanese" ,NULL ); +u"Japanese" ,u"Japanese" ,NULL );if (ret !=EFI_SUCCESS ) {efi_st_error ("new_string returned %u\n" , (unsigned int )ret);
@@ -752,7 +752,7 @@ static int test_hii_string_get_string(void) ret = hii_string_protocol->new_string (hii_string_protocol, handle, &id, (u8 *)"en-US" , -L"Japanese" ,L"Japanese" ,NULL ); +u"Japanese" ,u"Japanese" ,NULL );if (ret !=EFI_SUCCESS ) {efi_st_error ("new_string returned %u\n" , (unsigned int )ret);
@@ -831,7 +831,7 @@ static int test_hii_string_set_string(void) ret = hii_string_protocol->new_string (hii_string_protocol, handle, &id, (u8 *)"en-US" , -L"Japanese" ,L"Japanese" ,NULL ); +u"Japanese" ,u"Japanese" ,NULL );if (ret !=EFI_SUCCESS ) {efi_st_error ("new_string returned %u\n" , (unsigned int )ret);
@@ -840,7 +840,7 @@ static int test_hii_string_set_string(void) ret = hii_string_protocol->set_string (hii_string_protocol, handle, id, (u8 *)"en-US" , -L"Nihongo" ,NULL ); +u"Nihongo" ,NULL );if (ret !=EFI_SUCCESS ) {efi_st_error ("set_string returned %u\n" , (unsigned int )ret);
lib/efi_selftest/efi_selftest_load_file.c +2 -2
@@ -101,7 +101,7 @@ static struct { FILE_NAME_SIZE * sizeof(u16), } }, - L"\\lf.efi", + u"\\lf.efi", {DEVICE_PATH_TYPE_END , DEVICE_PATH_SUB_TYPE_END,
@@ -152,7 +152,7 @@ static struct { FILE_NAME_SIZE * sizeof(u16), } }, - L"\\lf2.efi", + u"\\lf2.efi", {DEVICE_PATH_TYPE_END , DEVICE_PATH_SUB_TYPE_END,
lib/efi_selftest/efi_selftest_loadimage.c +2 -2
@@ -20,8 +20,8 @@/* Binary logarithm of the block size */ #define LB_BLOCK_SIZE 9 -#define FILE_NAME L"app.efi" -#define VOLUME_NAME L"EfiDisk" +#define FILE_NAME u"app.efi" +#define VOLUME_NAME u"EfiDisk"static struct efi_boot_services *boottime;static efi_handle_t handle_image;
lib/efi_selftest/efi_selftest_miniapp_exception.c +2 -2
@@ -23,7 +23,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,struct efi_simple_text_output_protocol *con_out = systable->con_out; con_out->output_string (con_out, -L"EFI application triggers exception.\n" ); +u"EFI application triggers exception.\n" );#if defined(CONFIG_ARM )/*
@@ -38,6 +38,6 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,#elif defined(CONFIG_X86 ) asmvolatile (".word 0xffff\n" );#endif - con_out->output_string (con_out,L"Exception not triggered.\n" ); + con_out->output_string (con_out,u"Exception not triggered.\n" );return EFI_ABORTED ; }
lib/efi_selftest/efi_selftest_miniapp_exit.c +4 -4
@@ -40,7 +40,7 @@ static efi_status_t EFIAPI check_loaded_image_protocol NULL, EFI_OPEN_PROTOCOL_GET_PROTOCOL);if (ret !=EFI_SUCCESS ) { cout->output_string (cout, -L"Could not open loaded image protocol" ); +u"Could not open loaded image protocol" );return ret; } if ((void *)check_loaded_image_protocol <
@@ -49,7 +49,7 @@ static efi_status_t EFIAPI check_loaded_image_protocol loaded_image_protocol->image_base + loaded_image_protocol->image_size) { cout->output_string (cout, -L"Incorrect image_base or image_size\n" ); +u"Incorrect image_base or image_size\n" );return EFI_NOT_FOUND ; }return EFI_SUCCESS ;
@@ -69,11 +69,11 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,efi_status_t ret;u16 text[] =EFI_ST_SUCCESS_STR ; - con_out->output_string (con_out,L"EFI application calling Exit\n" ); + con_out->output_string (con_out,u"EFI application calling Exit\n" );if (check_loaded_image_protocol (handle, systable) !=EFI_SUCCESS ) { con_out->output_string (con_out, -L"Loaded image protocol missing\n" ); +u"Loaded image protocol missing\n" ); ret =EFI_NOT_FOUND ; goto out; }
lib/efi_selftest/efi_selftest_miniapp_return.c +1 -1
@@ -24,7 +24,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t handle,struct efi_simple_text_output_protocol *con_out = systable->con_out; con_out->output_string (con_out, -L"EFI application returning w/o calling Exit\n" ); +u"EFI application returning w/o calling Exit\n" );/* The return value is checked by the calling test */ return EFI_INCOMPATIBLE_VERSION ;
lib/efi_selftest/efi_selftest_reset.c +1 -1
@@ -33,7 +33,7 @@ static int setup(const efi_handle_t handle,*/ static int execute (void ) { -u16 reset_data[] =L"Reset by selftest" ; +u16 reset_data[] =u"Reset by selftest" ; runtime->reset_system (EFI_RESET_COLD ,EFI_SUCCESS ,sizeof (reset_data), reset_data);
lib/efi_selftest/efi_selftest_textoutput.c +6 -6
@@ -44,14 +44,14 @@ static int execute(void) }/* TestString */ ret = con_out->test_string (con_out, -L" !\"#$%&'()*+,-./0-9:;<=>?@A-Z[\\]^_`a-z{|}~\n" ); +u" !\"#$%&'()*+,-./0-9:;<=>?@A-Z[\\]^_`a-z{|}~\n" );if (ret !=EFI_ST_SUCCESS ) {efi_st_error ("TestString failed for ANSI characters\n" );return EFI_ST_FAILURE ; }/* OutputString */ ret = con_out->output_string (con_out, -L"Testing cursor column update\n" ); +u"Testing cursor column update\n" );if (ret !=EFI_ST_SUCCESS ) {efi_st_error ("OutputString failed for ANSI characters" );return EFI_ST_FAILURE ;
@@ -75,7 +75,7 @@ static int execute(void)efi_st_error ("Cursor column not 0 at beginning of line\n" );return EFI_ST_FAILURE ; } - ret = con_out->output_string (con_out,L"123" ); + ret = con_out->output_string (con_out,u"123" );if (ret !=EFI_ST_SUCCESS ) {efi_st_error ("OutputString failed for ANSI characters\n" );return EFI_ST_FAILURE ;
@@ -84,7 +84,7 @@ static int execute(void)efi_st_error ("Cursor column not incremented properly\n" );return EFI_ST_FAILURE ; } - ret = con_out->output_string (con_out,L"\b" ); + ret = con_out->output_string (con_out,u"\b" );if (ret !=EFI_ST_SUCCESS ) {efi_st_error ("OutputString failed for backspace\n" );return EFI_ST_FAILURE ;
@@ -93,7 +93,7 @@ static int execute(void)efi_st_error ("Cursor column not decremented properly\n" );return EFI_ST_FAILURE ; } - ret = con_out->output_string (con_out,L"\b\b" ); + ret = con_out->output_string (con_out,u"\b\b" );if (ret !=EFI_ST_SUCCESS ) {efi_st_error ("OutputString failed for backspace\n" );return EFI_ST_FAILURE ;
@@ -102,7 +102,7 @@ static int execute(void)efi_st_error ("Cursor column not decremented properly\n" );return EFI_ST_FAILURE ; } - ret = con_out->output_string (con_out,L"\b\b" ); + ret = con_out->output_string (con_out,u"\b\b" );if (ret !=EFI_ST_SUCCESS ) {efi_st_error ("OutputString failed for backspace\n" );return EFI_ST_FAILURE ;
lib/efi_selftest/efi_selftest_unicode_collation.c +19 -19
@@ -44,9 +44,9 @@ static int setup(const efi_handle_t handle,static int test_stri_coll (void ) {efi_intn_t ret; -u16 c1[] =L"first" ; -u16 c2[] =L"FIRST" ; -u16 c3[] =L"second" ; +u16 c1[] =u"first" ; +u16 c2[] =u"FIRST" ; +u16 c3[] =u"second" ; ret = unicode_collation_protocol->stri_coll (unicode_collation_protocol, c1, c2);
@@ -78,66 +78,66 @@ static int test_stri_coll(void)static int test_metai_match (void ) {bool ret; -const u16 c[] =L"Das U-Boot" ; +const u16 c[] =u"Das U-Boot" ; ret = unicode_collation_protocol->metai_match ( - unicode_collation_protocol, c,L"*" ); + unicode_collation_protocol, c,u"*" );if (!ret) {efi_st_error ("metai_match returned %u\n" , ret);return EFI_ST_FAILURE ; } ret = unicode_collation_protocol->metai_match ( - unicode_collation_protocol, c,L"Da[rstu] U-Boot" ); + unicode_collation_protocol, c,u"Da[rstu] U-Boot" );if (!ret) {efi_st_error ("metai_match returned %u\n" , ret);return EFI_ST_FAILURE ; } ret = unicode_collation_protocol->metai_match ( - unicode_collation_protocol, c,L"Da[q-v] U-Boot" ); + unicode_collation_protocol, c,u"Da[q-v] U-Boot" );if (!ret) {efi_st_error ("metai_match returned %u\n" , ret);return EFI_ST_FAILURE ; } ret = unicode_collation_protocol->metai_match ( - unicode_collation_protocol, c,L"Da? U-Boot" ); + unicode_collation_protocol, c,u"Da? U-Boot" );if (!ret) {efi_st_error ("metai_match returned %u\n" , ret);return EFI_ST_FAILURE ; } ret = unicode_collation_protocol->metai_match ( - unicode_collation_protocol, c,L"D*Bo*t" ); + unicode_collation_protocol, c,u"D*Bo*t" );if (!ret) {efi_st_error ("metai_match returned %u\n" , ret);return EFI_ST_FAILURE ; } ret = unicode_collation_protocol->metai_match ( - unicode_collation_protocol, c,L"Da[xyz] U-Boot" ); + unicode_collation_protocol, c,u"Da[xyz] U-Boot" );if (ret) {efi_st_error ("metai_match returned %u\n" , ret);return EFI_ST_FAILURE ; } ret = unicode_collation_protocol->metai_match ( - unicode_collation_protocol, c,L"Da[a-d] U-Boot" ); + unicode_collation_protocol, c,u"Da[a-d] U-Boot" );if (ret) {efi_st_error ("metai_match returned %u\n" , ret);return EFI_ST_FAILURE ; } ret = unicode_collation_protocol->metai_match ( - unicode_collation_protocol, c,L"Da?? U-Boot" ); + unicode_collation_protocol, c,u"Da?? U-Boot" );if (ret) {efi_st_error ("metai_match returned %u\n" , ret);return EFI_ST_FAILURE ; } ret = unicode_collation_protocol->metai_match ( - unicode_collation_protocol, c,L"D*Bo*tt" ); + unicode_collation_protocol, c,u"D*Bo*tt" );if (ret) {efi_st_error ("metai_match returned %u\n" , ret);return EFI_ST_FAILURE ;
@@ -148,7 +148,7 @@ static int test_metai_match(void)static int test_str_lwr (void ) { -u16 c[] =L"U-Boot" ; +u16 c[] =u"U-Boot" ; unicode_collation_protocol->str_lwr (unicode_collation_protocol, c);if (efi_st_strcmp_16_8 (c,"u-boot" )) {
@@ -161,7 +161,7 @@ static int test_str_lwr(void)static int test_str_upr (void ) { -u16 c[] =L"U-Boot" ; +u16 c[] =u"U-Boot" ; unicode_collation_protocol->str_upr (unicode_collation_protocol, c);if (efi_st_strcmp_16_8 (c,"U-BOOT" )) {
@@ -194,16 +194,16 @@ static int test_str_to_fat(void) boottime->set_mem (fat,sizeof (fat),0 ); ret = unicode_collation_protocol->str_to_fat (unicode_collation_protocol, -L"U -Boo.t" ,6 , fat); -if (ret ||efi_st_strcmp_16_8 (L"U-BOOT" , fat)) { +u"U -Boo.t" ,6 , fat); +if (ret ||efi_st_strcmp_16_8 (u"U-BOOT" , fat)) {efi_st_error ("str_to_fat returned %u, \"%s\"\n" , ret, fat);return EFI_ST_FAILURE ; } boottime->set_mem (fat,16 ,0 ); ret = unicode_collation_protocol->str_to_fat (unicode_collation_protocol, -L"U\\Boot" ,6 , fat); -if (!ret ||efi_st_strcmp_16_8 (L"U_BOOT" , fat)) { +u"U\\Boot" ,6 , fat); +if (!ret ||efi_st_strcmp_16_8 (u"U_BOOT" , fat)) {efi_st_error ("str_to_fat returned %u, \"%s\"\n" , ret, fat);return EFI_ST_FAILURE ; }
lib/efi_selftest/efi_selftest_util.c +53 -53
117 lines not on this page · raw message
lib/efi_selftest/efi_selftest_variables.c +11 -11
@@ -63,7 +63,7 @@ static int execute(void)return EFI_ST_FAILURE ; }/* Set variable 0 */ - ret = runtime->set_variable (L"efi_st_var0" , &guid_vendor0, + ret = runtime->set_variable (u"efi_st_var0" , &guid_vendor0,EFI_VARIABLE_BOOTSERVICE_ACCESS ,3 , v +4 );if (ret !=EFI_SUCCESS ) {
@@ -72,7 +72,7 @@ static int execute(void) } data[3 ] =0xff ; len =3 ; - ret = runtime->get_variable (L"efi_st_var0" , &guid_vendor0, + ret = runtime->get_variable (u"efi_st_var0" , &guid_vendor0, &attr, &len, data);if (ret !=EFI_SUCCESS ) {efi_st_error ("GetVariable failed\n" );
@@ -87,7 +87,7 @@ static int execute(void)return EFI_ST_FAILURE ; }/* Set variable 1 */ - ret = runtime->set_variable (L"efi_st_var1" , &guid_vendor1, + ret = runtime->set_variable (u"efi_st_var1" , &guid_vendor1,EFI_VARIABLE_BOOTSERVICE_ACCESS ,8 , v);if (ret !=EFI_SUCCESS ) {
@@ -95,7 +95,7 @@ static int execute(void)return EFI_ST_FAILURE ; } len =EFI_ST_MAX_DATA_SIZE ; - ret = runtime->get_variable (L"efi_st_var1" , &guid_vendor1, + ret = runtime->get_variable (u"efi_st_var1" , &guid_vendor1, &attr, &len, data);if (ret !=EFI_SUCCESS ) {efi_st_error ("GetVariable failed\n" );
@@ -111,7 +111,7 @@ static int execute(void)return EFI_ST_FAILURE ; }/* Append variable 1 */ - ret = runtime->set_variable (L"efi_st_var1" , &guid_vendor1, + ret = runtime->set_variable (u"efi_st_var1" , &guid_vendor1,EFI_VARIABLE_BOOTSERVICE_ACCESS |EFI_VARIABLE_APPEND_WRITE ,7 , v +8 );
@@ -120,7 +120,7 @@ static int execute(void)return EFI_ST_FAILURE ; } len =EFI_ST_MAX_DATA_SIZE ; - ret = runtime->get_variable (L"efi_st_var1" , &guid_vendor1, + ret = runtime->get_variable (u"efi_st_var1" , &guid_vendor1, &attr, &len, data);if (ret !=EFI_SUCCESS ) {efi_st_error ("GetVariable failed\n" );
@@ -132,7 +132,7 @@ static int execute(void)if (memcmp (data, v, len))efi_st_todo ("GetVariable returned wrong value\n" );/* Append variable 2 */ - ret = runtime->set_variable (L"efi_none" , &guid_vendor1, + ret = runtime->set_variable (u"efi_none" , &guid_vendor1,EFI_VARIABLE_BOOTSERVICE_ACCESS |EFI_VARIABLE_APPEND_WRITE ,15 , v);
@@ -173,28 +173,28 @@ static int execute(void)return EFI_ST_FAILURE ; }/* Delete variable 1 */ - ret = runtime->set_variable (L"efi_st_var1" , &guid_vendor1, + ret = runtime->set_variable (u"efi_st_var1" , &guid_vendor1,0 ,0 ,NULL );if (ret !=EFI_SUCCESS ) {efi_st_error ("SetVariable failed\n" );return EFI_ST_FAILURE ; } len =EFI_ST_MAX_DATA_SIZE ; - ret = runtime->get_variable (L"efi_st_var1" , &guid_vendor1, + ret = runtime->get_variable (u"efi_st_var1" , &guid_vendor1, &attr, &len, data);if (ret !=EFI_NOT_FOUND ) {efi_st_error ("Variable was not deleted\n" );return EFI_ST_FAILURE ; }/* Delete variable 0 */ - ret = runtime->set_variable (L"efi_st_var0" , &guid_vendor0, + ret = runtime->set_variable (u"efi_st_var0" , &guid_vendor0,0 ,0 ,NULL );if (ret !=EFI_SUCCESS ) {efi_st_error ("SetVariable failed\n" );return EFI_ST_FAILURE ; } len =EFI_ST_MAX_DATA_SIZE ; - ret = runtime->get_variable (L"efi_st_var0" , &guid_vendor0, + ret = runtime->get_variable (u"efi_st_var0" , &guid_vendor0, &attr, &len, data);if (ret !=EFI_NOT_FOUND ) {efi_st_error ("Variable was not deleted\n" );
lib/efi_selftest/efi_selftest_variables_runtime.c +2 -2
@@ -58,7 +58,7 @@ static int execute(void)return EFI_ST_FAILURE ; } - ret = runtime->set_variable (L"efi_st_var0" , &guid_vendor0, + ret = runtime->set_variable (u"efi_st_var0" , &guid_vendor0,EFI_VARIABLE_BOOTSERVICE_ACCESS |EFI_VARIABLE_RUNTIME_ACCESS ,3 , v +4 );
@@ -67,7 +67,7 @@ static int execute(void)return EFI_ST_FAILURE ; } len =EFI_ST_MAX_DATA_SIZE ; - ret = runtime->get_variable (L"PlatformLangCodes" , &guid_vendor0, + ret = runtime->get_variable (u"PlatformLangCodes" , &guid_vendor0, &attr, &len, data);if (ret !=EFI_SUCCESS ) {efi_st_error ("GetVariable failed\n" );
lib/efi_selftest/initrddump.c +30 -30
180 lines not on this page · raw message
Signature · 1 line
2.32.0.554.ge1b32706d8-goog
PATCH v3 3/5 sandbox: Detect the host bit size automatically
In reply to Simon GlassAt present if you build sandbox on a 32-bit host a lot of errors are produced. This is because CONFIG_HOST_64BIT is enabled by default.
It is quite annoying to have to change that manually before building sandbox. It is also quite confusing for new users.
Add a way to detect the setting and add the appropriate CONFIG_HOST_64BIT=y or CONFIG_HOST_32BIT=y to the defconfig, to avoid this issue.
---
Changes in v3:
- Use 'bitness' instead of 'bit'
Changes in v2:
- Drop patches previously applied
- Put all the packages in gcc.rst
Makefile | 11 ++++++++++- arch/sandbox/Kconfig | 13 ++++++++----- scripts/kconfig/Makefile | 14 +++++++++++++- 3 files changed, 31 insertions(+), 7 deletions(-)
Makefile +10 -1
@@ -565,8 +565,17 @@ export KBUILD_DEFCONFIG KBUILD_KCONFIG config: scripts_basic outputmakefile FORCE $(Q)$(MAKE) $(build)=scripts/kconfig $@ +# If nothing is specified explicitly, detect the bit size for sandbox, +# referred to from arch/sandbox/Kconfig +# Add it to the end of the defconfig file %config: scripts_basic outputmakefile FORCE - $(Q)$(MAKE) $(build)=scripts/kconfig $@ + $(Q)if test -f $(srctree)/configs/$@ && \ + ! grep -Eq "CONFIG_HOST_(32|64)BIT=y" $(srctree)/configs/$@; then \ + echo '#include <stdio.h>\nint main(void) { printf("CONFIG_HOST_%dBIT=y\\n", __WORDSIZE); return 0; }' \ + | gcc -x c - -o get_word_size; \ + extra=$$(./get_word_size); \ + fi; \ + $(MAKE) $(build)=scripts/kconfig EXTRA_DEFCONFIG=$$extra $@ else # ===========================================================================
arch/sandbox/Kconfig +8 -5
@@ -35,12 +35,12 @@ config SYS_CONFIG_NAME choice prompt "Run sandbox on 32/64-bit host" - default HOST_64BIT + default HOST_DETECT_BITNESS help - Sandbox can be built on 32-bit and 64-bit hosts. - The default is to build on a 64-bit host and run - on a 64-bit host. If you want to run sandbox on - a 32-bit host, change it here. + Sandbox can be built on 32-bit and 64-bit hosts. This is generally + auto-detected but you can force a particular word size here. If you + see strange warnings about SANDBOX_BITS_PER_LONG then you may have + selected the wrong value. config HOST_32BIT bool "32-bit host"
@@ -49,6 +49,9 @@ config HOST_32BIT config HOST_64BIT bool "64-bit host" +config HOST_DETECT_BITNESS + bool "Auto-detect host bitness" + endchoice config SANDBOX_CRASH_RESET
scripts/kconfig/Makefile +13 -1
@@ -12,6 +12,9 @@ PHONY += xconfig gconfig menuconfig config localmodconfig localyesconfig \ # Set SRCARCH to .. fake this Makefile. SRCARCH := .. +# For U-Boot, EXTRA_DEFCONFIG contains a line to be added to the defconfig +# before processing. If empty, no line is added. + ifdef KBUILD_KCONFIG Kconfig := $(KBUILD_KCONFIG) else
@@ -92,8 +95,17 @@ else endif endif +# If EXTRA_DEFCONFIG is defined, add it to the end of the defconfig, before +# processing. This allows the caller to change a setting on the fly %_defconfig: $(obj)/conf - $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) + $(Q)defconfig="$(srctree)/arch/$(SRCARCH)/configs/$@"; \ + if [ -n "$(EXTRA_DEFCONFIG)" ]; then \ + cat $$defconfig >defconfig_tmp; \ + echo $(EXTRA_DEFCONFIG) >>defconfig_tmp; \ + $< $(silent) --defconfig=defconfig_tmp $(Kconfig); \ + else \ + $< $(silent) --defconfig=$$defconfig $(Kconfig); \ + fi # Added for U-Boot (backward compatibility) %_config: %_defconfig
Signature · 1 line
2.32.0.554.ge1b32706d8-goog
Re: [PATCH v3 3/5] sandbox: Detect the host bit size automatically
Quoted 32 lines · On Sunday 01 August 2021 18:56:11 Simon Glass wrote:
At present if you build sandbox on a 32-bit host a lot of errors are produced. This is because
CONFIG_HOST_64BITis enabled by default.It is quite annoying to have to change that manually before building sandbox. It is also quite confusing for new users.
Add a way to detect the setting and add the appropriate
CONFIG_HOST_64BIT=yorCONFIG_HOST_32BIT=yto the defconfig, to avoid this issue.Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Use 'bitness' instead of 'bit'Changes in v2:
- Drop patches previously applied
- Put all the packages ingcc.rstMakefile | 11 ++++++++++- arch/sandbox/Kconfig | 13 ++++++++----- scripts/kconfig/Makefile | 14 +++++++++++++- 3 files changed, 31 insertions(+), 7 deletions(-)Makefile +0
-0@@ -565,8 +565,17 @@ export KBUILD_DEFCONFIG KBUILD_KCONFIG config: scripts_basic outputmakefile FORCE $(Q)$(MAKE) $(build)=scripts/kconfig $@
Makefile export KBUILD_DEFCONFIG KBUILD_KCONFIG · line 575
Quoted 10 lines
Makefile +7
-1+# If nothing is specified explicitly, detect the bit size for sandbox, +# referred to from arch/sandbox/Kconfig +# Add it to the end of the defconfig file %config: scripts_basic outputmakefile FORCE - $(Q)$(MAKE) $(build)=scripts/kconfig $@ + $(Q)if test -f $(srctree)/configs/$@ && \ + ! grep -Eq "CONFIG_HOST_(32|64)BIT=y" $(srctree)/configs/$@; then \ + echo '#include <stdio.h>\nint main(void) { printf("CONFIG_HOST_%dBIT=y\\n", __WORDSIZE); return 0; }' \ + | gcc -x c - -o get_word_size; \
Should not Makefile use user's specified compiler instead of hardcoded 'gcc'?
Quoted 74 lines
Makefile +3
-0+ extra=$$(./get_word_size); \ + fi; \ + $(MAKE) $(build)=scripts/kconfig EXTRA_DEFCONFIG=$$extra $@ else # ===========================================================================arch/sandbox/Kconfig +8
-5@@ -35,12 +35,12 @@ config SYS_CONFIG_NAME choice prompt "Run sandbox on 32/64-bit host" - default HOST_64BIT + default HOST_DETECT_BITNESS help - Sandbox can be built on 32-bit and 64-bit hosts. - The default is to build on a 64-bit host and run - on a 64-bit host. If you want to run sandbox on - a 32-bit host, change it here. + Sandbox can be built on 32-bit and 64-bit hosts. This is generally + auto-detected but you can force a particular word size here. If you + see strange warnings about SANDBOX_BITS_PER_LONG then you may have + selected the wrong value. config HOST_32BIT bool "32-bit host"@@ -49,6 +49,9 @@ config HOST_32BIT config HOST_64BIT bool "64-bit host" +config HOST_DETECT_BITNESS + bool "Auto-detect host bitness" + endchoice config SANDBOX_CRASH_RESETscripts/kconfig/Makefile +13
-1@@ -12,6 +12,9 @@ PHONY += xconfig gconfig menuconfig config localmodconfig localyesconfig \ # Set SRCARCH to .. fake this Makefile. SRCARCH := .. +# For U-Boot, EXTRA_DEFCONFIG contains a line to be added to the defconfig +# before processing. If empty, no line is added. + ifdef KBUILD_KCONFIG Kconfig := $(KBUILD_KCONFIG) else@@ -92,8 +95,17 @@ else endif endif +# If EXTRA_DEFCONFIG is defined, add it to the end of the defconfig, before +# processing. This allows the caller to change a setting on the fly %_defconfig: $(obj)/conf - $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) + $(Q)defconfig="$(srctree)/arch/$(SRCARCH)/configs/$@"; \ + if [ -n "$(EXTRA_DEFCONFIG)" ]; then \ + cat $$defconfig >defconfig_tmp; \ + echo $(EXTRA_DEFCONFIG) >>defconfig_tmp; \ + $< $(silent) --defconfig=defconfig_tmp $(Kconfig); \ + else \ + $< $(silent) --defconfig=$$defconfig $(Kconfig); \ + fi # Added for U-Boot (backward compatibility) %_config: %_defconfigSignature · 1 line
2.32.0.554.ge1b32706d8-goog
Re: [PATCH v3 3/5] sandbox: Detect the host bit size automatically
Quoted 34 lines · Pali Rohár
Quoted 33 lines · On Sunday 01 August 2021 18:56:11 Simon Glass wrote:
At present if you build sandbox on a 32-bit host a lot of errors are produced. This is because
CONFIG_HOST_64BITis enabled by default.It is quite annoying to have to change that manually before building sandbox. It is also quite confusing for new users.
Add a way to detect the setting and add the appropriate
CONFIG_HOST_64BIT=yorCONFIG_HOST_32BIT=yto the defconfig, to avoid this issue.Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Use 'bitness' instead of 'bit'Changes in v2:
- Drop patches previously applied
- Put all the packages ingcc.rstMakefile | 11 ++++++++++- arch/sandbox/Kconfig | 13 ++++++++----- scripts/kconfig/Makefile | 14 +++++++++++++- 3 files changed, 31 insertions(+), 7 deletions(-)Makefile +0
-0@@ -565,8 +565,17 @@ export KBUILD_DEFCONFIG KBUILD_KCONFIG config: scripts_basic outputmakefile FORCE $(Q)$(MAKE) $(build)=scripts/kconfig $@
Quoted 11 lines
Makefile export KBUILD_DEFCONFIG KBUILD_KCONFIG · line 575
Quoted 9 lines
Makefile +7
-1+# If nothing is specified explicitly, detect the bit size for sandbox, +# referred to from arch/sandbox/Kconfig +# Add it to the end of the defconfig file %config: scripts_basic outputmakefile FORCE - $(Q)$(MAKE) $(build)=scripts/kconfig $@ + $(Q)if test -f $(srctree)/configs/$@ && \ + ! grep -Eq "CONFIG_HOST_(32|64)BIT=y" $(srctree)/configs/$@; then \ + echo '#include <stdio.h>\nint main(void) { printf("CONFIG_HOST_%dBIT=y\\n", __WORDSIZE); return 0; }' \ + | gcc -x c - -o get_word_size; \Should not
Makefileuse user's specified compiler instead of hardcoded 'gcc'?
And it should probably look a bit more like how we do CC_IS_GCC, etc.
Signature · 1 line
Tom
PATCH v3 4/5 treewide: Use 16-bit unicode strings
In reply to Simon GlassAt present we use wide characters for unicode but this is not necessary. Change the code to use the 'u' literal instead. This helps to fix build warnings for sandbox on rpi.
Note: This applies tree-wide
---
Changes in v3:
- Add a new patch to change non-EFI occurences
lib/lzma/Types.h | 4 ++-- test/print_ut.c | 2 +- test/unicode_ut.c | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-)
lib/lzma/Types.h +2 -2
@@ -225,9 +225,9 @@ typedef struct#else #define CHAR_PATH_SEPARATOR '/' -#define WCHAR_PATH_SEPARATOR L'/' +#define WCHAR_PATH_SEPARATOR u'/'#define STRING_PATH_SEPARATOR "/" -#define WSTRING_PATH_SEPARATOR L"/" +#define WSTRING_PATH_SEPARATOR u"/"#endif
test/print_ut.c +1 -1
@@ -101,7 +101,7 @@ static int print_printf(struct unit_test_state *uts)snprintf (str,0 ,"testing none" );ut_asserteq ('x' , *str); -sprintf (big_str,"_%ls_" ,L"foo" ); +sprintf (big_str,"_%ls_" ,u"foo" );ut_assertok (strcmp ("_foo_" , big_str));/* Test the banner function */
test/unicode_ut.c +11 -11
@@ -299,17 +299,17 @@ static int unicode_test_utf8_utf16_strcpy(struct unit_test_state *uts) pos = buf;utf8_utf16_strcpy (&pos, j1);ut_asserteq (4 , pos - buf); -ut_assert (!unicode_test_u16_strcmp (buf,L"j1?l" ,SIZE_MAX )); +ut_assert (!unicode_test_u16_strcmp (buf,u"j1?l" ,SIZE_MAX )); pos = buf;utf8_utf16_strcpy (&pos, j2);ut_asserteq (4 , pos - buf); -ut_assert (!unicode_test_u16_strcmp (buf,L"j2?l" ,SIZE_MAX )); +ut_assert (!unicode_test_u16_strcmp (buf,u"j2?l" ,SIZE_MAX )); pos = buf;utf8_utf16_strcpy (&pos, j3);ut_asserteq (3 , pos - buf); -ut_assert (!unicode_test_u16_strcmp (buf,L"j3?" ,SIZE_MAX )); +ut_assert (!unicode_test_u16_strcmp (buf,u"j3?" ,SIZE_MAX ));return 0 ; }
@@ -584,13 +584,13 @@ UNICODE_TEST(unicode_test_utf_to_upper);static int unicode_test_u16_strncmp (struct unit_test_state *uts) { -ut_assert (u16_strncmp (L"abc" ,L"abc" ,3 ) ==0 ); -ut_assert (u16_strncmp (L"abcdef" ,L"abcghi" ,3 ) ==0 ); -ut_assert (u16_strncmp (L"abcdef" ,L"abcghi" ,6 ) <0 ); -ut_assert (u16_strncmp (L"abcghi" ,L"abcdef" ,6 ) >0 ); -ut_assert (u16_strcmp (L"abc" ,L"abc" ) ==0 ); -ut_assert (u16_strcmp (L"abcdef" ,L"deghi" ) <0 ); -ut_assert (u16_strcmp (L"deghi" ,L"abcdef" ) >0 ); +ut_assert (u16_strncmp (u"abc" ,u"abc" ,3 ) ==0 ); +ut_assert (u16_strncmp (u"abcdef" ,u"abcghi" ,3 ) ==0 ); +ut_assert (u16_strncmp (u"abcdef" ,u"abcghi" ,6 ) <0 ); +ut_assert (u16_strncmp (u"abcghi" ,u"abcdef" ,6 ) >0 ); +ut_assert (u16_strcmp (u"abc" ,u"abc" ) ==0 ); +ut_assert (u16_strcmp (u"abcdef" ,u"deghi" ) <0 ); +ut_assert (u16_strcmp (u"deghi" ,u"abcdef" ) >0 );return 0 ; }UNICODE_TEST (unicode_test_u16_strncmp);
@@ -713,7 +713,7 @@ UNICODE_TEST(unicode_test_utf8_to_utf32_stream);static int unicode_test_efi_create_indexed_name (struct unit_test_state *uts) {u16 buf[16 ]; -u16 const expected[] =L"Capsule0AF9" ; +u16 const expected[] =u"Capsule0AF9" ;u16 *pos;memset (buf,0xeb ,sizeof (buf));
Signature · 1 line
2.32.0.554.ge1b32706d8-goog
PATCH v3 5/5 RFC: treewide: Drop -fshort-char
In reply to Simon GlassNow that we use the 'u' prefix on unicode strings we don't need this option. Drop it.
Note: This doesn't actually work and throws lots of warnings.
---
(no changes since v1)
Makefile | 2 +- arch/arm/config.mk | 2 +- arch/x86/config.mk | 2 +- arch/x86/cpu/Makefile | 2 +- arch/x86/lib/Makefile | 6 +++--- lib/efi/Makefile | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-)
Makefile +1 -1
@@ -426,7 +426,7 @@ KBUILD_CPPFLAGS := -D__KERNEL__ -D__UBOOT__ KBUILD_CFLAGS := -Wall -Wstrict-prototypes \ -Wno-format-security \ -fno-builtin -ffreestanding $(CSTD_FLAG) -KBUILD_CFLAGS += -fshort-wchar -fno-strict-aliasing +KBUILD_CFLAGS += -fno-strict-aliasing KBUILD_AFLAGS := -D__ASSEMBLY__ KBUILD_LDFLAGS :=
arch/arm/config.mk +1 -1
@@ -13,7 +13,7 @@ endif CFLAGS_NON_EFI := -fno-pic -ffixed-r9 -ffunction-sections -fdata-sections \ -fstack-protector-strong -CFLAGS_EFI := -fpic -fshort-wchar +CFLAGS_EFI := -fpic ifneq ($(CONFIG_LTO)$(CONFIG_USE_PRIVATE_LIBGCC),yy) LDFLAGS_FINAL += --gc-sections
arch/x86/config.mk +1 -1
@@ -40,7 +40,7 @@ OBJCOPYFLAGS_EFI := -j .text -j .sdata -j .data -j .dynamic -j .dynsym \ -j .rel -j .rela -j .reloc # Compiler flags to be added when building UEFI applications -CFLAGS_EFI := -fpic -fshort-wchar +CFLAGS_EFI := -fpic # Compiler flags to be removed when building UEFI applications CFLAGS_NON_EFI := -mregparm=3 -fstack-protector-strong
arch/x86/cpu/Makefile +1 -1
@@ -34,7 +34,7 @@ endif ifndef CONFIG_$(SPL_)X86_64 AFLAGS_REMOVE_call32.o := -mregparm=3 \ $(if $(CONFIG_EFI_STUB_64BIT),-march=i386 -m32) -AFLAGS_call32.o := -fpic -fshort-wchar \ +AFLAGS_call32.o := -fpic \ $(if $(CONFIG_EFI_STUB_64BIT),-m64) extra-y += call32.o
arch/x86/lib/Makefile +3 -3
@@ -71,14 +71,14 @@ endif ifneq ($(CONFIG_EFI_STUB),) CFLAGS_REMOVE_reloc_ia32_efi.o += -mregparm=3 -CFLAGS_reloc_ia32_efi.o += -fpic -fshort-wchar +CFLAGS_reloc_ia32_efi.o += -fpic # When building for 64-bit we must remove the i386-specific flags CFLAGS_REMOVE_reloc_x86_64_efi.o += -mregparm=3 -march=i386 -m32 -CFLAGS_reloc_x86_64_efi.o += -fpic -fshort-wchar -m64 +CFLAGS_reloc_x86_64_efi.o += -fpic -m64 AFLAGS_REMOVE_crt0_x86_64_efi.o += -mregparm=3 -march=i386 -m32 -AFLAGS_crt0_x86_64_efi.o += -fpic -fshort-wchar -m64 +AFLAGS_crt0_x86_64_efi.o += -fpic -m64 extra-$(CONFIG_EFI_STUB_32BIT) += crt0_ia32_efi.o reloc_ia32_efi.o extra-$(CONFIG_EFI_STUB_64BIT) += crt0_x86_64_efi.o reloc_x86_64_efi.o
lib/efi/Makefile +2 -2
@@ -7,11 +7,11 @@ obj-$(CONFIG_EFI_STUB) += efi_info.o CFLAGS_REMOVE_efi_stub.o := -mregparm=3 \ $(if $(CONFIG_EFI_STUB_64BIT),-march=i386 -m32) -CFLAGS_efi_stub.o := -fpic -fshort-wchar \ +CFLAGS_efi_stub.o := -fpic \ $(if $(CONFIG_EFI_STUB_64BIT),-m64) CFLAGS_REMOVE_efi.o := -mregparm=3 \ $(if $(CONFIG_EFI_STUB_64BIT),-march=i386 -m32) -CFLAGS_efi.o := -fpic -fshort-wchar \ +CFLAGS_efi.o := -fpic \ $(if $(CONFIG_EFI_STUB_64BIT),-m64) extra-$(CONFIG_EFI_STUB) += efi_stub.o efi.o
Signature · 1 line
2.32.0.554.ge1b32706d8-goog
Re: [PATCH v3 5/5] RFC: treewide: Drop -fshort-char
Quoted 4 lines · Simon Glass
Now that we use the 'u' prefix on unicode strings we don't need this option. Drop it.
Note: This doesn't actually work and throws lots of warnings.
Ah damn, thanks for checking.
Signature · 1 line
Tom
Hi,
Quoted 29 lines · Simon Glass
These were noticed when building sandbox on a Raspberry Pi 400, which uses 32-bit linux.
To make this work, I enabled
CONFIG_HOST_32BITin 'make menuconfig'. It would be nice if that were automatic, since we have the logic already inarch/sandbox/config.mkSo this series adds that.
It also fixes the unicode warnings of the form:
/usr/bin/ld: warning:arch/sandbox/cpu/start.ouses 2-bytewchar_tyet the output is to use 4-bytewchar_t; use ofwchar_tvalues across objects may failas suggested by Heinrich.
Changes in v3:
- Mention the link to the new upstream patch
- Change some things EFI things missed (or new since) last time
- Use 'bitness' instead of 'bit'
- Add a new patch to change non-EFI occurencesChanges in v2:
- Add new patch to reduce checkpatch unicode-string spam
- Drop patches previously applied
- Put all the packages ingcc.rst
Quoted 8 lines
Joe Perches (1):
checkpatch: Support wide stringsSimon Glass (4):
efi: Use 16-bit unicode strings
sandbox: Detect the host bit size automatically
treewide: Use 16-bit unicode strings
RFC: treewide: Drop -fshort-char
Any word on this series please?
Regards,
Simon
Quoted 52 lines
Makefile | 13 ++- arch/arm/config.mk | 2 +- arch/sandbox/Kconfig | 13 ++- arch/x86/config.mk | 2 +- arch/x86/cpu/Makefile | 2 +- arch/x86/lib/Makefile | 6 +- cmd/efidebug.c | 12 +- include/efi_loader.h | 2 +- include/efi_selftest.h | 4 +- lib/efi/Makefile | 4 +- lib/efi_loader/efi_bootmgr.c | 12 +- lib/efi_loader/efi_boottime.c | 2 +- lib/efi_loader/efi_capsule.c | 20 ++-- lib/efi_loader/efi_helper.c | 2 +- lib/efi_loader/efi_image_loader.c | 8 +- lib/efi_loader/efi_setup.c | 20 ++-- lib/efi_loader/efi_signature.c | 4 +- lib/efi_loader/efi_string.c | 2 +- lib/efi_loader/efi_var_common.c | 14 +-- lib/efi_loader/efi_variable.c | 6 +- lib/efi_loader/efi_variable_tee.c | 2 +- lib/efi_loader/helloworld.c | 40 +++---- lib/efi_selftest/dtbdump.c | 82 +++++++------- lib/efi_selftest/efi_selftest.c | 2 +- lib/efi_selftest/efi_selftest_block_device.c | 6 +- lib/efi_selftest/efi_selftest_devicepath.c | 2 +- lib/efi_selftest/efi_selftest_exception.c | 2 +- lib/efi_selftest/efi_selftest_fdt.c | 6 +- lib/efi_selftest/efi_selftest_hii.c | 8 +- lib/efi_selftest/efi_selftest_load_file.c | 4 +- lib/efi_selftest/efi_selftest_loadimage.c | 4 +- .../efi_selftest_miniapp_exception.c | 4 +- lib/efi_selftest/efi_selftest_miniapp_exit.c | 8 +- .../efi_selftest_miniapp_return.c | 2 +- lib/efi_selftest/efi_selftest_reset.c | 2 +- lib/efi_selftest/efi_selftest_textoutput.c | 12 +- .../efi_selftest_unicode_collation.c | 38 +++---- lib/efi_selftest/efi_selftest_util.c | 106 +++++++++--------- lib/efi_selftest/efi_selftest_variables.c | 22 ++-- .../efi_selftest_variables_runtime.c | 4 +- lib/efi_selftest/initrddump.c | 60 +++++----- lib/lzma/Types.h | 4 +- scripts/checkpatch.pl | 7 +- scripts/kconfig/Makefile | 14 ++- test/print_ut.c | 2 +- test/unicode_ut.c | 22 ++-- 46 files changed, 320 insertions(+), 295 deletions(-)--
2.32.0.554.ge1b32706d8-goog
Quoted 34 lines · Simon Glass
Hi,
Quoted 31 lines · Simon Glass
These were noticed when building sandbox on a Raspberry Pi 400, which uses 32-bit linux.
To make this work, I enabled
CONFIG_HOST_32BITin 'make menuconfig'. It would be nice if that were automatic, since we have the logic already inarch/sandbox/config.mkSo this series adds that.
It also fixes the unicode warnings of the form:
/usr/bin/ld: warning:arch/sandbox/cpu/start.ouses 2-bytewchar_tyet the output is to use 4-bytewchar_t; use ofwchar_tvalues across objects may failas suggested by Heinrich.
Changes in v3:
- Mention the link to the new upstream patch
- Change some things EFI things missed (or new since) last time
- Use 'bitness' instead of 'bit'
- Add a new patch to change non-EFI occurencesChanges in v2:
- Add new patch to reduce checkpatch unicode-string spam
- Drop patches previously applied
- Put all the packages ingcc.rstJoe Perches (1):
checkpatch: Support wide strings
Has this been merged upstream yet? It's going to get lost otherwise.
Quoted 3 lines
Quoted 3 lines
Simon Glass (4):
efi: Use 16-bit unicode strings
treewide: Use 16-bit unicode strings
What was the outcome here? I think I was saying we should make some global correction to the source tree, was this in fact it?
Quoted 1 line
Quoted 1 line
sandbox: Detect the host bit size automatically
Commented on now.
Quoted 1 line
Quoted 1 line
RFC: treewide: Drop -fshort-char
I think this causes other problems unfortunately?
Signature · 1 line
Tom