From patchwork Mon Jun 24 23:26:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edward Liaw X-Patchwork-Id: 807413 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 041E11A2C2C for ; Mon, 24 Jun 2024 23:29:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719271755; cv=none; b=UIHtIEbuvxAp+IM76r28scNO8fgHbaLwuKVYKVkAg4NbDZ9kJVBjE8ExQovV5EOvlAWi0lkxg7z8GT/aqOZJstWbViqB7jgz1MkMcPaFe4eoudvYMiBTeEX4Accycbjw+NK9vLCjx2S4CRdHWicg9nZ7msQKuXpZqw1CuGo9gF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719271755; c=relaxed/simple; bh=atlaXfghS4B3aXHldxOAsjMJ0B5nS66NiP0mFQbDOQI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qJZ0kDX60/8fGcjCJnA+lMPRuLf8795T4Zx20I4YaYWJ2OyWS+JLc1H7EKOMQMOUdstO5g6vkkpdvJakLltB9mFGNlXEB1xG7lJj3C1mgg5jXokRUAI1tcsXf7ov/iT1deNZ9m1WIO4cNpiGU4plhWBrwtvYQY6lJZ31mQPNfck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=HE0xVtLq; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--edliaw.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HE0xVtLq" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc691f1f83aso2975251276.1 for ; Mon, 24 Jun 2024 16:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719271753; x=1719876553; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=KYsd9Rb/6WE30YP2UPtx0BT+t/C3MbQ4dWAZpecv6Gw=; b=HE0xVtLqFyTZIk51B0Do773ix276wPIFJ8JvYYIGYwtvHZjeME3xxYujVloTFjjZlE oG3ybmiwgGyeycyTSypKEykWXXJLg3kLMG19MdwzUavLWE4SQdIGWmqHLDV/FhMDLzxV TdB7CqFNDa3OsZdR55N2ycYRdN/B7RvARkum0kpkp6ETmcGqkAtWznMRsUMogkz/u7ub j+gMiVmauMYhE13ad1QMiXyha/BIzVrFkDvA0CS1ne7fopxtET4bTfsB3YA4GZdpZ37F Vmklnqr1yzkaeVrS+ur+O/Gz1WFdkyD503/xuMbJC/RNv9eNh+j43Ps7zCPKyNbjVC1h J2tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719271753; x=1719876553; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KYsd9Rb/6WE30YP2UPtx0BT+t/C3MbQ4dWAZpecv6Gw=; b=Id4xd/4EmDpGtzoXKmqvf5crI8P7AMyu3VyMkry04HqiWuN+VQxfcqo0Xxw/i8hVdK LwAVrCt3CjAcpahOUmZ0zFUuWx9gfeKfKMkaECQwHoa+DFxkhrwR4qglVf4W8ghiSLRT LXYbG1FcTkGV/dIqnU/OaFremGyXnQPDcsE57/P5WUwBahWy0/DtqKQVcIB8IkvPANje SgHruzbeKtj5wKL/bKP/fRTAxdpNn5AmI2MPTh11tn3UTAoLigJXFMFUBt4dHqsF0Do1 +E/Jj1xk6a8NjNbnpOwbd7N8X8CvItBuDlm6XmDPa+HgXGuJBnQWd18bDvM2LAsd6dJE QOXg== X-Gm-Message-State: AOJu0Yxrzcdk7anhzAIpsARYRYvW7/omvjn7Mk4DakESe0BEfZpF0O2X ilrShZHbv2dtzUFAMiAK0TxpsfKG0GPWUnIipu308LTLFzn3YevO+c5CewXca9yovHzochU4Fjb 2VUauKyZXTgvlmJKwqu+nXyDrXP00PpGnXm+qJLzNVQch+LxnkOx6Ve/17cDyoJTTrCHmqXAzvh UMJc7zRJYkBGaH69rWLL0PB+auaD5GaiVC6hY+no7GfNiK X-Google-Smtp-Source: AGHT+IEFOOflQzV3wFuvM2R/hnljfPuosO3Jiw9JP4M4awREYhPcttpeymh3r0w5dseA0yzpFfUKTbd9tHI= X-Received: from edliaw.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:305d]) (user=edliaw job=sendgmr) by 2002:a25:aa0f:0:b0:e02:7c5f:e0d5 with SMTP id 3f1490d57ef6-e02fa00e04amr59299276.4.1719271752514; Mon, 24 Jun 2024 16:29:12 -0700 (PDT) Date: Mon, 24 Jun 2024 23:26:12 +0000 In-Reply-To: <20240624232718.1154427-1-edliaw@google.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240624232718.1154427-1-edliaw@google.com> X-Mailer: git-send-email 2.45.2.741.gdbec12cfda-goog Message-ID: <20240624232718.1154427-4-edliaw@google.com> Subject: [PATCH v6 03/13] selftests/net: Append to lib.mk CFLAGS in Makefile From: Edward Liaw To: linux-kselftest@vger.kernel.org, Eric Biederman , Kees Cook , Shuah Khan , Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Darren Hart , Davidlohr Bueso , " =?utf-8?q?Andr=C3=A9_Almeida?= " , Jason Gunthorpe , Kevin Tian , Paolo Bonzini , Andrew Morton , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Fenghua Yu , Reinette Chatre , Paul Walmsley , Palmer Dabbelt , Albert Ou , Jarkko Sakkinen , Dave Hansen Cc: linux-kernel@vger.kernel.org, usama.anjum@collabora.com, seanjc@google.com, kernel-team@android.com, Edward Liaw , linux-mm@kvack.org, iommu@lists.linux.dev, kvm@vger.kernel.org, netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-sgx@vger.kernel.org Instead of overwriting the CFLAGS imported from lib.mk, append instead instead. Also drop -D_GNU_SOURCE from CFLAGS to prevent redefinition warning. Signed-off-by: Edward Liaw --- tools/testing/selftests/net/Makefile | 2 +- tools/testing/selftests/net/tcp_ao/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index bc3925200637..8eaffd7a641c 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for net selftests -CFLAGS = -Wall -Wl,--no-as-needed -O2 -g +CFLAGS += -Wall -Wl,--no-as-needed -O2 -g CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES) # Additional include paths needed by kselftest.h CFLAGS += -I../ diff --git a/tools/testing/selftests/net/tcp_ao/Makefile b/tools/testing/selftests/net/tcp_ao/Makefile index 522d991e310e..bd88b90b902b 100644 --- a/tools/testing/selftests/net/tcp_ao/Makefile +++ b/tools/testing/selftests/net/tcp_ao/Makefile @@ -26,7 +26,7 @@ LIB := $(LIBDIR)/libaotst.a LDLIBS += $(LIB) -pthread LIBDEPS := lib/aolib.h Makefile -CFLAGS := -Wall -O2 -g -D_GNU_SOURCE -fno-strict-aliasing +CFLAGS += -Wall -O2 -g -fno-strict-aliasing CFLAGS += $(KHDR_INCLUDES) CFLAGS += -iquote ./lib/ -I ../../../../include/