Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45d9a1e3 authored by Alexander Popov's avatar Alexander Popov Committed by Kees Cook
Browse files

gcc-plugins: Clean up the cgraph_create_edge* macros 



Drop useless redefinitions of cgraph_create_edge* macros. Drop the unused
nest argument. Also support gcc-8, which doesn't have freq argument.

Signed-off-by: default avatarAlexander Popov <alex.popov@linux.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent 7ccb95e8

scripts/gcc-plugins/gcc-common.h

+16 −10
Original line number Diff line number Diff line
@@ -392,13 +392,6 @@ static inline struct cgraph_node *cgraph_alias_target(struct cgraph_node *n) 
}

#endif



#if BUILDING_GCC_VERSION >= 4007 && BUILDING_GCC_VERSION <= 4009

#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \

	cgraph_create_edge((caller), (callee), (call_stmt), (count), (freq))

#define cgraph_create_edge_including_clones(caller, callee, old_call_stmt, call_stmt, count, freq, nest, reason) \

	cgraph_create_edge_including_clones((caller), (callee), (old_call_stmt), (call_stmt), (count), (freq), (reason))

#endif



#if BUILDING_GCC_VERSION <= 4008

#define ENTRY_BLOCK_PTR_FOR_FN(FN)	ENTRY_BLOCK_PTR_FOR_FUNCTION(FN)

#define EXIT_BLOCK_PTR_FOR_FN(FN)	EXIT_BLOCK_PTR_FOR_FUNCTION(FN)
@@ -723,10 +716,23 @@ static inline const char *get_decl_section_name(const_tree decl) 
#define varpool_get_node(decl) varpool_node::get(decl)

#define dump_varpool_node(file, node) (node)->dump(file)



#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \

#if BUILDING_GCC_VERSION >= 8000

#define cgraph_create_edge(caller, callee, call_stmt, count, freq) \

	(caller)->create_edge((callee), (call_stmt), (count))



#define cgraph_create_edge_including_clones(caller, callee,	\

		old_call_stmt, call_stmt, count, freq, reason)	\

	(caller)->create_edge_including_clones((callee),	\

		(old_call_stmt), (call_stmt), (count), (reason))

#else

#define cgraph_create_edge(caller, callee, call_stmt, count, freq) \

	(caller)->create_edge((callee), (call_stmt), (count), (freq))

#define cgraph_create_edge_including_clones(caller, callee, old_call_stmt, call_stmt, count, freq, nest, reason) \

	(caller)->create_edge_including_clones((callee), (old_call_stmt), (call_stmt), (count), (freq), (reason))



#define cgraph_create_edge_including_clones(caller, callee,	\

		old_call_stmt, call_stmt, count, freq, reason)	\

	(caller)->create_edge_including_clones((callee),	\

		(old_call_stmt), (call_stmt), (count), (freq), (reason))

#endif



typedef struct cgraph_node *cgraph_node_ptr;

typedef struct cgraph_edge *cgraph_edge_p;