On Monday 24 April 2023 17:08:15 Simon Glass wrote:

Add a script to allow the U-Boot sandbox executable to be built for Windows. Add a note as to why this seems to be necessary for now.

Signed-off-by: Simon Glass sjg@chromium.org

Makefile | 11 +- arch/sandbox/config.mk | 4 + arch/sandbox/cpu/u-boot-pe.lds | 447 +++++++++++++++++++++++++++++++++ 3 files changed, 460 insertions(+), 2 deletions(-) create mode 100644 arch/sandbox/cpu/u-boot-pe.lds

diff --git a/Makefile b/Makefile index dd3fcd1782e5..0aa97a2c3b48 100644 --- a/Makefile +++ b/Makefile @@ -1730,6 +1730,13 @@ else u-boot-keep-syms-lto := endif

+ifeq ($(MSYS_VERSION),0) +add_ld_script := -T u-boot.lds +else +add_ld_script := u-boot.lds +$(warning msys) +endif

# Rule to link u-boot # May be overridden by arch/$(ARCH)/config.mk ifeq ($(LTO_ENABLE),y) @@ -1738,7 +1745,7 @@ quiet_cmd_u-boot__ ?= LTO $@ $(CC) -nostdlib -nostartfiles \ $(LTO_FINAL_LDFLAGS) $(c_flags) \ $(KBUILD_LDFLAGS:%=-Wl,%) $(LDFLAGS_u-boot:%=-Wl,%) -o $@ \

• -T u-boot.lds $(u-boot-init)					\
  

• $(add_ld_script) $(u-boot-init)					\
  

  -Wl,--whole-archive \ $(u-boot-main) \ $(u-boot-keep-syms-lto) \

@@ -1749,7 +1756,7 @@ quiet_cmd_u-boot__ ?= LTO $@ else quiet_cmd_u-boot__ ?= LD $@ cmd_u-boot__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_u-boot) -o $@ \

• -T u-boot.lds $(u-boot-init)					\
  

• $(add_ld_script) $(u-boot-init)					\
  

  --whole-archive \ $(u-boot-main) \ --no-whole-archive \

diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 2d184c5f652a..e05daf57ef8e 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -71,3 +71,7 @@ EFI_CRT0 := crt0_sandbox_efi.o EFI_RELOC := reloc_sandbox_efi.o AFLAGS_crt0_sandbox_efi.o += -DHOST_ARCH="$(HOST_ARCH)" CFLAGS_reloc_sandbox_efi.o += -DHOST_ARCH="$(HOST_ARCH)"

+ifneq ($(MSYS_VERSION),0) +LDSCRIPT = $(srctree)/arch/sandbox/cpu/u-boot-pe.lds +endif diff --git a/arch/sandbox/cpu/u-boot-pe.lds b/arch/sandbox/cpu/u-boot-pe.lds new file mode 100644 index 000000000000..031e70fafd03 --- /dev/null +++ b/arch/sandbox/cpu/u-boot-pe.lds @@ -0,0 +1,447 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/*

• • U-Boot note: This was obtained by using the -verbose linker option. The
• • U-Boot additions are marked below.
• • Ideally we would add sections to the executable, as is done with the Linux
• • build. But PE executables do not appear to work correctly if unexpected
• • sections are present:
• • $ /tmp/b/sandbox/u-boot.exe
• • -bash: /tmp/b/sandbox/u-boot.exe: cannot execute binary file: Exec format error
• • So we take a approach of rewriting the whole file, for now. This will likely
• • break in the future when a toolchain change is made.

Why not rather provide "layer" linker script which does this "rewriting" on top of the default linker script? With this way it is not needed to update linker script when a toolchain change it.

• */

+/* Default linker script, for normal executables */ +/* Copyright (C) 2014-2023 Free Software Foundation, Inc.

• Copying and distribution of this script, with or without modification,
• are permitted in any medium without royalty provided the copyright
• notice and this notice are preserved. */

