commit 652d2e139443cea073da9b7bef8ee21e41a14111
author Damjan Marion <damarion@cisco.com> Sat Feb 02 00:15:27 2019 +0100
committer Damjan Marion <dmarion@me.com> Sat Feb 02 00:45:09 2019 +0000
tree dc477b1151b19b636e01bfc207258e0555dc9b2f
parent 9bb20b310280a3c9604f9dd24fbb6757d7f9ca65

Deprecate old mutliarch code, phase 1

It is causing compilation sloness with gcc-7 so removing it
before it was originally planned.

So far macros are left in the tree so we can know which nodes to
convert to new multiarch code.

Change-Id: Idb14622ca61fdce1eba59723b20d98715b7971e6
Signed-off-by: Damjan Marion <damarion@cisco.com>

src/vnet/ip/ip_checksum.c

diff --git a/src/vnet/ip/ip_checksum.c b/src/vnet/ip/ip_checksum.c
index 36467a2..d586649 100644
--- a/src/vnet/ip/ip_checksum.c
+++ b/src/vnet/ip/ip_checksum.c
@@ -120,34 +120,13 @@
  * function which uses the function pointer we set up in
  * ip_checksum_init().
  */
-#if CLIB_DEBUG > 0
-#define IP_INCREMENTAL_CHECKSUM_CLONE_TEMPLATE(arch, fn)
-#define IP_INCREMENTAL_CHECKSUM_MULTIARCH_CLONE(fn)
-#else
-#define IP_INCREMENTAL_CHECKSUM_CLONE_TEMPLATE(arch, fn, tgt)   \
-  uword                                                         \
-  __attribute__ ((flatten))                                     \
-  __attribute__ ((target (tgt)))                                \
-  CLIB_CPU_OPTIMIZED                                            \
-  fn ## _ ## arch (ip_csum_t sum,                               \
-                   void *_data,                                 \
-                   uword n_bytes)                               \
-  { return fn (sum, _data, n_bytes); }
-
-#define IP_INCREMENTAL_CHECKSUM_MULTIARCH_CLONE(fn) \
-  foreach_march_variant(IP_INCREMENTAL_CHECKSUM_CLONE_TEMPLATE,fn)
-#endif
-
-IP_INCREMENTAL_CHECKSUM_MULTIARCH_CLONE (_ip_incremental_checksum);
-
-CLIB_MULTIARCH_SELECT_FN (_ip_incremental_checksum, static inline);
 
 ip_csum_t (*vnet_incremental_checksum_fp) (ip_csum_t, void *, uword);
 
 static clib_error_t *
 ip_checksum_init (vlib_main_t * vm)
 {
-  vnet_incremental_checksum_fp = _ip_incremental_checksum_multiarch_select ();
+  vnet_incremental_checksum_fp = _ip_incremental_checksum;
   return 0;
 }