diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-11 09:55:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-11 09:55:56 -0400 |
| commit | 20be7c19a2d6d4a994c40c014ae53b39bdcfacf1 (patch) | |
| tree | ed222f4adeea81c61a6272d192870b2e219a2050 | |
| parent | c4c32e359662aa95d9dbda2bd1272181bd9cb830 (diff) | |
| parent | db9d55e2103351cfc8925aadaf5584fe84f61c9f (diff) | |
| download | u-boot-20be7c19a2d6d4a994c40c014ae53b39bdcfacf1.zip u-boot-20be7c19a2d6d4a994c40c014ae53b39bdcfacf1.tar.gz u-boot-20be7c19a2d6d4a994c40c014ae53b39bdcfacf1.tar.bz2 | |
Merge branch '2022-10-10-LLVM-related-improvements'
- A few patches to make building with LLVM/LLD easier
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common/spl/spl_atf.c | 2 | ||||
| -rw-r--r-- | examples/standalone/stubs.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -1023,7 +1023,7 @@ LDFLAGS_u-boot += $(LDFLAGS_FINAL) LDFLAGS_u-boot += $(call ld-option, --no-dynamic-linker) # ld.lld support -LDFLAGS_u-boot += -z notext +LDFLAGS_u-boot += -z notext $(call ld-option,--apply-dynamic-relocs) LDFLAGS_u-boot += --build-id=none diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index e1b68dd..bae5c01 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -184,7 +184,7 @@ __weak struct bl_params *bl2_plat_get_bl31_params_v2(uintptr_t bl32_entry, static inline void raw_write_daif(unsigned int daif) { - __asm__ __volatile__("msr DAIF, %0\n\t" : : "r" (daif) : "memory"); + __asm__ __volatile__("msr DAIF, %x0\n\t" : : "r" (daif) : "memory"); } typedef void (*atf_entry_t)(struct bl31_params *params, void *plat_params); diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c index ce05f41..6511557 100644 --- a/examples/standalone/stubs.c +++ b/examples/standalone/stubs.c @@ -14,7 +14,7 @@ struct cmd_tbl; * from flash memory. The global_data address is passed as argv[-1] * to the application program. */ -static struct jt_funcs *jt; +struct jt_funcs *jt; gd_t *global_data; #define EXPORT_FUNC(f, a, x, ...) \ |