+OUTPUT_FORMAT(pei-x86-64) +SEARCH_DIR("/usr/x86_64-pc-msys/lib"); SEARCH_DIR("/usr/lib"); SEARCH_DIR("/usr/lib/w32api"); +SECTIONS +{

• /* Make the virtual address and file offset synced if the alignment is

• lower than the target page size. */
  

• . = SIZEOF_HEADERS;
• . = ALIGN(__section_alignment__);
• .text __image_base__ + ( __section_alignment__ < 0x1000 ? . : __section_alignment__ ) :
• {
• KEEP (*(SORT_NONE(.init)))
• *(.text)
• *(SORT(.text$*))

• *(.text.*)
  

• *(.gnu.linkonce.t.*)
  

• *(.glue_7t)
• *(.glue_7)
• . = ALIGN(8);

•   /* Note: we always define __CTOR_LIST__ and ___CTOR_LIST__ here,
  

•      we do not PROVIDE them.  This is because the ctors.o startup
  

•  code in libgcc defines them as common symbols, with the
  

•      expectation that they will be overridden by the definitions
  

•  here.  If we PROVIDE the symbols then they will not be
  

•  overridden and global constructors will not be run.
  

•  See PR 22762 for more details.
  

•  This does mean that it is not possible for a user to define
  

•  their own __CTOR_LIST__ and __DTOR_LIST__ symbols; if they do,
  

•  the content from those variables are included but the symbols
  

•  defined here silently take precedence.  If they truly need to
  

•  be redefined, a custom linker script will have to be used.
  

•  (The custom script can just be a copy of this script with the
  

•  PROVIDE() qualifiers added).
  

•  In particular this means that ld -Ur does not work, because
  

•  the proper __CTOR_LIST__ set by ld -Ur is overridden by a
  

•  bogus __CTOR_LIST__ set by the final link.  See PR 46.  */
  

•   ___CTOR_LIST__ = .;
  

•   __CTOR_LIST__ = .;
  

•   LONG (-1); LONG (-1);
  

•   KEEP (*(.ctors));
  

•   KEEP (*(.ctor));
  

•   KEEP (*(SORT_BY_NAME(.ctors.*)));
  

•   LONG (0); LONG (0);
  

•   /* See comment about __CTOR_LIST__ above.  The same reasoning
  

•   applies here too.  */
  

•   ___DTOR_LIST__ = .;
  

•   __DTOR_LIST__ = .;
  

•   LONG (-1); LONG (-1);
  

•   KEEP (*(.dtors));
  

•   KEEP (*(.dtor));
  

•   KEEP (*(SORT_BY_NAME(.dtors.*)));
  

•   LONG (0); LONG (0);
  

• KEEP (*(SORT_NONE(.fini)))
• /* ??? Why is .gcc_exc here? */

• *(.gcc_exc)
  

• PROVIDE (etext = .);

• KEEP (*(.gcc_except_table))
  

• }
• /* The Cygwin32 library uses a section to avoid copying certain data

• on fork.  This used to be named ".data".  The linker used
  

• to include this between __data_start__ and __data_end__, but that
  

• breaks building the cygwin32 dll.  Instead, we name the section
  

• ".data_cygwin_nocopy" and explicitly include it after __data_end__. */
  

• .data BLOCK(__section_alignment__) :
• {
• __data_start__ = . ;
• *(.data)
• *(.data2)
• *(SORT(.data$*))
• KEEP(*(.jcr))
• __data_end__ = . ;
• *(.data_cygwin_nocopy)
• }
• .rdata BLOCK(__section_alignment__) :
• {
• *(.rdata)

•     *(SORT(.rdata$*))
  

• . = ALIGN(4);
• __rt_psrelocs_start = .;
• KEEP(*(.rdata_runtime_pseudo_reloc))
• __rt_psrelocs_end = .;
• /* U-Boot additions from here on */
• . = ALIGN(4);
• KEEP(*(SORT(__u_boot_list*)));
• *(_u_boot_sandbox_getopt_start)
• *(_u_boot_sandbox_getopt)
• *(_u_boot_sandbox_getopt_end)
• *(___efi_runtime_start)
• *(efi_runtime_text)
• *(efi_runtime_data)
• *(___efi_runtime_stop)
• *(___efi_runtime_rel_start)
• *(.relefi_runtime_text)
• *(.relefi_runtime_data)
• *(___efi_runtime_rel_stop)
• . = ALIGN(4);
• *(.rodata.ttf.init)
• *(.rodata.splash.init)
• *(.rodata.helloworld.init)
• *(.dtb.init.rodata)
• /* U-Boot additions end */
• }
• __rt_psrelocs_size = __rt_psrelocs_end - __rt_psrelocs_start;
• ___RUNTIME_PSEUDO_RELOC_LIST_END__ = .;
• __RUNTIME_PSEUDO_RELOC_LIST_END__ = .;
• ___RUNTIME_PSEUDO_RELOC_LIST__ = . - __rt_psrelocs_size;
• __RUNTIME_PSEUDO_RELOC_LIST__ = . - __rt_psrelocs_size;
• .eh_frame BLOCK(__section_alignment__) :
• {
• KEEP (*(.eh_frame*))
• }
• .pdata BLOCK(__section_alignment__) :
• {
• KEEP(*(.pdata*))
• }
• .xdata BLOCK(__section_alignment__) :
• {
• KEEP(*(.xdata*))
• }
• .bss BLOCK(__section_alignment__) :
• {
• __bss_start__ = . ;
• *(.bss)
• *(COMMON)
• __bss_end__ = . ;
• }
• .edata BLOCK(__section_alignment__) :
• {
• *(.edata)
• }
• /DISCARD/ :
• {
• *(.debug$S)
• *(.debug$T)
• *(.debug$F)

• *(.drectve)
  

• *(.note.GNU-stack)
  

• *(.gnu.lto_*)
  

• }
• .idata BLOCK(__section_alignment__) :
• {
• /* This cannot currently be handled with grouped sections.
• See pep.em:sort_sections. */
• KEEP (SORT(*)(.idata$2))
• KEEP (SORT(*)(.idata$3))
• /* These zeroes mark the end of the import list. */
• LONG (0); LONG (0); LONG (0); LONG (0); LONG (0);
• . = ALIGN(8);
• KEEP (SORT(*)(.idata$4))
• __IAT_start__ = .;
• SORT(*)(.idata$5)
• __IAT_end__ = .;
• KEEP (SORT(*)(.idata$6))
• KEEP (SORT(*)(.idata$7))
• }
• .CRT BLOCK(__section_alignment__) :
• {
• ___crt_xc_start__ = . ;
• KEEP (*(SORT(.CRT$XC*))) /* C initialization */
• ___crt_xc_end__ = . ;
• ___crt_xi_start__ = . ;
• KEEP (*(SORT(.CRT$XI*))) /* C++ initialization */
• ___crt_xi_end__ = . ;
• ___crt_xl_start__ = . ;
• KEEP (*(SORT(.CRT$XL*))) /* TLS callbacks */
• /* ___crt_xl_end__ is defined in the TLS Directory support code */
• ___crt_xp_start__ = . ;
• KEEP (*(SORT(.CRT$XP*))) /* Pre-termination */
• ___crt_xp_end__ = . ;
• ___crt_xt_start__ = . ;
• KEEP (*(SORT(.CRT$XT*))) /* Termination */
• ___crt_xt_end__ = . ;
• }
• /* Windows TLS expects .tls$AAA to be at the start and .tls$ZZZ to be

• at the end of the .tls section.  This is important because _tls_start MUST
  

• be at the beginning of the section to enable SECREL32 relocations with TLS
  

• data.  */
  

• .tls BLOCK(__section_alignment__) :
• {
• ___tls_start__ = . ;
• KEEP (*(.tls$AAA))
• KEEP (*(.tls))
• KEEP (*(.tls$))
• KEEP (*(SORT(.tls$*)))
• KEEP (*(.tls$ZZZ))
• ___tls_end__ = . ;
• }
• .endjunk BLOCK(__section_alignment__) :
• {
• /* end is deprecated, don't use it */
• PROVIDE (end = .);
• PROVIDE ( _end = .);

• __end__ = .;
  

• }
• .rsrc BLOCK(__section_alignment__) : SUBALIGN(4)
• {
• KEEP (*(.rsrc))
• KEEP (*(.rsrc$*))
• }
• .reloc BLOCK(__section_alignment__) :
• {
• *(.reloc)
• }
• .stab BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.stab)
• }
• .stabstr BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.stabstr)
• }
• /* DWARF debug sections.

• Symbols in the DWARF debugging sections are relative to the beginning
  

• of the section.  Unlike other targets that fake this by putting the
  

• section VMA at 0, the PE format will not allow it.  */
  

• /* DWARF 1.1 and DWARF 2. */
• .debug_aranges BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_aranges)
• }
• .zdebug_aranges BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_aranges)
• }
• .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_pubnames)
• }
• .zdebug_pubnames BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_pubnames)
• }
• /* DWARF 2. */
• .debug_info BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_info .gnu.linkonce.wi.*)
• }
• .zdebug_info BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_info .zdebug.gnu.linkonce.wi.*)
• }
• .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_abbrev)
• }
• .zdebug_abbrev BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_abbrev)
• }
• .debug_line BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_line)
• }
• .zdebug_line BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_line)
• }
• .debug_frame BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_frame*)
• }
• .zdebug_frame BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_frame*)
• }
• .debug_str BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_str)
• }
• .zdebug_str BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_str)
• }
• .debug_loc BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_loc)
• }
• .zdebug_loc BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_loc)
• }
• .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_macinfo)
• }
• .zdebug_macinfo BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_macinfo)
• }
• /* SGI/MIPS DWARF 2 extensions. */
• .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_weaknames)
• }
• .zdebug_weaknames BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_weaknames)
• }
• .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_funcnames)
• }
• .zdebug_funcnames BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_funcnames)
• }
• .debug_typenames BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_typenames)
• }
• .zdebug_typenames BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_typenames)
• }
• .debug_varnames BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_varnames)
• }
• .zdebug_varnames BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_varnames)
• }
• /* DWARF 3. */
• .debug_pubtypes BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_pubtypes)
• }
• .zdebug_pubtypes BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_pubtypes)
• }
• .debug_ranges BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_ranges)
• }
• .zdebug_ranges BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_ranges)
• }
• /* DWARF 4. */
• .debug_types BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_types .gnu.linkonce.wt.*)
• }
• .zdebug_types BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_types .gnu.linkonce.wt.*)
• }
• /* DWARF 5. */
• .debug_addr BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_addr)
• }
• .zdebug_addr BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_addr)
• }
• .debug_line_str BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_line_str)
• }
• .zdebug_line_str BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_line_str)
• }
• .debug_loclists BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_loclists)
• }
• .zdebug_loclists BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_loclists)
• }
• .debug_macro BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_macro)
• }
• .zdebug_macro BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_macro)
• }
• .debug_names BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_names)
• }
• .zdebug_names BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_names)
• }
• .debug_rnglists BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_rnglists)
• }
• .zdebug_rnglists BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_rnglists)
• }
• .debug_str_offsets BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_str_offsets)
• }
• .zdebug_str_offsets BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_str_offsets)
• }
• .debug_sup BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_sup)
• }
• /* For Go and Rust. */
• .debug_gdb_scripts BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.debug_gdb_scripts)
• }
• .zdebug_gdb_scripts BLOCK(__section_alignment__) (NOLOAD) :
• {
• *(.zdebug_gdb_scripts)
• }

