Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 7c682dd1 in mainline


Ignore:
Timestamp:
2010-03-23T14:03:05Z (12 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master
Children:
d99c1d2
Parents:
8023571
Message:

simplify makefiles slightly

Location:
kernel
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • kernel/Makefile

    r8023571 r7c682dd1  
    6969SIZEOK_MAP = generic/src/debug/sizeok_map.o
    7070
    71 INCLUDES = generic/include
    72 OPTIMIZATION = 3
    73 
    7471.PHONY: all clean
    7572
     
    8481#
    8582
     83INCLUDES = generic/include
     84OPTIMIZATION = 3
     85
    8686DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
    8787
    88 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
     88GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    8989        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    9090        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
     
    9393        -Werror -pipe
    9494
    95 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
     95ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    9696        -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
    9797        -Werror-implicit-function-declaration -Werror -wd170
     
    101101        -erroff=E_ZERO_SIZED_STRUCT_UNION
    102102
    103 CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
     103CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    104104        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    105105        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
     
    107107        -Werror-implicit-function-declaration -Wwrite-strings \
    108108        -pipe -arch $(CLANG_ARCH)
    109 
    110 LFLAGS = -M
    111 AFLAGS =
    112109
    113110-include arch/$(KARCH)/Makefile.inc
     
    356353
    357354$(RAW): $(LINK) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(SYMTAB_OBJECTS)
    358         $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SYMTAB_OBJECTS) -o $@ -Map $(MAP)
     355        $(LD) $(LFLAGS) -T $(LINK) -M -Map $(MAP) -o $@  $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SYMTAB_OBJECTS)
    359356
    360357$(LINK): $(LINK).in $(DEPEND)
     
    368365
    369366%.o: %.s $(DEPEND)
    370         $(AS) $(AFLAGS) $< -o $@
     367        $(AS) $(AFLAGS) -o $@ $<
    371368ifeq ($(PRECHECK),y)
    372369        $(JOBFILE) $(JOB) $< $@ as asm $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
     
    399396$(REAL_MAP).bin: $(LINK) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS)
    400397        echo $(SYMTAB_SECTION) | $(AS) $(AFLAGS) -o $(EMPTY_MAP)
    401         $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP) -o $@ -Map $(MAP_PREV)
     398        $(LD) $(LFLAGS) -T $(LINK) -M -Map $(MAP_PREV) -o $@  $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP)
    402399        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
    403400        $(GENMAP) $(MAP_PREV) $(DUMP) $@
     
    407404       
    408405        echo $(SYMTAB_SECTION)" .incbin \"$@\"" | $(AS) $(AFLAGS) -o $(SIZEOK_MAP)
    409         $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP) -o $@ -Map $(MAP_PREV)
     406        $(LD) $(LFLAGS) -T $(LINK) -M -Map $(MAP_PREV) -o $@ $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP)
    410407        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
    411408        $(GENMAP) $(MAP_PREV) $(DUMP) $@
  • kernel/arch/ia64/Makefile.inc

    r8023571 r7c682dd1  
    3434ICC_CFLAGS += $(CMN1)
    3535
    36 LFLAGS += -EL
    37 AFLAGS += -mconstant-gp
     36LFLAGS = -EL
     37AFLAGS = -mconstant-gp
    3838
    3939BITS = 64
  • kernel/arch/ppc32/Makefile.inc

    r8023571 r7c682dd1  
    3232
    3333GCC_CFLAGS += -mcpu=powerpc -msoft-float -m32
    34 AFLAGS += -a32
    35 LFLAGS += -no-check-sections -N
     34AFLAGS = -a32
     35LFLAGS = -no-check-sections -N
    3636
    3737BITS = 32
  • kernel/arch/sparc64/Makefile.inc

    r8023571 r7c682dd1  
    3434SUNCC_CFLAGS += -m64 -xarch=sparc -xregs=appl,no%float
    3535
    36 LFLAGS += -no-check-sections -N
     36LFLAGS = -no-check-sections -N
    3737
    3838BITS = 64
Note: See TracChangeset for help on using the changeset viewer.