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

Changeset 827d73f in mainline for kernel/Makefile.build


Ignore:
Timestamp:
2010-02-12T14:09:22Z (12 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master
Children:
a70bda4
Parents:
918e9910 (diff), e70edd1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged the actual head

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/Makefile.build

    r918e9910 r827d73f  
    5555        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    5656        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    57         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Werror \
    58         -pipe
     57        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
     58        -Werror-implicit-function-declaration -Werror -pipe
    5959
    6060ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
    6161        -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
    62         -Werror -wd170
     62        -Werror-implicit-function-declaration -Werror -wd170
    6363
    6464SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
     
    186186        generic/src/ddi/device.c \
    187187        generic/src/debug/symtab.c \
     188        generic/src/debug/stacktrace.c \
    188189        generic/src/interrupt/interrupt.c \
    189190        generic/src/main/main.c \
     
    375376%.o: %.S $(DEPEND)
    376377        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
     378ifeq ($(PRECHECK),y)
     379        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(GCC_CFLAGS) -D__ASM__
     380endif
    377381
    378382%.o: %.s $(DEPEND)
    379383        $(AS) $(AFLAGS) $< -o $@
     384ifeq ($(PRECHECK),y)
     385        $(JOBFILE) $(JOB) $< $@ as asm $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
     386endif
    380387
    381388#
     
    385392test/fpu/%.o: test/fpu/%.c $(DEPEND)
    386393        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) -c $< -o $@
    387 ifeq ($(EXTRA_TOOL),stanse)
    388         ../tools/jobfile.py $(JOB) $< $@ $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
     394ifeq ($(PRECHECK),y)
     395        $(JOBFILE) $(JOB) $< $@ cc test $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
    389396endif
    390397
     
    394401%.o: %.c $(DEPEND)
    395402        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) -c $< -o $@
    396 ifeq ($(EXTRA_TOOL),stanse)
    397         ../tools/jobfile.py $(JOB) $< $@ $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)
     403ifeq ($(PRECHECK),y)
     404        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)
    398405endif
    399406
     
    405412        $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP) -o $@ -Map $(MAP_PREV)
    406413        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
    407         tools/genmap.py $(MAP_PREV) $(DUMP) $@
     414        $(GENMAP) $(MAP_PREV) $(DUMP) $@
    408415       
    409416        # Do it once again, this time to get correct even the symbols
     
    413420        $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP) -o $@ -Map $(MAP_PREV)
    414421        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
    415         tools/genmap.py $(MAP_PREV) $(DUMP) $@
     422        $(GENMAP) $(MAP_PREV) $(DUMP) $@
    416423
    417424$(DEPEND): $(ARCH_INCLUDE) $(GENARCH_INCLUDE)
Note: See TracChangeset for help on using the changeset viewer.