+}

2.40.0.634.g4ca3ef3211-goog

On Tuesday 25 April 2023 12:01:04 Simon Glass wrote:

Hi Pali,

On Tue, 25 Apr 2023 at 10:21, Pali Rohár pali@kernel.org wrote:

...

On Monday 24 April 2023 17:08:15 Simon Glass wrote:

...

Add a script to allow the U-Boot sandbox executable to be built for Windows. Add a note as to why this seems to be necessary for now.

Signed-off-by: Simon Glass sjg@chromium.org

Makefile | 11 +- arch/sandbox/config.mk | 4 + arch/sandbox/cpu/u-boot-pe.lds | 447 +++++++++++++++++++++++++++++++++ 3 files changed, 460 insertions(+), 2 deletions(-) create mode 100644 arch/sandbox/cpu/u-boot-pe.lds

diff --git a/Makefile b/Makefile index dd3fcd1782e5..0aa97a2c3b48 100644 --- a/Makefile +++ b/Makefile @@ -1730,6 +1730,13 @@ else u-boot-keep-syms-lto := endif

+ifeq ($(MSYS_VERSION),0) +add_ld_script := -T u-boot.lds +else +add_ld_script := u-boot.lds +$(warning msys) +endif

# Rule to link u-boot # May be overridden by arch/$(ARCH)/config.mk ifeq ($(LTO_ENABLE),y) @@ -1738,7 +1745,7 @@ quiet_cmd_u-boot__ ?= LTO $@ $(CC) -nostdlib -nostartfiles \ $(LTO_FINAL_LDFLAGS) $(c_flags) \ $(KBUILD_LDFLAGS:%=-Wl,%) $(LDFLAGS_u-boot:%=-Wl,%) -o $@ \

•         -T u-boot.lds $(u-boot-init)                                    \
  

•         $(add_ld_script) $(u-boot-init)                                 \
          -Wl,--whole-archive                                             \
                  $(u-boot-main)                                          \
                  $(u-boot-keep-syms-lto)                                 \
  

@@ -1749,7 +1756,7 @@ quiet_cmd_u-boot__ ?= LTO $@ else quiet_cmd_u-boot__ ?= LD $@ cmd_u-boot__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_u-boot) -o $@ \

•         -T u-boot.lds $(u-boot-init)                                    \
  

•         $(add_ld_script) $(u-boot-init)                                 \
          --whole-archive                                                 \
                  $(u-boot-main)                                          \
          --no-whole-archive                                              \
  

diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 2d184c5f652a..e05daf57ef8e 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -71,3 +71,7 @@ EFI_CRT0 := crt0_sandbox_efi.o EFI_RELOC := reloc_sandbox_efi.o AFLAGS_crt0_sandbox_efi.o += -DHOST_ARCH="$(HOST_ARCH)" CFLAGS_reloc_sandbox_efi.o += -DHOST_ARCH="$(HOST_ARCH)"

+ifneq ($(MSYS_VERSION),0) +LDSCRIPT = $(srctree)/arch/sandbox/cpu/u-boot-pe.lds +endif diff --git a/arch/sandbox/cpu/u-boot-pe.lds b/arch/sandbox/cpu/u-boot-pe.lds new file mode 100644 index 000000000000..031e70fafd03 --- /dev/null +++ b/arch/sandbox/cpu/u-boot-pe.lds @@ -0,0 +1,447 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/*

• • U-Boot note: This was obtained by using the -verbose linker option. The
• • U-Boot additions are marked below.
• • Ideally we would add sections to the executable, as is done with the Linux
• • build. But PE executables do not appear to work correctly if unexpected
• • sections are present:
• • $ /tmp/b/sandbox/u-boot.exe
• • -bash: /tmp/b/sandbox/u-boot.exe: cannot execute binary file: Exec format error
• • So we take a approach of rewriting the whole file, for now. This will likely
• • break in the future when a toolchain change is made.

Why not rather provide "layer" linker script which does this "rewriting" on top of the default linker script? With this way it is not needed to update linker script when a toolchain change it.

How can we reliably do that, though? We don't really know the format of the script and where to insert stuff.

Regards, Simon

Well, I do not know what is the current issue. The proposed script in your patch looks like it is copied from some binutils version and then modified. Also I do not know from which binutils you have copied and what modification you have done in it. So I cannot react or comment anymore more here.

My idea is that to write those modifications into new layer script.

On Tuesday 25 April 2023 13:23:04 Simon Glass wrote:

Hi Pali,

On Tue, 25 Apr 2023 at 12:11, Pali Rohár pali@kernel.org wrote:

...

On Tuesday 25 April 2023 12:01:04 Simon Glass wrote:

...

Hi Pali,

On Tue, 25 Apr 2023 at 10:21, Pali Rohár pali@kernel.org wrote:

...

On Monday 24 April 2023 17:08:15 Simon Glass wrote:

...

Add a script to allow the U-Boot sandbox executable to be built for Windows. Add a note as to why this seems to be necessary for now.

Signed-off-by: Simon Glass sjg@chromium.org

Makefile | 11 +- arch/sandbox/config.mk | 4 + arch/sandbox/cpu/u-boot-pe.lds | 447 +++++++++++++++++++++++++++++++++ 3 files changed, 460 insertions(+), 2 deletions(-) create mode 100644 arch/sandbox/cpu/u-boot-pe.lds

diff --git a/Makefile b/Makefile index dd3fcd1782e5..0aa97a2c3b48 100644 --- a/Makefile +++ b/Makefile @@ -1730,6 +1730,13 @@ else u-boot-keep-syms-lto := endif

+ifeq ($(MSYS_VERSION),0) +add_ld_script := -T u-boot.lds +else +add_ld_script := u-boot.lds +$(warning msys) +endif

# Rule to link u-boot # May be overridden by arch/$(ARCH)/config.mk ifeq ($(LTO_ENABLE),y) @@ -1738,7 +1745,7 @@ quiet_cmd_u-boot__ ?= LTO $@ $(CC) -nostdlib -nostartfiles \ $(LTO_FINAL_LDFLAGS) $(c_flags) \ $(KBUILD_LDFLAGS:%=-Wl,%) $(LDFLAGS_u-boot:%=-Wl,%) -o $@ \

•         -T u-boot.lds $(u-boot-init)                                    \
  

•         $(add_ld_script) $(u-boot-init)                                 \
          -Wl,--whole-archive                                             \
                  $(u-boot-main)                                          \
                  $(u-boot-keep-syms-lto)                                 \
  

@@ -1749,7 +1756,7 @@ quiet_cmd_u-boot__ ?= LTO $@ else quiet_cmd_u-boot__ ?= LD $@ cmd_u-boot__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_u-boot) -o $@ \

•         -T u-boot.lds $(u-boot-init)                                    \
  

•         $(add_ld_script) $(u-boot-init)                                 \
          --whole-archive                                                 \
                  $(u-boot-main)                                          \
          --no-whole-archive                                              \
  

diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk index 2d184c5f652a..e05daf57ef8e 100644 --- a/arch/sandbox/config.mk +++ b/arch/sandbox/config.mk @@ -71,3 +71,7 @@ EFI_CRT0 := crt0_sandbox_efi.o EFI_RELOC := reloc_sandbox_efi.o AFLAGS_crt0_sandbox_efi.o += -DHOST_ARCH="$(HOST_ARCH)" CFLAGS_reloc_sandbox_efi.o += -DHOST_ARCH="$(HOST_ARCH)"

+ifneq ($(MSYS_VERSION),0) +LDSCRIPT = $(srctree)/arch/sandbox/cpu/u-boot-pe.lds +endif diff --git a/arch/sandbox/cpu/u-boot-pe.lds b/arch/sandbox/cpu/u-boot-pe.lds new file mode 100644 index 000000000000..031e70fafd03 --- /dev/null +++ b/arch/sandbox/cpu/u-boot-pe.lds @@ -0,0 +1,447 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/*

• • U-Boot note: This was obtained by using the -verbose linker option. The
• • U-Boot additions are marked below.
• • Ideally we would add sections to the executable, as is done with the Linux
• • build. But PE executables do not appear to work correctly if unexpected
• • sections are present:
• • $ /tmp/b/sandbox/u-boot.exe
• • -bash: /tmp/b/sandbox/u-boot.exe: cannot execute binary file: Exec format error
• • So we take a approach of rewriting the whole file, for now. This will likely
• • break in the future when a toolchain change is made.

Why not rather provide "layer" linker script which does this "rewriting" on top of the default linker script? With this way it is not needed to update linker script when a toolchain change it.

How can we reliably do that, though? We don't really know the format of the script and where to insert stuff.

Regards, Simon

Well, I do not know what is the current issue. The proposed script in

See the comment at the top of the script:

• • Ideally we would add sections to the executable, as is done with the Linux
• • build. But PE executables do not appear to work correctly if unexpected
• • sections are present:
• • $ /tmp/b/sandbox/u-boot.exe
• • -bash: /tmp/b/sandbox/u-boot.exe: cannot execute binary file:

Exec format error

• • So we take a approach of rewriting the whole file, for now. This will likely
• • break in the future when a toolchain change is made.

...

your patch looks like it is copied from some binutils version and then modified.

Yes, exactly.

...

Also I do not know from which binutils you have copied and what modification you have done in it.

But I have marked this clearly in the script. See /* U-Boot additions from here on */

