Re: [Minios-devel] [MINIOS PATCH] build: prepend OBJ_DIR to linker script

[Wei Liu <wei.liu2@xxxxxxxxxx>]

On Tue, Dec 13, 2016 at 03:02:02PM +0000, Wei Liu wrote:
> After 5623e2d2 ("x86: use unified linker script") the linker script for
> x86 build is generated. But the special rule to generate linker script
> doesn't have OBJ_DIR prepended so in parallel build the same file is
> written multiple times. This is racy and would cause parallel build to
> fail.
> 
> Fix this by prepending OBJ_DIR to the path of linker script. Change
> other variables where necessary.
> 
> Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>

This also needs to be backported to 4.8.

> ---
>  Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 1d2324c..74f2c31 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -24,7 +24,7 @@ include minios.mk
>  LDLIBS := 
>  APP_LDLIBS := 
>  LDARCHLIB := -L$(OBJ_DIR)/$(TARGET_ARCH_DIR) -l$(ARCH_LIB_NAME)
> -LDFLAGS_FINAL := -T $(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds 
> $(ARCH_LDFLAGS_FINAL)
> +LDFLAGS_FINAL := -T 
> $(OBJ_DIR)/$(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds 
> $(ARCH_LDFLAGS_FINAL)
>  
>  # Prefix for global API names. All other symbols are localised before
>  # linking with EXTRA_OBJS.
> @@ -156,10 +156,10 @@ APP_O=$(OBJ_DIR)/$(TARGET)_app.o
>  endif
>  
>  # Special rule for x86 for now
> -arch/x86/minios-x86%.lds:  arch/x86/minios-x86.lds.S
> +$(OBJ_DIR)/arch/x86/minios-x86%.lds:  arch/x86/minios-x86.lds.S
>       $(CPP) $(ASFLAGS) -P $< -o $@
>  
> -$(OBJ_DIR)/$(TARGET): $(OBJS) $(APP_O) arch_lib 
> $(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds
> +$(OBJ_DIR)/$(TARGET): $(OBJS) $(APP_O) arch_lib 
> $(OBJ_DIR)/$(TARGET_ARCH_DIR)/minios-$(MINIOS_TARGET_ARCH).lds
>       $(LD) -r $(LDFLAGS) $(HEAD_OBJ) $(APP_O) $(OBJS) $(LDARCHLIB) $(LDLIBS) 
> -o $@.o
>       $(OBJCOPY) -w -G $(GLOBAL_PREFIX)* -G _start $@.o $@.o
>       $(LD) $(LDFLAGS) $(LDFLAGS_FINAL) $@.o $(EXTRA_OBJS) -o $@
> -- 
> 2.1.4
> 

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/cgi-bin/mailman/listinfo/minios-devel