Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / ld / ldlex.h

diff --git a/ld/ldlex.h b/ld/ldlex.h
index 52f7198ad2ccec4a96474f2d865392657d6333da..5287f19a7f6710ad10235d04edd7ae6b29e3be18 100644 (file)
--- a/ld/ldlex.h
+++ b/ld/ldlex.h
@@ -1,5 +1,5 @@
 /* ldlex.h -
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
+   Copyright (C) 1991-2020 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -101,6 +101,7 @@ enum option_values
   OPTION_NO_GC_SECTIONS,
   OPTION_PRINT_GC_SECTIONS,
   OPTION_NO_PRINT_GC_SECTIONS,
+  OPTION_GC_KEEP_EXPORTED,
   OPTION_HASH_SIZE,
   OPTION_CHECK_SECTIONS,
   OPTION_NO_CHECK_SECTIONS,
@@ -142,9 +143,13 @@ enum option_values
   OPTION_IGNORE_UNRESOLVED_SYMBOL,
   OPTION_PUSH_STATE,
   OPTION_POP_STATE,
+  OPTION_DISABLE_MULTIPLE_DEFS_ABS,
   OPTION_PRINT_MEMORY_USAGE,
   OPTION_REQUIRE_DEFINED_SYMBOL,
   OPTION_ORPHAN_HANDLING,
+  OPTION_FORCE_GROUP_ALLOCATION,
+  OPTION_PRINT_MAP_DISCARDED,
+  OPTION_NO_PRINT_MAP_DISCARDED,
 };
 
 /* The initial parser states.  */
@@ -174,16 +179,12 @@ extern void ldlex_version_file (void);
 extern void ldlex_defsym (void);
 extern void ldlex_expression (void);
 extern void ldlex_both (void);
-extern void ldlex_command (void);
 extern void ldlex_popstate (void);
 extern const char* ldlex_filename (void);
 
 /* In lexsup.c.  */
 extern int lex_input (void);
 extern void lex_unput (int);
-#ifndef yywrap
-extern int yywrap (void);
-#endif
 extern void parse_args (unsigned, char **);
 
 #endif