I read this, but I have not found from which binutils you took it... There are many released binutils versions and also each binutils version has more PE linker scripts. So it is really hard to track from which it comes. -verbose argument show you the final linker script but we need to know also from which files it was composed...

...

So I cannot react or comment anymore more here.

My idea is that to write those modifications into new layer script.

So I think you are suggesting that I get binutils to emit the default script, then have a script which detects the end of the .rdata section and emits its own stuff in there? That may be more robust, since it is unlikely that the .rdata section will be removed.

Yes, exactly. And you do not need to take and copy default script from binutils to u-boot sources. If you write "layer" linker script (I hope that this is how it is called in LD documentation), then LD automatically uses its own default script and apply your "layer" script on it. So with this way you can completely avoid copy+paste files from binutils to u-boot repository.

But I was rather hoping that someone could help with the core problem, i.e. why I cannot just insert another section into the image, like we do with ELF?

That is interesting. Theoretically it should work but I have not seen it widely used outside of NT kernel modules. So maybe there is some bug in Windows loader for userspace binaries, or another bug in GNU LD, or just a bug in u-boot / linker script.

Could you show linker script which is causing generation of that buggy non-working binary? And ideally can you provide also that buggy EXE binary? I could try to inspect it, but I do not have time to setup MSYS2 environment to compile my own buggy EXE binary.

Regards, Simon

On Tuesday 25 April 2023 18:50:59 Simon Glass wrote:

Hi Pali,

On Tue, 25 Apr 2023 at 13:33, Pali Rohár pali@kernel.org wrote:

...

On Tuesday 25 April 2023 13:23:04 Simon Glass wrote:

...

Hi Pali,

On Tue, 25 Apr 2023 at 12:11, Pali Rohár pali@kernel.org wrote:

...

On Tuesday 25 April 2023 12:01:04 Simon Glass wrote:

...

Hi Pali,

On Tue, 25 Apr 2023 at 10:21, Pali Rohár pali@kernel.org wrote:

...

On Monday 24 April 2023 17:08:15 Simon Glass wrote: > Add a script to allow the U-Boot sandbox executable to be built for > Windows. Add a note as to why this seems to be necessary for now. > > Signed-off-by: Simon Glass sjg@chromium.org > --- > > Makefile | 11 +- > arch/sandbox/config.mk | 4 + > arch/sandbox/cpu/u-boot-pe.lds | 447 +++++++++++++++++++++++++++++++++ > 3 files changed, 460 insertions(+), 2 deletions(-) > create mode 100644 arch/sandbox/cpu/u-boot-pe.lds > > diff --git a/Makefile b/Makefile > index dd3fcd1782e5..0aa97a2c3b48 100644 > --- a/Makefile > +++ b/Makefile > @@ -1730,6 +1730,13 @@ else > u-boot-keep-syms-lto := > endif > > +ifeq ($(MSYS_VERSION),0) > +add_ld_script := -T u-boot.lds > +else > +add_ld_script := u-boot.lds > +$(warning msys) > +endif > + > # Rule to link u-boot > # May be overridden by arch/$(ARCH)/config.mk > ifeq ($(LTO_ENABLE),y) > @@ -1738,7 +1745,7 @@ quiet_cmd_u-boot__ ?= LTO $@ > $(CC) -nostdlib -nostartfiles \ > $(LTO_FINAL_LDFLAGS) $(c_flags) \ > $(KBUILD_LDFLAGS:%=-Wl,%) $(LDFLAGS_u-boot:%=-Wl,%) -o $@ \ > - -T u-boot.lds $(u-boot-init) \ > + $(add_ld_script) $(u-boot-init) \ > -Wl,--whole-archive \ > $(u-boot-main) \ > $(u-boot-keep-syms-lto) \ > @@ -1749,7 +1756,7 @@ quiet_cmd_u-boot__ ?= LTO $@ > else > quiet_cmd_u-boot__ ?= LD $@ > cmd_u-boot__ ?= $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_u-boot) -o $@ \ > - -T u-boot.lds $(u-boot-init) \ > + $(add_ld_script) $(u-boot-init) \ > --whole-archive \ > $(u-boot-main) \ > --no-whole-archive \ > diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk > index 2d184c5f652a..e05daf57ef8e 100644 > --- a/arch/sandbox/config.mk > +++ b/arch/sandbox/config.mk > @@ -71,3 +71,7 @@ EFI_CRT0 := crt0_sandbox_efi.o > EFI_RELOC := reloc_sandbox_efi.o > AFLAGS_crt0_sandbox_efi.o += -DHOST_ARCH="$(HOST_ARCH)" > CFLAGS_reloc_sandbox_efi.o += -DHOST_ARCH="$(HOST_ARCH)" > + > +ifneq ($(MSYS_VERSION),0) > +LDSCRIPT = $(srctree)/arch/sandbox/cpu/u-boot-pe.lds > +endif > diff --git a/arch/sandbox/cpu/u-boot-pe.lds b/arch/sandbox/cpu/u-boot-pe.lds > new file mode 100644 > index 000000000000..031e70fafd03 > --- /dev/null > +++ b/arch/sandbox/cpu/u-boot-pe.lds > @@ -0,0 +1,447 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * U-Boot note: This was obtained by using the -verbose linker option. The > + * U-Boot additions are marked below. > + * > + * Ideally we would add sections to the executable, as is done with the Linux > + * build. But PE executables do not appear to work correctly if unexpected > + * sections are present: > + * > + * $ /tmp/b/sandbox/u-boot.exe > + * -bash: /tmp/b/sandbox/u-boot.exe: cannot execute binary file: Exec format error > + * > + * So we take a approach of rewriting the whole file, for now. This will likely > + * break in the future when a toolchain change is made.

