From patchwork Fri Dec 12 12:14:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tim.gore@intel.com X-Patchwork-Id: 5481981 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CCDEEBEEA8 for ; Fri, 12 Dec 2014 12:14:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1783420117 for ; Fri, 12 Dec 2014 12:14:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1FC592010B for ; Fri, 12 Dec 2014 12:14:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0BD036E7BF; Fri, 12 Dec 2014 04:14:38 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 710226E7BF for ; Fri, 12 Dec 2014 04:14:36 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 12 Dec 2014 04:13:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,563,1413270000"; d="scan'208";a="652824592" Received: from tgore-linux.isw.intel.com ([10.102.226.58]) by orsmga002.jf.intel.com with ESMTP; 12 Dec 2014 04:14:34 -0800 From: tim.gore@intel.com To: intel-gfx@lists.freedesktop.org Date: Fri, 12 Dec 2014 12:14:33 +0000 Message-Id: <1418386473-12792-1-git-send-email-tim.gore@intel.com> X-Mailer: git-send-email 2.1.3 Cc: thomas.wood@intel.com Subject: [Intel-gfx] [PATCH i-g-t v2] Android.mk: replace std=c99 with std=gnu99 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tim Gore 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 --- 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.