[Intel-gfx] [PATCH i-g-t v2] Android.mk: replace std=c99 with std=gnu99

[Thomas Wood]

On 12 December 2014 at 12:14,  <tim.gore at intel.com> wrote:
> From: Tim Gore <tim.gore at intel.com>
>
> The android makefiles were passing the -std=c99 flag to the
> compiler which disables the typeof keyword. This causes a
> build fail for a recent addition to igt_aux.h.
> Change this to -std=gnu99, which is the flag used in the
> linux build
>
> Signed-off-by: Tim Gore <tim.gore at intel.com>

Thanks, I've merged both this and the demos/Android.mk patch.


> ---
>  benchmarks/Android.mk | 2 +-
>  demos/Android.mk      | 2 +-
>  lib/Android.mk        | 2 +-
>  tests/Android.mk      | 2 +-
>  tools/Android.mk      | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
> index 5bb8ef5..14fc0a7 100644
> --- a/benchmarks/Android.mk
> +++ b/benchmarks/Android.mk
> @@ -11,7 +11,7 @@ define add_benchmark
>
>      LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
>      LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h"
> -    LOCAL_CFLAGS += -std=c99
> +    LOCAL_CFLAGS += -std=gnu99
>      # FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit
>      LOCAL_CFLAGS += -Wno-error=return-type
>      # Excessive complaining for established cases. Rely on the Linux version warnings.
> diff --git a/demos/Android.mk b/demos/Android.mk
> index 6227e06..309ab96 100644
> --- a/demos/Android.mk
> +++ b/demos/Android.mk
> @@ -8,7 +8,7 @@ LOCAL_SRC_FILES := intel_sprite_on.c
>
>  LOCAL_CFLAGS += -DHAVE_TERMIOS_H
>  LOCAL_CFLAGS += -DANDROID -UNDEBUG
> -LOCAL_CFLAGS += -std=c99
> +LOCAL_CFLAGS += -std=gnu99
>  # Excessive complaining for established cases. Rely on the Linux version warnings.
>  LOCAL_CFLAGS += -Wno-sign-compare
>
> diff --git a/lib/Android.mk b/lib/Android.mk
> index bd8cf58..548bca4 100644
> --- a/lib/Android.mk
> +++ b/lib/Android.mk
> @@ -25,7 +25,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
>  LOCAL_CFLAGS += -DHAVE_LIBDRM_ATOMIC_PRIMITIVES
>  LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
>  LOCAL_CFLAGS += -DANDROID
> -LOCAL_CFLAGS += -std=c99
> +LOCAL_CFLAGS += -std=gnu99
>  LOCAL_MODULE:= libintel_gpu_tools
>
>  LOCAL_SHARED_LIBRARIES := libpciaccess  \
> diff --git a/tests/Android.mk b/tests/Android.mk
> index 519852a..814b846 100644
> --- a/tests/Android.mk
> +++ b/tests/Android.mk
> @@ -33,7 +33,7 @@ skip_tests_list += pm_rpm
>
>  # set local compilation flags for IGT tests
>  IGT_LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM -DANDROID -UNDEBUG
> -IGT_LOCAL_CFLAGS += -include "check-ndebug.h" -std=c99
> +IGT_LOCAL_CFLAGS += -include "check-ndebug.h" -std=gnu99
>  # FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit
>  IGT_LOCAL_CFLAGS += -Wno-error=return-type
>  # Excessive complaining for established cases. Rely on the Linux version warnings.
> diff --git a/tools/Android.mk b/tools/Android.mk
> index 8ca67f4..39f4512 100644
> --- a/tools/Android.mk
> +++ b/tools/Android.mk
> @@ -12,7 +12,7 @@ define add_tool
>      LOCAL_CFLAGS += -DHAVE_TERMIOS_H
>      LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
>      LOCAL_CFLAGS += -DANDROID -UNDEBUG
> -    LOCAL_CFLAGS += -std=c99
> +    LOCAL_CFLAGS += -std=gnu99
>      # FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit
>      LOCAL_CFLAGS += -Wno-error=return-type
>      # Excessive complaining for established cases. Rely on the Linux version warnings.
> --
> 2.1.3
>