Changes in kernel/Makefile.build [101d9f4:f6069801] in mainline


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/Makefile.build

    r101d9f4 rf6069801  
    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 \
    58         -Werror-implicit-function-declaration -Werror -pipe
     57        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Werror \
     58        -pipe
    5959
    6060ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
    6161        -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
    62         -Werror-implicit-function-declaration -Werror -wd170
     62        -Werror -wd170
    6363
    6464SUNCC_CFLAGS = -I$(INCLUDES) -xO$(OPTIMIZATION) \
     
    115115        OBJCOPY = $(BINUTILS_PREFIX)objcopy
    116116        OBJDUMP = $(BINUTILS_PREFIX)objdump
     117        LIBDIR = /usr/lib
    117118        CFLAGS = $(GCC_CFLAGS)
    118119        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     
    126127        OBJCOPY = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objcopy
    127128        OBJDUMP = $(TOOLCHAIN_DIR)/bin/$(TARGET)-objdump
     129        LIBDIR = $(TOOLCHAIN_DIR)/lib
    128130        CFLAGS = $(GCC_CFLAGS)
    129131        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     
    137139        OBJCOPY = objcopy
    138140        OBJDUMP = objdump
     141        LIBDIR = /usr/lib
    139142        CFLAGS = $(ICC_CFLAGS)
    140143        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     
    148151        OBJCOPY = $(BINUTILS_PREFIX)objcopy
    149152        OBJDUMP = $(BINUTILS_PREFIX)objdump
     153        LIBDIR = /usr/lib
    150154        CFLAGS = $(SUNCC_CFLAGS)
    151155        DEFS += $(CONFIG_DEFS)
     
    160164        OBJCOPY = $(BINUTILS_PREFIX)objcopy
    161165        OBJDUMP = $(BINUTILS_PREFIX)objdump
     166        LIBDIR = /usr/lib
    162167        CFLAGS = $(CLANG_CFLAGS)
    163168        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     
    371376%.o: %.S $(DEPEND)
    372377        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
    373 ifeq ($(PRECHECK),y)
    374         $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(GCC_CFLAGS) -D__ASM__
    375 endif
    376378
    377379%.o: %.s $(DEPEND)
    378380        $(AS) $(AFLAGS) $< -o $@
    379 ifeq ($(PRECHECK),y)
    380         $(JOBFILE) $(JOB) $< $@ as asm $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
    381 endif
    382381
    383382#
     
    387386test/fpu/%.o: test/fpu/%.c $(DEPEND)
    388387        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) -c $< -o $@
    389 ifeq ($(PRECHECK),y)
    390         $(JOBFILE) $(JOB) $< $@ cc test $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
     388ifeq ($(EXTRA_TOOL),stanse)
     389        ../tools/jobfile.py $(JOB) $< $@ $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
    391390endif
    392391
     
    396395%.o: %.c $(DEPEND)
    397396        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) -c $< -o $@
    398 ifeq ($(PRECHECK),y)
    399         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)
     397ifeq ($(EXTRA_TOOL),stanse)
     398        ../tools/jobfile.py $(JOB) $< $@ $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS)
    400399endif
    401400
     
    407406        $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(EMPTY_MAP) -o $@ -Map $(MAP_PREV)
    408407        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
    409         $(GENMAP) $(MAP_PREV) $(DUMP) $@
     408        tools/genmap.py $(MAP_PREV) $(DUMP) $@
    410409       
    411410        # Do it once again, this time to get correct even the symbols
     
    415414        $(LD) -T $(LINK) $(LFLAGS) $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) $(EXTRA_OBJECTS) $(SIZEOK_MAP) -o $@ -Map $(MAP_PREV)
    416415        $(OBJDUMP) -t $(ARCH_OBJECTS) $(GENARCH_OBJECTS) $(GENERIC_OBJECTS) > $(DUMP)
    417         $(GENMAP) $(MAP_PREV) $(DUMP) $@
     416        tools/genmap.py $(MAP_PREV) $(DUMP) $@
    418417
    419418$(DEPEND): $(ARCH_INCLUDE) $(GENARCH_INCLUDE)
Note: See TracChangeset for help on using the changeset viewer.