| Message ID | 20230914091334.1458542-1-songshuaishuai@tinylab.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 505b02957e74f0c5c4655647ccb04bdc945d18f6 |
| Headers | show |
| Series | [-fixes] riscv: Remove duplicate objcopy flag | expand |
On Thu, 14 Sep 2023 02:13:34 PDT (-0700), songshuaishuai@tinylab.org wrote: > There are two duplicate `-O binary` flags when objcopying from vmlinux > to Image/xipImage. > > RISC-V set `-O binary` flag in both OBJCOPYFLAGS in the top-level riscv > Makefile and OBJCOPYFLAGS_* in the boot/Makefile, and the objcopy cmd > in Kbuild would join them together. > > The `-O binary` flag is only needed for objcopying Image, so remove the > OBJCOPYFLAGS in the top-level riscv Makefile. > > Fixes: c0fbcd991860 ("RISC-V: Build flat and compressed kernel images") > Signed-off-by: Song Shuai <songshuaishuai@tinylab.org> > --- > arch/riscv/Makefile | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile > index 1329e060c548..b43a6bb7e4dc 100644 > --- a/arch/riscv/Makefile > +++ b/arch/riscv/Makefile > @@ -6,7 +6,6 @@ > # for more details. > # > > -OBJCOPYFLAGS := -O binary > LDFLAGS_vmlinux := -z norelro > ifeq ($(CONFIG_RELOCATABLE),y) > LDFLAGS_vmlinux += -shared -Bsymbolic -z notext --emit-relocs Does this result in any incorrect behavior? It looks fine to me, but if there's no regression I'll put in on -next instead of -fixes. Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
在 2023/9/20 17:52, Palmer Dabbelt 写道: > On Thu, 14 Sep 2023 02:13:34 PDT (-0700), songshuaishuai@tinylab.org wrote: >> There are two duplicate `-O binary` flags when objcopying from vmlinux >> to Image/xipImage. >> >> RISC-V set `-O binary` flag in both OBJCOPYFLAGS in the top-level riscv >> Makefile and OBJCOPYFLAGS_* in the boot/Makefile, and the objcopy cmd >> in Kbuild would join them together. >> >> The `-O binary` flag is only needed for objcopying Image, so remove the >> OBJCOPYFLAGS in the top-level riscv Makefile. >> >> Fixes: c0fbcd991860 ("RISC-V: Build flat and compressed kernel images") >> Signed-off-by: Song Shuai <songshuaishuai@tinylab.org> >> --- >> arch/riscv/Makefile | 1 - >> 1 file changed, 1 deletion(-) >> >> diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile >> index 1329e060c548..b43a6bb7e4dc 100644 >> --- a/arch/riscv/Makefile >> +++ b/arch/riscv/Makefile >> @@ -6,7 +6,6 @@ >> # for more details. >> # >> >> -OBJCOPYFLAGS := -O binary >> LDFLAGS_vmlinux := -z norelro >> ifeq ($(CONFIG_RELOCATABLE),y) >> LDFLAGS_vmlinux += -shared -Bsymbolic -z notext --emit-relocs > > Does this result in any incorrect behavior? It looks fine to me, but if Nop, objcopy works as it's expected. You can put this patch on -next. > there's no regression I'll put in on -next instead of -fixes. > > Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com> >
Hello: This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <palmer@rivosinc.com>: On Thu, 14 Sep 2023 17:13:34 +0800 you wrote: > There are two duplicate `-O binary` flags when objcopying from vmlinux > to Image/xipImage. > > RISC-V set `-O binary` flag in both OBJCOPYFLAGS in the top-level riscv > Makefile and OBJCOPYFLAGS_* in the boot/Makefile, and the objcopy cmd > in Kbuild would join them together. > > [...] Here is the summary with links: - [-fixes] riscv: Remove duplicate objcopy flag https://git.kernel.org/riscv/c/505b02957e74 You are awesome, thank you!
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 1329e060c548..b43a6bb7e4dc 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -6,7 +6,6 @@ # for more details. # -OBJCOPYFLAGS := -O binary LDFLAGS_vmlinux := -z norelro ifeq ($(CONFIG_RELOCATABLE),y) LDFLAGS_vmlinux += -shared -Bsymbolic -z notext --emit-relocs
There are two duplicate `-O binary` flags when objcopying from vmlinux to Image/xipImage. RISC-V set `-O binary` flag in both OBJCOPYFLAGS in the top-level riscv Makefile and OBJCOPYFLAGS_* in the boot/Makefile, and the objcopy cmd in Kbuild would join them together. The `-O binary` flag is only needed for objcopying Image, so remove the OBJCOPYFLAGS in the top-level riscv Makefile. Fixes: c0fbcd991860 ("RISC-V: Build flat and compressed kernel images") Signed-off-by: Song Shuai <songshuaishuai@tinylab.org> --- arch/riscv/Makefile | 1 - 1 file changed, 1 deletion(-)