[vlc-devel] [PATCH] contrib: make HAVE_FPU check consistent with vlc_cpu.h

[Rafaël Carré]

Le 2012-01-28 19:28, Måns Rullgård a écrit :
> Rafaël Carré <funman at videolan.org> writes:
> 
>> ---
>>  contrib/src/main.mak |    8 ++++++++
>>  1 files changed, 8 insertions(+), 0 deletions(-)
>>
>> diff --git a/contrib/src/main.mak b/contrib/src/main.mak
>> index 81e6112..5e077f0 100644
>> --- a/contrib/src/main.mak
>> +++ b/contrib/src/main.mak
>> @@ -29,6 +29,8 @@ CONTRIB_VIDEOLAN := $(VIDEOLAN)/testing/contrib
>>  #
>>  # Machine-dependent variables
>>  #
>> +cppcheck = $(shell echo|$(CC) $(CFLAGS) -E -dM -|grep -E $(1))
>> +
>>  PREFIX ?= $(TOPDST)/$(HOST)
>>  PREFIX := $(abspath $(PREFIX))
>>  ifneq ($(HOST),$(BUILD))
>> @@ -38,6 +40,12 @@ ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
>>  ifneq ($(findstring $(ARCH),i386 sparc sparc64 ppc ppc64 x86_64),)
>>  # This should be consistent with include/vlc_cpu.h
>>  HAVE_FPU = 1
>> +else ifneq ($(findstring $(ARCH),arm),)
>> +ifneq ($(call cppcheck, __VFP_FP__)),)
>> +ifeq ($(call cppcheck, __SOFT_FP__),)
> 
> Should be __SOFTFP__ 

Thanks,

> and no, that's not consistent.

Do you mean we should use the same multiline ifdef and use gcc -P to
trim CPP output ?

>> +HAVE_FPU = 1
>> +endif
>> +endif
>>  endif
>>  ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
>>  HAVE_WIN64 := 1
>> -- 
>> 1.7.8.3
>>
>