Use __VA_OPT__ instead of GNU extensions.

Signed-off-by: fruffy <[email protected]>

Author: fruffy

backends/tofino/bf-asm/CMakeLists.txt

@@ -246,8 +246,6 @@ string(REPLACE "-Wno-overloaded-virtual" "" vector_c_flags ${BFASM_CXX_FLAGS})
 set_source_files_properties(vector.c PROPERTIES COMPILE_FLAGS ${vector_c_flags})
 add_executable (bfas ${BFAS_SOURCES})
 # Enable extensions for bfas.
-# FIXME: This is needed to implement EXPAND_COMMA in target.h. Replace with __VA_OPT__ in C++20?
-target_compile_options(bfas PRIVATE -std=gnu++17)
 # Disable errors for warnings. FIXME: Get rid of this.
 target_compile_options(bfas PUBLIC "-Wno-error")
 target_link_libraries (bfas ${BFASM_LIBS} ${BFASM_LIB_DEPS})

backends/tofino/bf-asm/target.h

@@ -72,13 +72,9 @@ struct MemUnit;
 #define TARGETS_USING_REGS(CL, ...) TARGETS_USING_REGS_##CL(__VA_ARGS__)
 #define REGSETS_IN_CLASS(CL, ...) REGSETS_IN_CLASS_##CL(__VA_ARGS__)
 
-#define EXPAND(...) __VA_ARGS__
-#define EXPAND_COMMA(...) , ##__VA_ARGS__
-#define EXPAND_COMMA_CLOSE(...) ,##__VA_ARGS__ )
 #define INSTANTIATE_TARGET_TEMPLATE(TARGET, FUNC, ...) template FUNC(Target::TARGET::__VA_ARGS__);
 #define DECLARE_TARGET_CLASS(TARGET, ...) class TARGET __VA_ARGS__;
 #define FRIEND_TARGET_CLASS(TARGET, ...) friend class Target::TARGET __VA_ARGS__;
-#define TARGET_OVERLOAD(TARGET, FN, ARGS, ...) FN(Target::TARGET::EXPAND ARGS) __VA_ARGS__;
 
 #define PER_TARGET_CONSTANTS(M)                         \
     M(const char *, name)                               \
@@ -700,6 +696,12 @@ void emit_parser_registers(const Target::JBay::top_level_regs *regs, std::ostrea
  * will all have a Target::type argument prepended.  The final ARGS argument is the argument
  * list that that will be forwarded (basically ARGDECL without the types)
  */
+
+#define EXPAND(...) __VA_ARGS__
+#define EXPAND_COMMA(...) __VA_OPT__(, )##__VA_ARGS__
+#define EXPAND_COMMA_CLOSE(...) __VA_OPT__(,)##__VA_ARGS__ __VA_OPT__())
+#define TARGET_OVERLOAD(TARGET, FN, ARGS, ...) FN(Target::TARGET::EXPAND ARGS) __VA_ARGS__;
+
 #define DECL_OVERLOAD_FUNC(TARGET, RTYPE, NAME, ARGDECL, ARGS) \
     RTYPE NAME(Target::TARGET EXPAND_COMMA_CLOSE ARGDECL;
 #define OVERLOAD_FUNC_FOREACH(GROUP, RTYPE, NAME, ARGDECL, ARGS, ...)                    \