[PATCH 02/12] arm: Makefile: rework makefile to handle armv8

[Raphaël Poggi]

2016-06-03 9:27 GMT+02:00 Sascha Hauer <s.hauer at pengutronix.de>:
> On Thu, Jun 02, 2016 at 10:06:48AM +0200, Raphael Poggi wrote:
>> Signed-off-by: Raphael Poggi <poggi.raph at gmail.com>
>> ---
>>  arch/arm/Makefile | 30 ++++++++++++++++++++++++++++--
>>  1 file changed, 28 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
>> index 5ccdb83..df4832f 100644
>> --- a/arch/arm/Makefile
>> +++ b/arch/arm/Makefile
>> @@ -1,7 +1,11 @@
>>
>>  CPPFLAGS     += -D__ARM__ -fno-strict-aliasing
>>  # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb:
>> +ifeq ($(CONFIG_CPU_V8),y)
>> +CPPFLAGS     +=$(call cc-option,-maarch64,)
>> +else
>>  CPPFLAGS     +=$(call cc-option,-marm,)
>> +endif
>>
>>  ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
>>  CPPFLAGS     += -mbig-endian
>> @@ -17,7 +21,9 @@ endif
>>  # at least some of the code would be executed with MMU off, lets be
>>  # conservative and instruct the compiler not to generate any unaligned
>>  # accesses
>> +ifeq ($(CONFIG_CPU_V8),n)
>>  CFLAGS += -mno-unaligned-access
>> +endif
>>
>>
>>  # This selects which instruction set is used.
>> @@ -33,12 +39,17 @@ arch-$(CONFIG_CPU_32v4T)  :=-D__LINUX_ARM_ARCH__=4 -march=armv4t
>>  tune-$(CONFIG_CPU_ARM920T)   :=-mtune=arm9tdmi
>>  tune-$(CONFIG_CPU_ARM926T)   :=-mtune=arm9tdmi
>>  tune-$(CONFIG_CPU_XSCALE)    :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
>> +arch-$(CONFIG_CPU_64v8)              := -D__LINUX_ARM_ARCH__=8 $(call cc-option,-march=armv8-a)
>
> Can we move this above the arch-$(CONFIG_CPU_32v7) line?

Yes, no problem.

>
>>
>> +ifeq ($(CONFIG_CPU_V8), y)
>> +CFLAGS_ABI   :=-mabi=lp64
>> +else
>>  ifeq ($(CONFIG_AEABI),y)
>>  CFLAGS_ABI   :=-mabi=aapcs-linux -mno-thumb-interwork
>>  else
>>  CFLAGS_ABI   :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
>>  endif
>> +endif
>>
>>  ifeq ($(CONFIG_ARM_UNWIND),y)
>>  CFLAGS_ABI   +=-funwind-tables
>> @@ -51,8 +62,13 @@ CFLAGS_THUMB2      :=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)
>>  AFLAGS_THUMB2        :=$(CFLAGS_THUMB2) -Wa$(comma)-mthumb
>>  endif
>>
>> +ifeq ($(CONFIG_CPU_V8), y)
>> +CPPFLAGS += $(CFLAGS_ABI) $(arch-y) $(tune-y)
>> +AFLAGS   += -include asm/unified.h
>> +else
>>  CPPFLAGS += $(CFLAGS_ABI) $(arch-y) $(tune-y) -msoft-float $(CFLAGS_THUMB2)
>>  AFLAGS   += -include asm/unified.h -msoft-float $(AFLAGS_THUMB2)
>> +endif
>>
>>  # Machine directory name.  This list is sorted alphanumerically
>>  # by CONFIG_* macro name.
>> @@ -78,6 +94,7 @@ machine-$(CONFIG_ARCH_VEXPRESS)             := vexpress
>>  machine-$(CONFIG_ARCH_TEGRA)         := tegra
>>  machine-$(CONFIG_ARCH_UEMD)          := uemd
>>  machine-$(CONFIG_ARCH_ZYNQ)          := zynq
>> +machine-$(CONFIG_ARCH_VIRT)          := virt
>
> This hunk belongs to the patch adding mach-virt.

Oops you are right, I will correct it in v2.

>
> Otherwise this looks fine to me.
>
> Sascha
>
> --
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
>
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox