From patchwork Wed Aug 1 23:20:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 143321 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1458952ljj; Wed, 1 Aug 2018 16:20:46 -0700 (PDT) X-Received: by 2002:a63:1d3:: with SMTP id 202-v6mr350443pgb.136.1533165646814; Wed, 01 Aug 2018 16:20:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533165646; cv=none; d=google.com; s=arc-20160816; b=ZsUw947WSPToYyEKAH3um0LNZTZ11w5EqNevo4QPWxDIY9SNa/2ZFxF6fl3ET7p8w/ sEm0tmsyWDPmYEh1ElHsregEADK4Yo8oVSIRNJUyvCR+v7DLigBKdP+iJv5XbDJ9iZC6 N01CMVJObwAWkF7fRBaxF/QUzyAtBAevDcYFRdwXnjqPx7mJ0SDmSgNINg/bSY9Cl8Yq jeXHFhlfrsvsiovTVccMP1LqfejfOAO3MAPlRCzrFCwQYkI4wvfe+6D6qvVOB3fRq9sX q3WfISs6nkxyQ31gLuLuByIzFT8xhLPb9HtUimlD84+ml7FaC/ATmt3DQV1JjEf99oqV wlRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=YaykPc6WgcCVBgebBJCGG6EiMRQQBYqUh8eSNtXWBSc=; b=0pFUqd9yPhBwMr3RD8eU8F4RbPWCqsgHpMqR2tnO56vc+nMFRhGb307WiL7e0q0ukD AiiiZFx8tbvyEupl7UcgHNWHYL6tcvh+H1a/BLcxwwWRlDBAyzl2g/jQOz6YolFtJ5x4 0N5fQIgyYMR/JxokE74f4PV3YYmAGYk4GRxlrm7cFfx/LO0JB+j7JN1RQNfoDaQhzB9o 8aZ2CkSGdaioI/jeIIILA72jmonNfVGUJ6ei7DqpCQ67GG2F7ameYSNA+3rRiIrjDNq8 ItZMeWy43MAZ3HEkkq3S95byKWj4oopwpcWgPyGex1tD2fmr7l2iuf7FIyso5uVkDMcI HQyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=adeBKVn4; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k5-v6sor79339pgp.179.2018.08.01.16.20.46 for (Google Transport Security); Wed, 01 Aug 2018 16:20:46 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=adeBKVn4; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YaykPc6WgcCVBgebBJCGG6EiMRQQBYqUh8eSNtXWBSc=; b=adeBKVn4Nvqg72gfHh+8kMhSJmZXeiVM4Wg/29d5KkK3cZr6ObBVuevR77+3I3co4V Vf+rZTB1H2QdwphndhXbR3bfnH6bqScy5sUeqIPUNJl1yOFCdzKTsVn2xZSGYFx28bNO 4/1ozGRcOcwHg8Vzwwr9xfpnHOiBWDj5ANIuk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YaykPc6WgcCVBgebBJCGG6EiMRQQBYqUh8eSNtXWBSc=; b=tKwbf0JBf1ZpFh7Qp9tv86T+UgyOTyMl3L2ObtyMzDrA5SMmjIBls1H/2qDqlGbWPx S581wBArMb0Nm0nUA6RniRt1ZDn6rtf0yDHkP3/j1kpLehkIMxCj9+Ig8VUtK0mcPadH B3xNHlDRyeCMQ7jeZ5rv+/2cUforOyX4EcA2aFR8sKwTYCkb91yZJLKsjrDZO07T26MJ JmisaWvH/j0Jvm8abD3W0KvVPPqdBNsDGS0fCMdspuLMD+kVnZmAchOMmJa/kX86aKgE o3hq6100wRaWp7UBX0GcmoOc9PFAiRTTR+QKWuS2JtR04zLAqSzcOF/hBHNCBSHebpR4 HS/g== X-Gm-Message-State: AOUpUlF+IT8caEi2ZPKqOlrJQfkAXQWrmHUEE7i3kZIeuoDXkMefAbe9 WsTW1J6KP/7MUYWAWxn8RIK6Xp8N X-Google-Smtp-Source: AAOMgpcZJ5bjCuXpDJheQ8prBj7kChT1KumAhWhbhnji8e/jH2OBNSGrJNL4YDbyPIySGcM0Krdwiw== X-Received: by 2002:a63:d244:: with SMTP id t4-v6mr317550pgi.335.1533165646364; Wed, 01 Aug 2018 16:20:46 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id f186-v6sm150209pgc.4.2018.08.01.16.20.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 16:20:45 -0700 (PDT) From: John Stultz To: mesa-dev@lists.freedesktop.org Cc: Sumit Semwal , Rob Herring , Alistair Strachan , Marissa Wall , Emil Velikov , Rob Clark , John Stultz Subject: [PATCH 2/3 v3] Android.common.mk: define HAVE_TIMESPEC_GET Date: Wed, 1 Aug 2018 16:20:37 -0700 Message-Id: <1533165638-13664-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533165638-13664-1-git-send-email-john.stultz@linaro.org> References: <1533165638-13664-1-git-send-email-john.stultz@linaro.org> From: Sumit Semwal This is a forward port of a patch from the AOSP/master tree: https://android.googlesource.com/platform/external/mesa3d/+/bd30b663f55f8af73a0be4446349c5a2d4c641b0%5E%21/ Since https://android-review.googlesource.com/c/718518 added timespec_get() to bionic, mesa3d doesn't build due to redefinition of timespec_get(). Avoid redefinition by defining HAVE_TIMESPEC_GET flag. Test: build and boot tested db820c to UI. Change-Id: I3dcc8034b48785e45cd3fa50e4d9cf2c684694a0 Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark Reviewed-by: Emil Velikov Signed-off-by: Sumit Semwal Signed-off-by: John Stultz --- v2: Conditionalize it for PLATFORM_VERSION Q and higher v3: Rework conditionalization to numbered releases prior to P (9.0) --- Android.common.mk | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.7.4 diff --git a/Android.common.mk b/Android.common.mk index 397dc03..619b216 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -89,6 +89,13 @@ LOCAL_CPPFLAGS += \ LOCAL_CONLYFLAGS += \ -std=c99 +# c11 timespec_get is part of bionic as well +# https://android-review.googlesource.com/c/718518 +# This means releases from P and earlier won't need this +ifeq ($(filter 5 6 7 8 9, $(MESA_ANDROID_MAJOR_VERSION)),) +LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET +endif + ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \