64bit-fixups.patch 2.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556
  1. From f3ba95e14437f10de8b8f296930ff2a8495d18c6 Mon Sep 17 00:00:00 2001
  2. From: Georg Koppen <gk@torproject.org>
  3. Date: Tue, 12 Sep 2017 07:21:16 +0000
  4. Subject: [PATCH] 64bit fixups
  5. diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
  6. index b566903b14..27006bdf79 100644
  7. --- a/ld/emultempl/pep.em
  8. +++ b/ld/emultempl/pep.em
  9. @@ -730,7 +730,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
  10. pep_dll_exclude_all_symbols = 1;
  11. break;
  12. case OPTION_ENABLE_RELOC_SECTION:
  13. - pe_dll_enable_reloc_section = 1;
  14. + pep_dll_enable_reloc_section = 1;
  15. break;
  16. case OPTION_EXCLUDE_LIBS:
  17. pep_dll_add_excludes (optarg, EXCLUDELIBS);
  18. @@ -1623,7 +1623,7 @@ gld_${EMULATION_NAME}_finish (void)
  19. #ifdef DLL_SUPPORT
  20. if (link_info.shared
  21. - || (!link_info.relocatable && pe_dll_enable_reloc_section)
  22. + || (!link_info.relocatable && pep_dll_enable_reloc_section)
  23. || (!link_info.relocatable && pep_def_file->num_exports != 0))
  24. {
  25. pep_dll_fill_sections (link_info.output_bfd, &link_info);
  26. diff --git a/ld/pep-dll.c b/ld/pep-dll.c
  27. index 0e5e8b1523..b5f99b90e0 100644
  28. --- a/ld/pep-dll.c
  29. +++ b/ld/pep-dll.c
  30. @@ -31,6 +31,7 @@
  31. #define pe_dll_export_everything pep_dll_export_everything
  32. #define pe_dll_exclude_all_symbols pep_dll_exclude_all_symbols
  33. #define pe_dll_do_default_excludes pep_dll_do_default_excludes
  34. +#define pe_dll_enable_reloc_section pep_dll_enable_reloc_section
  35. #define pe_dll_kill_ats pep_dll_kill_ats
  36. #define pe_dll_stdcall_aliases pep_dll_stdcall_aliases
  37. #define pe_dll_warn_dup_exports pep_dll_warn_dup_exports
  38. diff --git a/ld/pep-dll.h b/ld/pep-dll.h
  39. index 1e7e3d65d4..c31e69cc8e 100644
  40. --- a/ld/pep-dll.h
  41. +++ b/ld/pep-dll.h
  42. @@ -31,6 +31,7 @@ extern def_file * pep_def_file;
  43. extern int pep_dll_export_everything;
  44. extern int pep_dll_exclude_all_symbols;
  45. extern int pep_dll_do_default_excludes;
  46. +extern int pep_dll_enable_reloc_section;
  47. extern int pep_dll_kill_ats;
  48. extern int pep_dll_stdcall_aliases;
  49. extern int pep_dll_warn_dup_exports;
  50. --
  51. 2.14.1