Why not rather provide "layer" linker script which does this "rewriting" on top of the default linker script? With this way it is not needed to update linker script when a toolchain change it.

How can we reliably do that, though? We don't really know the format of the script and where to insert stuff.

Regards, Simon

Well, I do not know what is the current issue. The proposed script in

See the comment at the top of the script:

• • Ideally we would add sections to the executable, as is done with the Linux
• • build. But PE executables do not appear to work correctly if unexpected
• • sections are present:
• • $ /tmp/b/sandbox/u-boot.exe
• • -bash: /tmp/b/sandbox/u-boot.exe: cannot execute binary file:

Exec format error

• • So we take a approach of rewriting the whole file, for now. This will likely
• • break in the future when a toolchain change is made.

...

your patch looks like it is copied from some binutils version and then modified.

Yes, exactly.

...

Also I do not know from which binutils you have copied and what modification you have done in it.

But I have marked this clearly in the script. See /* U-Boot additions from here on */

I read this, but I have not found from which binutils you took it... There are many released binutils versions and also each binutils version has more PE linker scripts. So it is really hard to track from which it comes. -verbose argument show you the final linker script but we need to know also from which files it was composed...

$ ld -V GNU ld (GNU Binutils) 2.40 Supported emulations: i386pep i386pe

sglass@DESKTOP-OHNGJ4K MINGW64 ~/u-boot $ cc -v Using built-in specs. COLLECT_GCC=cc COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-pc-msys/11.3.0/lto-wrapper.exe Target: x86_64-pc-msys Configured with: /c/S/gcc/src/gcc-11.3.0/configure --build=x86_64-pc-msys --prefix=/usr --libexecdir=/usr/lib --enable-bootstrap --enable-shared --enable-shared-libgcc --enable-static --enable-version-specific-runtime-libs --with-arch=x86-64 --with-tune=generic --disable-multilib --enable-__cxa_atexit --with-dwarf2 --enable-languages=c,c++,fortran,lto --enable-graphite --enable-threads=posix --enable-libatomic --enable-libgomp --disable-libitm --enable-libquadmath --enable-libquadmath-support --disable-libssp --disable-win32-registry --disable-symvers --with-gnu-ld --with-gnu-as --disable-isl-version-check --enable-checking=release --without-libiconv-prefix --without-libintl-prefix --with-system-zlib --enable-linker-build-id --with-default-libstdcxx-abi=gcc4-compatible --enable-libstdcxx-filesystem-ts Thread model: posix Supported LTO compression algorithms: zlib

...

...

...

So I cannot react or comment anymore more here.

My idea is that to write those modifications into new layer script.

So I think you are suggesting that I get binutils to emit the default script, then have a script which detects the end of the .rdata section and emits its own stuff in there? That may be more robust, since it is unlikely that the .rdata section will be removed.

Yes, exactly. And you do not need to take and copy default script from binutils to u-boot sources. If you write "layer" linker script (I hope that this is how it is called in LD documentation), then LD automatically uses its own default script and apply your "layer" script on it. So with this way you can completely avoid copy+paste files from binutils to u-boot repository.

That is considerably more complicated, though.

...

...

But I was rather hoping that someone could help with the core problem, i.e. why I cannot just insert another section into the image, like we do with ELF?

That is interesting. Theoretically it should work but I have not seen it widely used outside of NT kernel modules. So maybe there is some bug in Windows loader for userspace binaries, or another bug in GNU LD, or just a bug in u-boot / linker script.

Could you show linker script which is causing generation of that buggy non-working binary? And ideally can you provide also that buggy EXE binary? I could try to inspect it, but I do not have time to setup MSYS2 environment to compile my own buggy EXE binary.

Please see [1] for the file.

sglass@DESKTOP-OHNGJ4K MINGW64 ~/u-boot $ objdump.exe -h /tmp/b/sandbox/u-boot.exe

/tmp/b/sandbox/u-boot.exe: file format pei-x86-64

Sections: Idx Name Size VMA LMA File off Algn 0 .text 00208b98 0000000100401000 0000000100401000 00000600 2**4 CONTENTS, ALLOC, LOAD, READONLY, CODE, DATA 1 __u_boot_list 00014960 0000000100609ba0 0000000100609ba0 00209200 2**2 CONTENTS, ALLOC, LOAD, DATA 2 _u_boot_sandbox_getopt 000000c0 000000010061e500 000000010061e500 0021dc00 2**2 CONTENTS, ALLOC, LOAD, DATA 3 .data 00019a20 000000010061f000 000000010061f000 0021de00 2**4 CONTENTS, ALLOC, LOAD, DATA 4 .rodata.ttf.init 00036e10 0000000100639000 0000000100639000 00237a00 2**2 CONTENTS, ALLOC, LOAD, DATA 5 .rodata.splash.init 00001b20 0000000100670000 0000000100670000 0026ea00 2**2 CONTENTS, ALLOC, LOAD, DATA 6 .rodata.helloworld.init 00003030 0000000100672000 0000000100672000 00270600 2**2 CONTENTS, ALLOC, LOAD, DATA 7 .data.efi_runtime 00000170 0000000100676000 0000000100676000 00273800 2**4 CONTENTS, ALLOC, LOAD, DATA 8 .dtb.init.rodata 000007c0 0000000100677000 0000000100677000 00273a00 2**2 CONTENTS, ALLOC, LOAD, DATA 9 .rdata 000a3fe0 0000000100678000 0000000100678000 00274200 2**4 CONTENTS, ALLOC, LOAD, READONLY, DATA 10 .buildid 00000035 000000010071c000 000000010071c000 00318200 2**2 CONTENTS, ALLOC, LOAD, READONLY, DATA 11 .rodata.efi_runtime 00000400 000000010071d000 000000010071d000 00318400 2**2 CONTENTS, ALLOC, LOAD, READONLY, DATA 12 .pdata 0001785c 000000010071e000 000000010071e000 00318800 2**2 CONTENTS, ALLOC, LOAD, READONLY, DATA 13 .xdata 00016f58 0000000100736000 0000000100736000 00330200 2**2 CONTENTS, ALLOC, LOAD, READONLY, DATA 14 .bss 0001ecc0 000000010074d000 000000010074d000 00000000 2**4 ALLOC 15 .idata 00000894 000000010076c000 000000010076c000 00347200 2**2 CONTENTS, ALLOC, LOAD, DATA 16 .rsrc 000004e8 000000010076d000 000000010076d000 00347c00 2**2 CONTENTS, ALLOC, LOAD, DATA 17 .reloc 00005284 000000010076e000 000000010076e000 00348200 2**2 CONTENTS, ALLOC, LOAD, READONLY, DATA 18 .debug_aranges 0000b720 0000000100774000 0000000100774000 0034d600 2**0 CONTENTS, READONLY, DEBUGGING 19 .debug_info 00a6c954 0000000100780000 0000000100780000 00358e00 2**0 CONTENTS, READONLY, DEBUGGING 20 .debug_abbrev 000cb6b2 00000001011ed000 00000001011ed000 00dc5800 2**0 CONTENTS, READONLY, DEBUGGING 21 .debug_line 001f646a 00000001012b9000 00000001012b9000 00e91000 2**0 CONTENTS, READONLY, DEBUGGING 22 .debug_frame 000a9bd0 00000001014b0000 00000001014b0000 01087600 2**0 CONTENTS, READONLY, DEBUGGING 23 .debug_str 0001d6c1 000000010155a000 000000010155a000 01131200 2**0 CONTENTS, READONLY, DEBUGGING 24 .debug_loc 004673a1 0000000101578000 0000000101578000 0114ea00 2**0 CONTENTS, READONLY, DEBUGGING 25 .debug_ranges 00060260 00000001019e0000 00000001019e0000 015b5e00 2**0 CONTENTS, READONLY, DEBUGGING 26 .debug_line_str 00000264 0000000101a41000 0000000101a41000 01616200 2**0 CONTENTS, READONLY, DEBUGGING

