diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/collect2.c | 22 |
2 files changed, 8 insertions, 19 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 74a9890..31ad4e5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-07-08 Martin Liska <mliska@suse.cz> + + * collect2.c (defined): Revert to before r254460. + (scan_prog_file): Revert to before r254460. + 2019-07-08 Richard Biener <rguenther@suse.de> PR tree-optimization/83518 diff --git a/gcc/collect2.c b/gcc/collect2.c index d6a7355..e25e339 100644 --- a/gcc/collect2.c +++ b/gcc/collect2.c @@ -616,7 +616,7 @@ static const char *const target_machine = TARGET_MACHINE; Return 0 if not found, otherwise return its name, allocated with malloc. */ -#if defined (OBJECT_FORMAT_NONE) || defined (OBJECT_FORMAT_COFF) +#ifdef OBJECT_FORMAT_NONE /* Add an entry for the object file NAME to object file list LIST. New entries are added at the end of the list. The original pointer @@ -636,7 +636,7 @@ add_lto_object (struct lto_object_list *list, const char *name) list->last = n; } -#endif +#endif /* OBJECT_FORMAT_NONE */ /* Perform a link-time recompilation and relink if any of the object @@ -2799,10 +2799,8 @@ scan_prog_file (const char *prog_name, scanpass which_pass, LDFILE *ldptr = NULL; int sym_index, sym_count; int is_shared = 0; - int found_lto = 0; - if (which_pass != PASS_FIRST && which_pass != PASS_OBJ - && which_pass != PASS_LTOINFO) + if (which_pass != PASS_FIRST && which_pass != PASS_OBJ) return; #ifdef COLLECT_EXPORT_LIST @@ -2815,7 +2813,6 @@ scan_prog_file (const char *prog_name, scanpass which_pass, eliminate scan_libraries() function. */ do { - found_lto = 0; #endif /* Some platforms (e.g. OSF4) declare ldopen as taking a non-const char * filename parameter, even though it will not @@ -2858,19 +2855,6 @@ scan_prog_file (const char *prog_name, scanpass which_pass, ++name; #endif - if (which_pass == PASS_LTOINFO) - { - if (found_lto) - continue; - if (strncmp (name, "__gnu_lto_v1", 12) == 0) - { - add_lto_object (<o_objects, prog_name); - found_lto = 1; - break; - } - continue; - } - switch (is_ctor_dtor (name)) { #if TARGET_AIX_VERSION |