From: Pranil Dey Date: Tue, 1 Oct 2024 04:42:35 +0000 (+0530) Subject: resolved more conflicts X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27be11a6b2fe5c91f60460e01c30ca5c4fddf58a;p=thirdparty%2Fgcc.git resolved more conflicts --- diff --git a/gcc/tree-eh.h b/gcc/tree-eh.h index 4fa134b43ddc..978bc6228bf0 100644 --- a/gcc/tree-eh.h +++ b/gcc/tree-eh.h @@ -34,8 +34,6 @@ extern int lookup_stmt_eh_lp (const gimple *); extern bool make_eh_dispatch_edges (geh_dispatch *); extern bool match_lp (eh_landing_pad, vec *); extern void update_stmt_eh_region(gimple *); -extern bool match_lp (eh_landing_pad, vec *); -extern void update_stmt_eh_region(gimple *); extern edge make_eh_edge (gimple *); extern edge redirect_eh_edge (edge, basic_block); extern void redirect_eh_dispatch_edge (geh_dispatch *, edge, basic_block);