From patchwork Thu Jul 26 18:28:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142993 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp778382ljj; Thu, 26 Jul 2018 11:28:55 -0700 (PDT) X-Received: by 2002:a63:8dca:: with SMTP id z193-v6mr2989080pgd.228.1532629735454; Thu, 26 Jul 2018 11:28:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532629735; cv=none; d=google.com; s=arc-20160816; b=Bcx3pCnfZWb0oCNpiJQlxfWtEVuuoP5UskN9EiZ9NzRi2XF0S2D2KUFhS3AM+PnJqP DGGw0QkFu4hk/yvaJLxxBPjSkIKaT3ROIsHOBpP9+29NjSCCkhCv4YmtO1g0bQHKBLPH bk92v/ESrMWFjhhoAMvSTqm1vLts+qZlkI9qOQCcbjD+uRVbQX4R+geVtgSoB4cV/p80 qJc+u4QeyOblYDGKaGSujBILN4kkQfOerpWMLWBHXwukseb8cgSfBVGVwgi0/ufzMWeO WlcLSOOvJO1I8L+iKoxTyFq4nmgHE6MYiofg3XkYkiU3dQlTHvktsJmg1aoG8TExLXJO Qg7Q== 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=bCeqfbLmTVe7Y+pVy7k6UMUZpdGRrCOT3r6nbzJ/fb4=; b=FXsgl43xE5EN+SnIP6WN5cou9HiiXW5QN3BtjT0aqs0kCJC3nLXfPLRh1ewBAv+VNm NYQy71HxR0S9vCjX3sV+yiANmmZkVtrhJDrdpbKYCabb2FIBbA1vm7w3UUN6JScIjbwI FmJNQ0HQ1z0bHReP72YrgaPqZhWSvf+OtufuLihPU6/aF8V3xtOP9Wy7sghH6F1fIOY2 NgJjgwB3BpuXeKZKDm1HvOzUZFNEfQwIt8+FK2UxX9uUYplcJvKGFjySBZ8HoEYN+/LC R/7PsdnBbaD2XIAEziN2esKzuB1H6XCyDQlizKyfUL+j6k3tAbxe0qJ3kCEH2iW33Hxv pBLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XxcrSzPs; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id p15-v6sor521319pgh.328.2018.07.26.11.28.55 for (Google Transport Security); Thu, 26 Jul 2018 11:28:55 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XxcrSzPs; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.41 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=bCeqfbLmTVe7Y+pVy7k6UMUZpdGRrCOT3r6nbzJ/fb4=; b=XxcrSzPsOTNag0FBOG1K7ZhUxX2SWO1ZeVYxRl7Xshgbkhq+yxIl13ufrRrzMgCaiU H76mP7F//IRcOggJep6w2eP2GQTMYCiSGkMMwJcOQnxA2YX8vgdlESIPV3hNrPX8Ituu w6zVFM4fz/MKM1ByhDSDCGa7rzCw+mdMHhjfw= 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=bCeqfbLmTVe7Y+pVy7k6UMUZpdGRrCOT3r6nbzJ/fb4=; b=YNezaXdmbXNY84WdJNywEiz1cwH6zYPKobiajie+au65Zf+xlf6qS1TY0bL7yAv2mo PFR0wfqldq7jBYwmfx3/0rTaHY+O63+Q4K7WZtHPPZqVsRjMZVUUvUN1CHyJVhke3AqD XeO2bDxpLK9vcutVVNOwVUwfUjAQmWv7XMMIJXTiN+nTvqfgZsZzzUTnwl/oGbthv2vb B8GpBTPMhaceExm7TDrDkZffCSDg6v93f2vITe0L706l2nrR8Lip/Jq5ZkZMDwl2N6ai YUZiGJ052T4+yRrFsQw3DMYgmSZx8BB5/phpLcJ/ZisBvEU5d5X3F88vAIeu0Mg2c0QV 3jkw== X-Gm-Message-State: AOUpUlFs6z1yHoHDpyYRvLiwZYpeJ2CXhKbkxzqhcCEAo+JpjCO/m5Db Y1hmvnKSrip5aHIRTzfgjpmtO7MJ X-Google-Smtp-Source: AAOMgpey8pRbTnsmP9RYjXK/D8EwkcBlt9PLDm5y10t6ZEDWrc9eEm18k/Xvg9VdwSAOBiGow1hERQ== X-Received: by 2002:a63:eb0e:: with SMTP id t14-v6mr2952066pgh.198.1532629734985; Thu, 26 Jul 2018 11:28:54 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id u9-v6sm8646966pfi.104.2018.07.26.11.28.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 Jul 2018 11:28:53 -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 v2] Android.common.mk: define HAVE_TIMESPEC_GET Date: Thu, 26 Jul 2018 11:28:45 -0700 Message-Id: <1532629726-17441-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532629726-17441-1-git-send-email-john.stultz@linaro.org> References: <1532629726-17441-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. 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 --- Android.common.mk | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.7.4 diff --git a/Android.common.mk b/Android.common.mk index 397dc03..3585470 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -89,6 +89,12 @@ LOCAL_CPPFLAGS += \ LOCAL_CONLYFLAGS += \ -std=c99 +# c11 timespec_get is part of bionic as well +# https://android-review.googlesource.com/c/718518 +ifneq ($(shell [ "$(MESA_ANDROID_MAJOR_VERSION)" \< "Q" ]; echo $$?),0) +LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET +endif + ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \