From patchwork Tue Jul 24 23:21:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 142836 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp141218ljj; Tue, 24 Jul 2018 16:21:51 -0700 (PDT) X-Received: by 2002:a62:a119:: with SMTP id b25-v6mr19411508pff.163.1532474511710; Tue, 24 Jul 2018 16:21:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532474511; cv=none; d=google.com; s=arc-20160816; b=uXdoG0XIjrfePBhkVcvgFLr9ynmCHhGv5TMFtUDnSm8RjspCuypDpJ/h8gHDc3hmwL +UfMvFeQEEM0QcWMyg0yel0CbTmNuWivz/xcDtgFTPJAy3uht/3oDorh75vc/8kgZUz8 Gv8hYwNGioVBzu1hUKk2S/sq66hlN3C7ztvaPs5TFCFGQoC+A6tPfywGtkvLr2USQLam prWqkelta+MuObpvXGBXJldbi5VdGYm0qyNB19SM9BppDhD4F1e1GM24QWCJA4vd6qdQ kruS0fqfzMxdXrEmSg09QlIIWyd2GjMZYOLulLBCOYlE6/wutwp8fFa5MaBROTjFabQA sgIQ== 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=oSBiW6Gp+a9Mqbhwb5aTxA2Id6BrVKokQ+T84xOJdrQ=; b=CjHG0k2aLDhrisc6deh/4zz9BId9wFbrdi/8mo8SBFXNLL9GnlQz5Mni+d5e8nIs/t H5dRFz2ITX6aFz4Y5nT5zymNt5vJtjPJNehUh+QkHy1g0w0E0HwBaVn+VES9LJhDHKQj ebk5LcGAIOpruq3wECaoHcyNjIGkVeWJbvEFcCbZYKs5PZMs6fT2H4KI17hEQe0ccrnR 4cpBkFvPw9JkOSSXd1ACoVfp6pwysJZHuXAmQvxrSofdhnnoGlJjfwwas1DK/1CyFCDl dg1T0Ivbcu/NufevFskReO8/kS+P+TQgWG1tSHJgbJJQI4aaks/9Ff+eWzz0N1AGKI5w y/BQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="VQc/qdxT"; 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 a15-v6sor3514314pgh.229.2018.07.24.16.21.51 for (Google Transport Security); Tue, 24 Jul 2018 16:21:51 -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="VQc/qdxT"; 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=oSBiW6Gp+a9Mqbhwb5aTxA2Id6BrVKokQ+T84xOJdrQ=; b=VQc/qdxTCP8INT4cfIIDmj6B1XXrdFVnatZQ/BnMxTGijHmtoTrPL52fq423ZzNHiP RNDBDxceS05U/2Lcb3IpBrUZoIErZ/PkM62whInKFzqNJ85XOyOCUt+fdZM0ND79gRMJ HKa9e95r8UdblKO9T6wc4Dw04dNF25Org2eUU= 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=oSBiW6Gp+a9Mqbhwb5aTxA2Id6BrVKokQ+T84xOJdrQ=; b=bburHbf3wYNfckGMyIYRkZFMCo5wEbTEHj8AwAvWPCAllcJneje86Xo0l+okKFUOcY ilzqqRWiUeyjDtFS+eq6+ej/TpfJ0CBLRU9tu6iUrAhP67vJXhClv+ntXWg+ftPaADpU A1jPKMNksCKhFz98TdGVLkcc3goqJW3+UoSN8Fby0XIy5DBUAXFimOpVvlDG3VtbIC39 FtxrGtrmJFjBMCrzzp0+sH0Fm2Cz+7XSqg+/9oQ38flncjDDPHdpAWM0ZMuRe4QPRO7N a6obzEVYjiiISAL1SYmNXNqZwWkg2tfyK/1xx+hqLLXHx7yp45y0Yg1q8T8rADuicLdV lpRA== X-Gm-Message-State: AOUpUlGfmaA5ZMVqXQ4cS6UBCajxJRL9KGhUY4ChZ4/ddObWxFg/VLRX Z+ZGY53RGLfqtOXvrWJwqHXjjigW X-Google-Smtp-Source: AAOMgpfwpmRlagRY5hfA+QDHjJaqZOQPwSnzmJpQgWwS1vF7u9ebcqrIDL/ZXT6QpM0zmdfk833/Og== X-Received: by 2002:a62:c505:: with SMTP id j5-v6mr19216236pfg.153.1532474511193; Tue, 24 Jul 2018 16:21:51 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:600:5100:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id t9-v6sm8509753pgi.87.2018.07.24.16.21.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jul 2018 16:21:50 -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: [RFC][PATCH 2/5] Android.common.mk: define HAVE_TIMESPEC_GET Date: Tue, 24 Jul 2018 16:21:39 -0700 Message-Id: <1532474502-17657-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532474502-17657-1-git-send-email-john.stultz@linaro.org> References: <1532474502-17657-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 Signed-off-by: Sumit Semwal Signed-off-by: John Stultz --- Android.common.mk | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4 diff --git a/Android.common.mk b/Android.common.mk index 397dc03..e7828af 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -89,6 +89,10 @@ LOCAL_CPPFLAGS += \ LOCAL_CONLYFLAGS += \ -std=c99 +# c11 timespec_get is part of bionic as well +# https://android-review.googlesource.com/c/718518 +LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET + ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \