diff options
| author |   Damjan Marion <damarion@cisco.com> | 2019-02-02 00:15:27 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-02-02 00:45:09 +0000 |
| commit | 652d2e139443cea073da9b7bef8ee21e41a14111 (patch) | |
| tree | dc477b1151b19b636e01bfc207258e0555dc9b2f /src/vnet/interface.h | |
| parent | 9bb20b310280a3c9604f9dd24fbb6757d7f9ca65 (diff) | |
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>
Diffstat (limited to 'src/vnet/interface.h')
| -rw-r--r-- | src/vnet/interface.h | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/src/vnet/interface.h b/src/vnet/interface.h index 2e32a790996..174e5347ad2 100644 --- a/src/vnet/interface.h +++ b/src/vnet/interface.h @@ -302,30 +302,8 @@ CLIB_MARCH_SFX (devclass##_tx_fn_multiarch_register) (void) \ } \ uword CLIB_CPU_OPTIMIZED CLIB_MARCH_SFX (devclass##_tx_fn) -#define VLIB_DEVICE_TX_FUNCTION_CLONE_TEMPLATE(arch, fn, tgt) \ - uword \ - __attribute__ ((flatten)) \ - __attribute__ ((target (tgt))) \ - CLIB_CPU_OPTIMIZED \ - fn ## _ ## arch ( vlib_main_t * vm, \ - vlib_node_runtime_t * node, \ - vlib_frame_t * frame) \ - { return fn (vm, node, frame); } - -#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH_CLONE(fn) \ - foreach_march_variant(VLIB_DEVICE_TX_FUNCTION_CLONE_TEMPLATE, fn) - -#if CLIB_DEBUG > 0 -#define VLIB_MULTIARCH_CLONE_AND_SELECT_FN(fn,...) +/* FIXME to be removed */ #define VLIB_DEVICE_TX_FUNCTION_MULTIARCH(dev, fn) -#else -#define VLIB_DEVICE_TX_FUNCTION_MULTIARCH(dev, fn) \ - VLIB_DEVICE_TX_FUNCTION_MULTIARCH_CLONE(fn) \ - CLIB_MULTIARCH_SELECT_FN(fn, static inline) \ - static void __attribute__((__constructor__)) \ - __vlib_device_tx_function_multiarch_select_##dev (void) \ - { dev.tx_function = fn ## _multiarch_select(); } -#endif /** * Link Type: A description of the protocol of packets on the link. @@ -872,6 +850,10 @@ void vnet_pcap_drop_trace_filter_add_del (u32 error_index, int is_add); int vnet_interface_name_renumber (u32 sw_if_index, u32 new_show_dev_instance); +uword vnet_interface_output_node (vlib_main_t * vm, + vlib_node_runtime_t * node, + vlib_frame_t * frame); + #endif /* included_vnet_interface_h */ /* |