+2011-05-09 Paul Brook <paul@codesourcery.com>
+
+ * emultempl/tic6xdsbt.em (merge_exidx_entries): New.
+ (compare_output_sec_vma): New function.
+ (gld${EMULATION_NAME}_after_allocation): New function.
+ (OPTION_NO_MERGE_EXIDX_ENTRIES): Define.
+ (PARSE_AND_LIST_OPTIONS): Add --no-merge-exidx-entries.
+ (PARSE_AND_LIST_ARGS_CASES): Add OPTION_NO_MERGE_EXIDX_ENTRIES.
+ (LDEMUL_AFTER_ALLOCATION): Set.
+ * ld.texinfo: Document c6x --no-merge-exidx-entries.
+
2011-05-07 Dave Korn <dave.korn.cygwin@gmail.com>
PR ld/12365