sglass@DESKTOP-OHNGJ4K MINGW64 ~/u-boot $ !$ /tmp/b/sandbox/u-boot.exe -bash: /tmp/b/sandbox/u-boot.exe: cannot execute binary file: Exec format error

I have run readpe parser on this binary and parser crashed! Have not seen such thing it. So I suspect that this binary is broken. I will look at it deeply later. Another thing which I see suspicious in above output are section names. They are too long and cannot fit into PE format which has (small) limit on section names. Not sure if this can be an issue...

Regards, Simon

[1] https://drive.google.com/file/d/1vtJlvCd1BxkhRtQtUe4YqiRizcUP_zB2/view?usp=s...

Am 25. April 2023 01:08:19 MESZ schrieb Simon Glass sjg@chromium.org:

The Linux register format is not used in Windows, so disable this feature.

Signed-off-by: Simon Glass sjg@chromium.org

arch/sandbox/cpu/os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index 5e66304e2b9d..c8b83f923ddb 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -285,7 +285,7 @@ static void os_signal_handler(int sig, siginfo_t *info, void *con) ucontext_t __maybe_unused *context = con; unsigned long pc;

-#if defined(__x86_64__) +#if defined(__x86_64__) && defined(__linux)

In the commit message you only mention Linux and Windows. How about BSD and other POSIX?

pc = context->uc_mcontext.gregs[REG_RIP]; #elif defined(__aarch64__)

__aarch64__ does not imply Linux. There are Windows and other POSIX (BSD, macOS) systems running on ARM.

__riscv, armhf may also occur on different POSIX systems.

Best regards

Heinrich

pc = context->uc_mcontext.pc;

Am 25. April 2023 01:08:22 MESZ schrieb Simon Glass sjg@chromium.org:

The sandbox build makes use of a small number of weak symbols. Allow these to be dropped when building for the PE format, since its support for weak symbols is poor.

This comment does not explain the necessity of the change. Why is it really needed? Has the compiler version in MSYS a problem?

Best regards

Heinrich

Signed-off-by: Simon Glass sjg@chromium.org

cmd/bootefi.c | 3 ++- cmd/bootz.c | 3 +++ common/usb.c | 3 +++ drivers/core/root.c | 3 +++ drivers/spi/sandbox_spi.c | 3 +++ env/env.c | 6 ++++++ lib/efi_loader/efi_image_loader.c | 3 +++ lib/efi_loader/efi_runtime.c | 4 ++++ lib/lmb.c | 4 +++- lib/time.c | 3 +++ 10 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 8aa15a64c836..21e4a87da53a 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -358,7 +358,8 @@ static efi_status_t do_bootefi_exec(efi_handle_t handle, void *load_options) u16 *exit_data = NULL;

/* On ARM switch from EL3 or secure mode to EL2 or non-secure mode */

• switch_to_non_secure_mode();

• if (IS_ENABLED(CONFIG_WEAK_SYMBOLS))

• switch_to_non_secure_mode();
  
  

  /*

  • The UEFI standard requires that the watchdog timer is set to five

diff --git a/cmd/bootz.c b/cmd/bootz.c index f1423573d23d..1ffafbd6f2b9 100644 --- a/cmd/bootz.c +++ b/cmd/bootz.c @@ -13,6 +13,8 @@ #include <log.h> #include <linux/compiler.h>

+#ifdef CONFIG_WEAK_SYMBOLS

int __weak bootz_setup(ulong image, ulong *start, ulong *end) { /* Please define bootz_setup() for your platform */ @@ -20,6 +22,7 @@ int __weak bootz_setup(ulong image, ulong *start, ulong *end) puts("Your platform's zImage format isn't supported yet!\n"); return -1; } +#endif

/*

• zImage booting support

diff --git a/common/usb.c b/common/usb.c index ae9253dfc0ed..cff53254a379 100644 --- a/common/usb.c +++ b/common/usb.c @@ -1220,6 +1220,8 @@ int usb_new_device(struct usb_device *dev) } #endif

+#ifdef CONFIG_WEAK_SYMBOLS

__weak int board_usb_init(int index, enum usb_init_type init) { @@ -1231,6 +1233,7 @@ int board_usb_cleanup(int index, enum usb_init_type init) { return 0; } +#endif /* CONFIG_WEAK_SYMBOLS */

bool usb_device_has_child_on_port(struct usb_device *parent, int port) { diff --git a/drivers/core/root.c b/drivers/core/root.c index c4fb48548bb3..e311f93a08c9 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -347,10 +347,13 @@ int dm_extended_scan(bool pre_reloc_only) } #endif

+#ifdef CONFIG_WEAK_SYMBOLS

__weak int dm_scan_other(bool pre_reloc_only) { return 0; } +#endif

#if CONFIG_IS_ENABLED(OF_PLATDATA_INST) && CONFIG_IS_ENABLED(READ_ONLY) void *dm_priv_to_rw(void *priv) diff --git a/drivers/spi/sandbox_spi.c b/drivers/spi/sandbox_spi.c index f844597d04cf..f68c9f33bdb4 100644 --- a/drivers/spi/sandbox_spi.c +++ b/drivers/spi/sandbox_spi.c @@ -41,12 +41,15 @@ struct sandbox_spi_priv { uint mode; };

+#ifdef CONFIG_WEAK_SYMBOLS

__weak int sandbox_spi_get_emul(struct sandbox_state *state, struct udevice *bus, struct udevice *slave, struct udevice **emulp) { return -ENOENT; } +#endif

