diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-15 13:12:36 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-11-15 13:12:36 +0000 |
| commit | 523709e1c88b3be88728bdaa14538ae7d2d09b67 (patch) | |
| tree | 189cadabd870c389164b97f6b6f4bda080479655 | |
| parent | d47aa3d701a80344779a8525708da694b0a340a7 (diff) | |
| download | gcc-523709e1c88b3be88728bdaa14538ae7d2d09b67.tar.gz | |
* asan.c (report_error_func): Set DECL_IGNORED_P, don't touch
DECL_ASSEMBLER_NAME.
(asan_init_func): Likewise.
(asan_finish_file): Use void * instead of __asan_global * as
type of __asan_{,un}register_globals. Set DECL_IGNORED_P on
the decls.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193532 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/asan.c | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4481b6ff498..01bf6d3d7b6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2012-11-15 Jakub Jelinek <jakub@redhat.com> + + * asan.c (report_error_func): Set DECL_IGNORED_P, don't touch + DECL_ASSEMBLER_NAME. + (asan_init_func): Likewise. + (asan_finish_file): Use void * instead of __asan_global * as + type of __asan_{,un}register_globals. Set DECL_IGNORED_P on + the decls. + 2012-11-15 Matthias Klose <doko@ubuntu.com> * Makefile.in (if_multiarch): Don't use a GNU make 3.81 feature. diff --git a/gcc/asan.c b/gcc/asan.c index 5fce4075088..03519d11369 100644 --- a/gcc/asan.c +++ b/gcc/asan.c @@ -494,10 +494,10 @@ report_error_func (bool is_store, int size_in_bytes) fn_type = build_function_type_list (void_type_node, ptr_type_node, NULL_TREE); def = build_fn_decl (name, fn_type); TREE_NOTHROW (def) = 1; + DECL_IGNORED_P (def) = 1; TREE_THIS_VOLATILE (def) = 1; /* Attribute noreturn. Surprise! */ DECL_ATTRIBUTES (def) = tree_cons (get_identifier ("leaf"), NULL, DECL_ATTRIBUTES (def)); - DECL_ASSEMBLER_NAME (def); return def; } @@ -512,7 +512,7 @@ asan_init_func (void) fn_type = build_function_type_list (void_type_node, NULL_TREE); def = build_fn_decl ("__asan_init", fn_type); TREE_NOTHROW (def) = 1; - DECL_ASSEMBLER_NAME (def); + DECL_IGNORED_P (def) = 1; return def; } @@ -1536,11 +1536,11 @@ asan_finish_file (void) DECL_INITIAL (var) = ctor; varpool_assemble_decl (varpool_node_for_decl (var)); - type = build_function_type_list (void_type_node, - build_pointer_type (TREE_TYPE (type)), + type = build_function_type_list (void_type_node, ptr_type_node, uptr, NULL_TREE); decl = build_fn_decl ("__asan_register_globals", type); TREE_NOTHROW (decl) = 1; + DECL_IGNORED_P (decl) = 1; append_to_statement_list (build_call_expr (decl, 2, build_fold_addr_expr (var), build_int_cst (uptr, gcount)), @@ -1548,6 +1548,7 @@ asan_finish_file (void) decl = build_fn_decl ("__asan_unregister_globals", type); TREE_NOTHROW (decl) = 1; + DECL_IGNORED_P (decl) = 1; append_to_statement_list (build_call_expr (decl, 2, build_fold_addr_expr (var), build_int_cst (uptr, gcount)), |