From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0064.outbound.protection.outlook.com [157.56.111.64]) by dpdk.org (Postfix) with ESMTP id 38A743239 for ; Thu, 26 May 2016 13:21:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=khkENnDhI7MB9AbsPYu1hbGXjEAV2WRCIFILlLGbjlw=; b=JkzMEPDrrfPIgB7IINUaD3uS47zhGjD5BVIxR9+UaeUeSttzPxsFlWB5zbAKlGqwF11iGIugmwFeuBEJvqu122aXElJ9NZC5pCxkJDTh5DP6gFhI9UB8USq1KDK+Q+h7+AViy6ssEotnJXACZbWOZuTOgeUyRAINlj745y7wLR0= Authentication-Results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from localhost.caveonetworks.com (111.93.218.67) by BLUPR0701MB1715.namprd07.prod.outlook.com (10.163.85.141) with Microsoft SMTP Server (TLS) id 15.1.497.12; Thu, 26 May 2016 11:20:59 +0000 From: Jerin Jacob To: CC: , , Jerin Jacob Date: Thu, 26 May 2016 16:50:14 +0530 Message-ID: <1464261614-895-1-git-send-email-jerin.jacob@caviumnetworks.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: MAXPR01CA0024.INDPRD01.PROD.OUTLOOK.COM (10.164.147.31) To BLUPR0701MB1715.namprd07.prod.outlook.com (10.163.85.141) X-MS-Office365-Filtering-Correlation-Id: 67c765d1-fff3-4ff6-7100-08d38557d200 X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1715; 2:pwAL7nF9VPlqYVEtUtK+wVyq8NolMJdGLGwVknx2Lh8NDgut7O85ewFcO2DYZIEXaGxzTwKB75gbNkgOgwekjg2wDdcM4Tf6/7Mx7Jrz7n3L0OA6hTa86t7qOR3yAkUj37WLYzjwwyVBJAV6a3kW3WiEQugqTbW8x0VxNjxrV239E3kSvfwO+9tiHdeFdiHg; 3:rjKRFZQPO1HynS6HYzLP4wD6jAZWFcx3jYkuyKLsUoAyFkL1jSQTQqSUm+NqH9Uevs8vj9ZfwBSvLAtNgNyetlySzT4ulz3cfxaakwlKwpIUxSZBh+0OWXHnxT/fL6t0 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0701MB1715; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1715; 25:5YAl49aCSmMsBOsp3kIyzDWD2aM/pGZ+gthY1TUc+DANRi2PX24I0Equ8wjdw2EEhipe3ztVNVRZgJtChg10tiWMTvK4yYcdIOZ2EwKsnzyQDEDRyldXCJD9/sw7UcFHDKPp1QrXGI0U89zqheHXx5noytRv1092ubqfctN954XPNw93LP3dna3f/lgGwrlupgXKLgZEpZyznteFU7NC7MqPq2KH9w9dIHpYoooTkdRjnCXrmBi3VDszPvKj0DRAB+gMMDv778Kp+tILTAF9OpJHCTQaDHm3YLaQpwjzKYxKKh5zQluxtV9+qMQPGsdQKjlbBiLynEwZBIz5qYhJlCQIjdHKDE07lNTPlxj2oR+5SeIUoW3a1TxI1/LQgWLCT0NS2SbCotEKR8zV9bG7JvOggAeLurPk2Pk05hj06rRx3DMusHECtGuGr3S3IDghjhxj7m0MnzGHIFonu70O7IGYxhycuU9CsSae8hPLZTnJkEaisTRYKH5MBqCNJRBMA/q8LcThHHwE4KwytR/g9l0QFRaugUTFPutMDraHUlLKqj5Vz9QXjtPP63H8n8hcEbP65F/nA92FU2zUNufobkYKopldvTyP4OlCM8SKuxuM8leVOLlYfMIkvxwCaJqW3Qx6/NtCOFdwD0d9DJg2iK+dH1tl45bCGd/2WtYdV9GTtM8NHTB1OwxkMi2dXiRAg/85jrFDa+uxsKyzAxQ7rIIdEaAnM8EFQH3OH2kOhjO5xpMxFQke1PVwI89tG5FY X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1715; 20:wuIO2nJos+/j/QYep5hlGHbaTkBVBRmMr/ueX6GQvKQehK8o+1mTo1BCOymtxYfnR4km4YclRVStMLrhQDmyiZ8ePnC0dE2CQ+7tx/ToJ5UOpMUyhFS7tywbROHuOjFTQ7xFvKn5/IqFT9qN5jOqK+5JRrwYouD9DAXG9AvAIuI/wabo3dcV9ktWWvwkizff3FnmILc5zWjlRlH0sOeobRv0V23kJOQghNh6W5meGD1xUZ2z5XmJ4rTENMn7JMMBj0A2uZayhLiXvsmud5z/xTFNIPQbzopKhTK/jND48A+A2n4Cn7u2Lrc8loLFqUVal/BFL0lJlUtlH32YW30I83Zs1ZlAMMft+9iodL6wiUX6vH5yIlF9mObm8ol0X2B5nWLVKQIbFYmESP5Co4j7hYHL6fRQk3VVlVwzz1YgqszPYaBtzi3Y5X05uF2zHlpKJG85YiF0qfZgtGfIOnj7UqNKmP0IshzO/xMRAzvUsJ0QmsPnD9sDOL3OjmP0TDScsbRcmGdoNv07MBKCyakL9h4zIaFtHrxBoxJcfKhg0q0I+vJKWBnJngIVTv987GclfvCwYO7KDAyz/mpW0zG4xasurVBJ162YCr6jDld0Gws= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046); SRVR:BLUPR0701MB1715; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0701MB1715; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1715; 4:iGIAyA85Jw9PbLSD2rk4YE5WpySLoZUfz5+zBX7ssPsvjZCjmFaWdpa3jIE7j/NQ1XQ5iGdlxU9uWzcCybaN6D/bBo2NcllJURNLFazCrB+ZHv5uMkmmvmNwubH1L5CrYurgA9gP0coWlQabhSjLYlqqhscUJp5ffDSjCf04QBXP8DdB+mC3bETL3ccaq5/RDwVaCpQkeQA2/NRO7sQ4Bv3+dNomDdygUJ0dbAUcEg0+K84e7gh8exNnO2FW8bnUr0EOumcIgxXgAJup5OaLHgcA/ZBZlH/oAufyxccsE00Hny5ZLxvhIPXXhvxy7c4W6fSNGevvxKvMmFVMcH1W3c6Zp2t8nA+sOYxb57KVAJPiuFob6VO/2B6F2GPH+CrY X-Forefront-PRVS: 0954EE4910 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6069001)(6009001)(5004730100002)(189998001)(81166006)(66066001)(36756003)(110136002)(107886002)(92566002)(8676002)(50226002)(77096005)(4326007)(2906002)(3846002)(5008740100001)(19580395003)(19580405001)(229853001)(47776003)(4001430100002)(48376002)(586003)(50986999)(5003940100001)(5009440100003)(50466002)(33646002)(2351001)(76506005)(42186005)(53416004)(6116002)(7099028); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0701MB1715; H:localhost.caveonetworks.com; FPR:; SPF:None; MLV:nov; PTR:InfoNoRecords; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0701MB1715; 23:PgH16S3KZ6/aQeBfe7iEIi6o+ioB26AxGAaXC8C?= =?us-ascii?Q?F2gz20U9X5tNK0gbrUMFetRJmvvadLUmJcyaiwju8pmzRERedUriiu440coA?= =?us-ascii?Q?vc5qBpc2N4PFdtMtHpMFzYxHfBju37AmvQYxOzEFI0CvNl+QoLlirs/gcpBS?= =?us-ascii?Q?VmdLkZH6d3TsaQ2uGwj5ftkxaShVM7CDcAKcQ6YETZHxw1p3q0ery9QwT+di?= =?us-ascii?Q?IMM39uuDISBpOC1QhhzVIzgjtQ2M+hE82wqQ3jwDoijAKbaPXyV+8Ss97GYK?= =?us-ascii?Q?Iki7q1952YOxJkf/Ux7/wDjuBF0Wl93mpJnWmORV17GJ8+Wl4a18okV/tEip?= =?us-ascii?Q?vEhmxDf2GYXbcaPcE3lxdzy4NEqOOWVwdlrxdMk+d39BKrg7SMqZnfkzw8/z?= =?us-ascii?Q?PGubr7cVzOhvCzui67XIlsh2X6qzrwkwfYPsNiaNoRzE3RXGVNdNnEjpJcxz?= =?us-ascii?Q?506Cpsb5Hw3rrkDCYDuxSxpFI6rEIbl3h6z5QEuWf46PBmT8LMkzIgssTCT8?= =?us-ascii?Q?F9OnaFpspivTCMTFlaWNO3t2/On0z8FNXZkqlcz2477As0Xm0I17UMeMmBGR?= =?us-ascii?Q?Z8JTD4dybJyttvBSpu4plG2ByfjvRghxt5RfrRhBBJz5yGteGvlONiwOeYu2?= =?us-ascii?Q?VUL65G9a1kQBmYk1QPJorGVl+jxpFfMwx+DjjvVzWVO5fjwitHW2EfFrR8Ym?= =?us-ascii?Q?73smz+amVe3OO8cMesOlTWnJnsrAhKjV6LH29YSoHW1WRhLei4QD/FAobwA4?= =?us-ascii?Q?P3JmzezXOv6s6zxRKINLQ0g2qBxlwW/8+pfhlsloa/MUx7Hp4mqGS2V6GrJ7?= =?us-ascii?Q?V9gWKYPUZt6mHf+6zavtquQzDHzpwHep5aljYPtKZ46vfMXzV7KSQnjIjVuu?= =?us-ascii?Q?xeA5bH6PQ6/DSbRwNtghfhSzl6DcPWLFtFooWIDifkjA92iIBlkvv5i6m/Q/?= =?us-ascii?Q?QQ/iY4irRY1AsIjKvvVs8cbS6PFF9CXCBtlA8CP5u6l5cIjH4kiTuMXgpoel?= =?us-ascii?Q?ifsM=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0701MB1715; 5:/l2drUgUvmG1I+KB6KE0HBZ6FGYIkG+F42xClkf7rWZ56VLdkl3S7cYjG/fnQid+JMHmGCt7fds8/MUVr7v83JIGr9c343vMCDUN9DDMvmdgiwmRgHDVMYLGYHERPKboS+NKpL7mGDrVOnstUf25Kg==; 24:y/aiuMgSZje686SOvMu53zsj1ECVMwGcHEAkIbsBA/lOIsueE9QooHBNvdItX3WET9wtqwo8IV/ntIJiEHrcWiixdlQwEzaxLtTNu7sy58c=; 7:RCHLdQFiEhHEnBWlGmKIVavQ7jlwAKjnpdw/SyT+m6/HuFvvINfDZr8eHFgk4ZyL+AGJwcxsO5Hek5L5knsRbgHrybdhhRF9aTHMdKWJuUl65dK6S0sfmkiPE7U1ckMCtpQzcPkqdI7HSnVCZpSsyAxGbv3vTufdJsnj1WCDgYt6P7om1XJ/nk8MVFj9rG/V SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2016 11:20:59.8449 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0701MB1715 Subject: [dpdk-dev] [PATCH] fix build issues in the cross-compiling mode X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2016 11:21:04 -0000 Removed comparison against $CC in Makefiles as in cross-compiling mode CC can be a different string instead of string "gcc" Suggested-by: Thomas Monjalon Signed-off-by: Jerin Jacob --- app/test/Makefile | 2 +- drivers/net/cxgbe/Makefile | 6 ++++-- drivers/net/e1000/Makefile | 2 +- drivers/net/fm10k/Makefile | 5 +++-- drivers/net/i40e/Makefile | 4 ++-- drivers/net/ixgbe/Makefile | 4 ++-- drivers/net/qede/Makefile | 4 ++-- drivers/net/vmxnet3/Makefile | 4 ++-- lib/librte_acl/Makefile | 2 +- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/app/test/Makefile b/app/test/Makefile index f269fe0..6df9c40 100644 --- a/app/test/Makefile +++ b/app/test/Makefile @@ -166,7 +166,7 @@ CFLAGS += -D_GNU_SOURCE LDLIBS += -lm # Disable VTA for memcpy test -ifeq ($(CC), gcc) +ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) CFLAGS_test_memcpy.o += -fno-var-tracking-assignments CFLAGS_test_memcpy_perf.o += -fno-var-tracking-assignments diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile index e2ff412..bfcc315 100644 --- a/drivers/net/cxgbe/Makefile +++ b/drivers/net/cxgbe/Makefile @@ -45,7 +45,7 @@ EXPORT_MAP := rte_pmd_cxgbe_version.map LIBABIVER := 1 -ifeq ($(CC), icc) +ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) # # CFLAGS for icc # @@ -54,9 +54,11 @@ else # # CFLAGS for gcc/clang # -ifeq ($(shell test $(CC) = gcc && test $(GCC_VERSION) -ge 44 && echo 1), 1) +ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) +ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1) CFLAGS += -Wno-deprecated endif +endif CFLAGS_BASE_DRIVER = endif diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile index f4879e6..5b801f5 100644 --- a/drivers/net/e1000/Makefile +++ b/drivers/net/e1000/Makefile @@ -43,7 +43,7 @@ EXPORT_MAP := rte_pmd_e1000_version.map LIBABIVER := 1 -ifeq ($(CC), icc) +ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) # # CFLAGS for icc # diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile index 602a2d2..cf141ae 100644 --- a/drivers/net/fm10k/Makefile +++ b/drivers/net/fm10k/Makefile @@ -43,13 +43,14 @@ EXPORT_MAP := rte_pmd_fm10k_version.map LIBABIVER := 1 -ifeq ($(CC), icc) +ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) # # CFLAGS for icc # CFLAGS_BASE_DRIVER = -wd174 -wd593 -wd869 -wd981 -wd2259 -else ifeq ($(CC), clang) +else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) + # ## CFLAGS for clang # diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile index 56b20d5..9ffef3f 100644 --- a/drivers/net/i40e/Makefile +++ b/drivers/net/i40e/Makefile @@ -48,9 +48,9 @@ LIBABIVER := 1 # Add extra flags for base driver files (also known as shared code) # to disable warnings # -ifeq ($(CC), icc) +ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) CFLAGS_BASE_DRIVER = -wd593 -wd188 -else ifeq ($(CC), clang) +else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) CFLAGS_BASE_DRIVER += -Wno-sign-compare CFLAGS_BASE_DRIVER += -Wno-unused-value CFLAGS_BASE_DRIVER += -Wno-unused-parameter diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile index 50bf51c..70e8209 100644 --- a/drivers/net/ixgbe/Makefile +++ b/drivers/net/ixgbe/Makefile @@ -43,7 +43,7 @@ EXPORT_MAP := rte_pmd_ixgbe_version.map LIBABIVER := 1 -ifeq ($(CC), icc) +ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) # # CFLAGS for icc # @@ -51,7 +51,7 @@ CFLAGS_BASE_DRIVER = -wd174 -wd593 -wd869 -wd981 -wd2259 CFLAGS_ixgbe_rxtx.o += -wd3656 -else ifeq ($(CC), clang) +else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) # # CFLAGS for clang # diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile index c9b3b1c..fe449aa 100644 --- a/drivers/net/qede/Makefile +++ b/drivers/net/qede/Makefile @@ -47,7 +47,7 @@ endif endif endif -ifneq (,$(filter gcc gcc48,$(CC))) +ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable CFLAGS_BASE_DRIVER += -Wno-missing-declarations CFLAGS_BASE_DRIVER += -Wno-maybe-uninitialized @@ -55,7 +55,7 @@ CFLAGS_BASE_DRIVER += -Wno-strict-prototypes ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1) CFLAGS_BASE_DRIVER += -Wno-shift-negative-value endif -else ifeq ($(CC), clang) +else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) CFLAGS_BASE_DRIVER += -Wno-format-extra-args CFLAGS_BASE_DRIVER += -Wno-visibility CFLAGS_BASE_DRIVER += -Wno-empty-body diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile index 4cf3b33..23ff1da 100644 --- a/drivers/net/vmxnet3/Makefile +++ b/drivers/net/vmxnet3/Makefile @@ -39,13 +39,13 @@ LIB = librte_pmd_vmxnet3_uio.a CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) -ifeq ($(CC), icc) +ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) # # CFLAGS for icc # CFLAGS_BASE_DRIVER = -wd174 -wd593 -wd869 -wd981 -wd2259 -else ifeq ($(CC), clang) +else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y) # # CFLAGS for clang # diff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile index 2e394c9..9803e9d 100644 --- a/lib/librte_acl/Makefile +++ b/lib/librte_acl/Makefile @@ -73,7 +73,7 @@ else $(shell $(CC) -march=core-avx2 -dM -E - &1 | \ grep -q AVX2 && echo 1) ifeq ($(CC_AVX2_SUPPORT), 1) - ifeq ($(CC), icc) + ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y) CFLAGS_acl_run_avx2.o += -march=core-avx2 else CFLAGS_acl_run_avx2.o += -mavx2 -- 2.5.5