uint sandbox_spi_get_speed(struct udevice *dev) { diff --git a/env/env.c b/env/env.c index ad774f41175b..bcc66b4a6a12 100644 --- a/env/env.c +++ b/env/env.c @@ -53,6 +53,8 @@ static struct env_driver *_env_driver_lookup(enum env_location loc) return NULL; }

+#ifdef CONFIG_WEAK_SYMBOLS

static enum env_location env_locations[] = { #ifdef CONFIG_ENV_IS_IN_EEPROM ENVL_EEPROM, @@ -88,6 +90,7 @@ static enum env_location env_locations[] = { ENVL_NOWHERE, #endif }; +#endif /* CONFIG_WEAK_SYMBOLS */

static bool env_has_inited(enum env_location location) { @@ -106,6 +109,8 @@ static void env_set_inited(enum env_location location) gd->env_has_init |= BIT(location); }

+#ifdef CONFIG_WEAK_SYMBOLS

/**

• arch_env_get_location() - Returns the best env location for an arch
• @op: operations performed on the environment

@@ -155,6 +160,7 @@ __weak enum env_location env_get_location(enum env_operation op, int prio) { return arch_env_get_location(op, prio); } +#endif /* CONFIG_WEAK_SYMBOLS */

/**

• env_driver_lookup() - Finds the most suited environment location

diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 26df0da16c93..c473cd58cfb8 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -174,10 +174,13 @@ static efi_status_t efi_loader_relocate(const IMAGE_BASE_RELOCATION *rel, return EFI_SUCCESS; }

+#ifdef CONFIG_WEAK_SYMBOLS

void __weak invalidate_icache_all(void) { /* If the system doesn't support icache_all flush, cross our fingers */ } +#endif

/**

• efi_set_code_and_data_type() - determine the memory types to be used for code

diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index bf54d6ad871d..d7cf3b7e9dc8 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -375,6 +375,9 @@ out: return EFI_EXIT(EFI_UNSUPPORTED); #endif }

+#ifdef CONFIG_WEAK_SYMBOLS

/**

• efi_reset_system() - reset system

@@ -399,6 +402,7 @@ void __weak __efi_runtime EFIAPI efi_reset_system( { return; } +#endif /* CONFIG_WEAK_SYMBOLS */

/**

• efi_reset_system_init() - initialize the reset driver

diff --git a/lib/lmb.c b/lib/lmb.c index b2c233edb64e..f46442aba48a 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -148,9 +148,11 @@ void arch_lmb_reserve_generic(struct lmb *lmb, ulong sp, ulong end, ulong align)

lmb_reserve(lmb, sp, bank_end - sp + 1);

+#ifdef CONFIG_WEAK_SYMBOLS

• if (gd->flags & GD_FLG_SKIP_RELOC) lmb_reserve(lmb, (phys_addr_t)(uintptr_t)_start, gd->mon_len);

+#endif break; } } diff --git a/lib/time.c b/lib/time.c index 00f4a1ac8fb3..e8da2a3aa6a6 100644 --- a/lib/time.c +++ b/lib/time.c @@ -179,6 +179,8 @@ uint64_t usec_to_tick(unsigned long usec) return tick; }

+#ifdef CONFIG_WEAK_SYMBOLS

void __weak __udelay(unsigned long usec) { uint64_t tmp; @@ -188,6 +190,7 @@ void __weak __udelay(unsigned long usec) while (get_ticks() < tmp+1) /* loop till event */ /*NOP*/; } +#endif

/* ------------------------------------------------------------------------- */

Am 25. April 2023 01:08:26 MESZ schrieb Simon Glass sjg@chromium.org:

This works correctly on Linux with ELF but not on Windows with PE, since it creates assembly symbols with invalid names.

Use the lowest/highest valid characters instead. This should still work correctly, since we have no tests starting with $ and none starting with 'z' at present.

Signed-off-by: Simon Glass sjg@chromium.org

