| Message ID | 1329756311-20318-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/model.lds.S b/model.lds.S index 3af4e07..fca017b 100644 --- a/model.lds.S +++ b/model.lds.S @@ -11,8 +11,6 @@ OUTPUT_FORMAT("elf32-littlearm") OUTPUT_ARCH(arm) TARGET(binary) -INPUT(./monitor.o) -INPUT(./boot.o) #ifndef SEMIHOSTING INPUT(./uImage) #ifdef USE_INITRD
We were failing to build linux-system-semi.axf in a clean tree because even if SEMIHOSTING was defined we still had a spurious INPUT(boot.o), which is harmless if boot.o exists but fails if it does not. In fact the INPUT() commands for the .o files are unnecessary because ld will pull in the correct .o files because the SECTIONS command has a non-wildcard reference to them. So just drop the unneeded INPUT() commands rather than adding more ifdefs. (The INPUT() commands for the binary blobs are still required.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- v1->v2 : just drop the offending INPUT() commands rather than using ifdefs model.lds.S | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)