Changeset 054476d in mainline for boot/Makefile.build


Ignore:
Timestamp:
2016-04-21T20:04:16Z (8 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
27f67f5
Parents:
dc0d8b52 (diff), 73b3ecd (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:

Merge arm32 switch over to using asmtool.h macros

File:
1 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.build

    rdc0d8b52 r054476d  
    3131include Makefile.common
    3232
    33 INCLUDES = generic/include
     33INCLUDES = -Igeneric/include -I$(ROOT_PATH)/abi/include
    3434OPTIMIZATION = 3
    3535
    … …  
    3838LFLAGS = --fatal-warnings
    3939
    40 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     40GCC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    4141        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    4242        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    … …  
    4545        -pipe
    4646
    47 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     47ICC_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    4848        -ffreestanding -fno-builtin -nostdlib -nostdinc -Wall -Wmissing-prototypes \
    4949        -Werror-implicit-function-declaration -wd170
    5050
    51 CLANG_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     51CLANG_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    5252        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    5353        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
Note: See TracChangeset for help on using the changeset viewer.