include/test/test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/test/test.h b/include/test/test.h index 838e3ce8a8f3..3e3d14878a7b 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -127,8 +127,8 @@ struct unit_test { ll_entry_count(struct unit_test, ut_ ## _suite)

/* Use ! and ~ so that all tests will be sorted between these two values */

This comment needs to be updated.

-#define UNIT_TEST_ALL_START() ll_entry_start(struct unit_test, ut_!) -#define UNIT_TEST_ALL_END() ll_entry_start(struct unit_test, ut_~) +#define UNIT_TEST_ALL_START() ll_entry_start(struct unit_test, ut_$) +#define UNIT_TEST_ALL_END() ll_entry_start(struct unit_test, ut_z)

Can we use ut_zz here?

Best regards

Heinrich

#define UNIT_TEST_ALL_COUNT() (UNIT_TEST_ALL_END() - UNIT_TEST_ALL_START())

/* Sizes for devres tests */

On Monday 24 April 2023 17:08:29 Simon Glass wrote:

Weak symbols are not well supported by the PE format, so disable them.

They are supported by PE format. This is likely issue of (older) toolchain. What about rather requiring better toolchain version and fix special cases of weak functions do not work correctly?

We need to manually ensure that only one function is present in the source code.

Add a Kconfig option to control this and enable it when building for Windows.

Signed-off-by: Simon Glass sjg@chromium.org

Kconfig | 15 +++++++++++++++ include/linux/compiler_attributes.h | 4 ++++ 2 files changed, 19 insertions(+)

diff --git a/Kconfig b/Kconfig index f24e4f0a331e..ca1402d09d10 100644 --- a/Kconfig +++ b/Kconfig @@ -72,6 +72,21 @@ config CLANG_VERSION int default $(shell,$(srctree)/scripts/clang-version.sh $(CC))

+config CC_IS_MSYS

• def_bool $(success,uname -o | grep -q Msys)

+config WEAK_SYMBOLS

• bool "Enable use of weak symbols"
• default y if !CC_IS_MSYS
• help

•  The Portable Executable (PE) format used by Windows does not support
  

•  weak symbols very well. Even where it can be made to work, the __weak
  

•  function attribute cannot be made to work with PE. Supporting weak
  

•  symbols would involve changing the source code in undesirable ways.
  

•  This option controls whether weak symbols are used, or not. When
  

•  disabled, the __weak function attribute does nothing.
  

choice prompt "Optimization level" default CC_OPTIMIZE_FOR_SIZE diff --git a/include/linux/compiler_attributes.h b/include/linux/compiler_attributes.h index 44c9a08d7346..c954109a065b 100644 --- a/include/linux/compiler_attributes.h +++ b/include/linux/compiler_attributes.h @@ -268,6 +268,10 @@

• gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-wea...
• gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Variable-Attributes.html#index-wea...

*/ +#ifdef CONFIG_WEAK_SYMBOLS #define __weak __attribute__((__weak__)) +#else +#define __weak +#endif

#endif /* __LINUX_COMPILER_ATTRIBUTES_H */

2.40.0.634.g4ca3ef3211-goog

On Monday 24 April 2023 17:08:30 Simon Glass wrote:

The MSYS2 compiler does not support some of these options. Drop them to avoid build errors.

Signed-off-by: Simon Glass sjg@chromium.org

Makefile | 2 ++ scripts/Makefile.lib | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile index 0aa97a2c3b48..773260b81d5d 100644 --- a/Makefile +++ b/Makefile @@ -818,7 +818,9 @@ KBUILD_CPPFLAGS += $(KCPPFLAGS) KBUILD_AFLAGS += $(KAFLAGS) KBUILD_CFLAGS += $(KCFLAGS)

+ifeq ($(MSYS_VERSION),0) KBUILD_LDFLAGS += -z noexecstack

What about rather using $(call ...) instead of ifeq?

+endif KBUILD_LDFLAGS += $(call ld-option,--no-warn-rwx-segments)

KBUILD_HOSTCFLAGS += $(if $(CONFIG_TOOLS_DEBUG),-g) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 7b27224b5d44..d309e26aaec8 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -425,7 +425,10 @@ cmd_efi_objcopy = $(OBJCOPY) -j .header -j .text -j .sdata -j .data -j \ $(obj)/%.efi: $(obj)/%_efi.so $(call cmd,efi_objcopy)

-KBUILD_EFILDFLAGS = -nostdlib -zexecstack -znocombreloc -znorelro +KBUILD_EFILDFLAGS = -nostdlib +ifeq ($(MSYS_VERSION),0) +KBUILD_EFILDFLAGS += -zexecstack -znocombreloc -znorelro +endif KBUILD_EFILDFLAGS += $(call ld-option,--no-warn-rwx-segments) quiet_cmd_efi_ld = LD $@ cmd_efi_ld = $(LD) $(KBUILD_EFILDFLAGS) -T $(EFI_LDS_PATH) \ -- 2.40.0.634.g4ca3ef3211-goog

On Monday 24 April 2023 17:08:31 Simon Glass wrote:

Add the required extension to the Makefile rule.

Signed-off-by: Simon Glass sjg@chromium.org

Makefile | 1 + scripts/Makefile.build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile index 773260b81d5d..08eab87d0a11 100644 --- a/Makefile +++ b/Makefile @@ -48,6 +48,7 @@ ifeq ($(MSYS_VERSION),0) export SOEXT := so else export SOEXT := dll +export ELFEXT := .exe

.EXE is not extension for ELF format :-)

Autotools and also other tools use EXEEXT Makefile variable for this. What about following this de-factor standard variable name?

endif

# Avoid funny character set dependencies diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 97dd4a64f6ef..547dc039ceb4 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -309,7 +309,7 @@ quiet_cmd_asn1_compiler = ASN.1 $@ cmd_asn1_compiler = $(objtree)/tools/asn1_compiler $< \ $(subst .h,.c,$@) $(subst .c,.h,$@)

-$(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/tools/asn1_compiler +$(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/tools/asn1_compiler$(ELFEXT) $(call cmd,asn1_compiler)

# Build the compiled-in targets

2.40.0.634.g4ca3ef3211-goog

On Monday 24 April 2023 17:08:32 Simon Glass wrote:

This creates a lot of errors of the form:

`__stack_chk_fail' referenced in section `.text' of ...ltrans.o: defined in discarded section `.text' of common/stackprot.o (symbol from plugin)

This issue should be rather fixed...

Drop LTO for now.

... and until it happens is not CONFIG_LTO for disabling enough?

LTO does not work for more other boards / platforms and it is just _not_ enabled via CONFIG_LTO in those cases...

Signed-off-by: Simon Glass sjg@chromium.org

Makefile | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile index 08eab87d0a11..3a35d14a4497 100644 --- a/Makefile +++ b/Makefile @@ -658,9 +658,11 @@ export EFI_TARGET # binutils target if EFI is natively supported export LTO_ENABLE

# This is y if LTO is enabled for this build. See NO_LTO=1 to disable LTO +ifeq ($(MSYS_VERSION),0) ifeq ($(NO_LTO),) LTO_ENABLE=$(if $(CONFIG_LTO),y) endif +endif

# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use

# that (or fail if absent). Otherwise, search for a linker script in a

2.40.0.634.g4ca3ef3211-goog

Am 25. April 2023 01:08:34 MESZ schrieb Simon Glass sjg@chromium.org:

Add instructions for building u-boot.exe to run on Windows.

Signed-off-by: Simon Glass sjg@chromium.org

doc/build/gcc.rst | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)

diff --git a/doc/build/gcc.rst b/doc/build/gcc.rst index a0650a51db4b..40d0bde52413 100644 --- a/doc/build/gcc.rst +++ b/doc/build/gcc.rst @@ -184,8 +184,43 @@ Important ones are

• clean - remove most generated files but keep the configuration
• mrproper - remove all generated files + config + various backup files

+Building for Windows +--------------------

+Limited support is available for Windows, including building sandbox.

+It is best to use an out-of-tree build, so you can build multiple boards, +with the output in a temporary directory like `/tmp/b`.

+First enable Windows developer mode with `Developer Mode`_. Then run the MSYS2

Please, describe why you suggest to enable developer mode.

According to https://learn.microsoft.com/en-us/windows/security/threat-protection/securit... creation of symbolic links depends on policies and user authorization.

Please, mention the security implications.

Best regards

Heinrich

+shell and enable symbolic links::

• cd
• echo "export MSYS=winsymlinks:nativestrict" >>.bashrc

+Close all MSYS2 shells so that the setting takes effect.

+To build sandbox, first install some required packages::

• pacman install bc bison diffutils flex gcc libgnutls-devel \

•  libutil-linux-devel make openssl-devel python python-setuptools swig
  

+then::

• make O=/tmp/b/sandbox -j$(nproc) sandbox_defconfig all

+Note that it currently only gets as far as running binman, since this doesn't +fully work on Windows.

+You can also build sandbox_spl::

• make O=/tmp/b/sandbox_spl -j$(nproc) sandbox_spl_defconfig all

Installation

The process for installing U-Boot on the target device is device specific. Please, refer to the board specific documentation :doc:`../board/index`.

+.. _`Developer Mode`: https://msdn.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-...

On Tue, Apr 25, 2023 at 10:54 AM Heinrich Schuchardt xypron.glpk@gmx.de wrote:

Am 25. April 2023 01:08:34 MESZ schrieb Simon Glass sjg@chromium.org:

...

Add instructions for building u-boot.exe to run on Windows.

Signed-off-by: Simon Glass sjg@chromium.org

doc/build/gcc.rst | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)

diff --git a/doc/build/gcc.rst b/doc/build/gcc.rst index a0650a51db4b..40d0bde52413 100644 --- a/doc/build/gcc.rst +++ b/doc/build/gcc.rst @@ -184,8 +184,43 @@ Important ones are

• clean - remove most generated files but keep the configuration
• mrproper - remove all generated files + config + various backup files

+Building for Windows +--------------------

Do you mean 'on Windows'?

...

+Limited support is available for Windows, including building sandbox.

+It is best to use an out-of-tree build, so you can build multiple boards, +with the output in a temporary directory like `/tmp/b`.

This chapter sems not to be about building on Windows generally. Are you possibly using MinGW or MinGW-w64? How about cygwin?

The toolchain in the MSYS2 env should be MinGW-w64. cygwin is not for native Windows application build.

Please, describe the build environment accurately.

Wouldn't it be a much saner approach to use WSL? Then we don't need any of the quirks.

WSL is essentially Linux and that's not what Simon wanted to do in this series. Building sandbox under WSL is no different from what it is on a Linux machine.

Regards, Bin