64bit-fixups.patch 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. From 05164a1162d5f6f696d7f7c4b1bc61ef06d1c288 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. ---
  6. ld/emultempl/pep.em | 4 ++--
  7. ld/pep-dll.c | 1 +
  8. ld/pep-dll.h | 1 +
  9. 3 files changed, 4 insertions(+), 2 deletions(-)
  10. diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
  11. index fccbd63..f7c0a57 100644
  12. --- a/ld/emultempl/pep.em
  13. +++ b/ld/emultempl/pep.em
  14. @@ -742,7 +742,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
  15. pep_dll_exclude_all_symbols = 1;
  16. break;
  17. case OPTION_ENABLE_RELOC_SECTION:
  18. - pe_dll_enable_reloc_section = 1;
  19. + pep_dll_enable_reloc_section = 1;
  20. break;
  21. case OPTION_EXCLUDE_LIBS:
  22. pep_dll_add_excludes (optarg, EXCLUDELIBS);
  23. @@ -1862,7 +1862,7 @@ gld_${EMULATION_NAME}_finish (void)
  24. #ifdef DLL_SUPPORT
  25. if (bfd_link_pic (&link_info)
  26. || (!bfd_link_relocatable (&link_info)
  27. - && pe_dll_enable_reloc_section)
  28. + && pep_dll_enable_reloc_section)
  29. || (!bfd_link_relocatable (&link_info)
  30. && pep_def_file->num_exports != 0))
  31. {
  32. diff --git a/ld/pep-dll.c b/ld/pep-dll.c
  33. index b8c017f..5ad5733 100644
  34. --- a/ld/pep-dll.c
  35. +++ b/ld/pep-dll.c
  36. @@ -31,6 +31,7 @@
  37. #define pe_dll_export_everything pep_dll_export_everything
  38. #define pe_dll_exclude_all_symbols pep_dll_exclude_all_symbols
  39. #define pe_dll_do_default_excludes pep_dll_do_default_excludes
  40. +#define pe_dll_enable_reloc_section pep_dll_enable_reloc_section
  41. #define pe_dll_kill_ats pep_dll_kill_ats
  42. #define pe_dll_stdcall_aliases pep_dll_stdcall_aliases
  43. #define pe_dll_warn_dup_exports pep_dll_warn_dup_exports
  44. diff --git a/ld/pep-dll.h b/ld/pep-dll.h
  45. index 0a27c1f..95d9c15 100644
  46. --- a/ld/pep-dll.h
  47. +++ b/ld/pep-dll.h
  48. @@ -31,6 +31,7 @@ extern def_file * pep_def_file;
  49. extern int pep_dll_export_everything;
  50. extern int pep_dll_exclude_all_symbols;
  51. extern int pep_dll_do_default_excludes;
  52. +extern int pep_dll_enable_reloc_section;
  53. extern int pep_dll_kill_ats;
  54. extern int pep_dll_stdcall_aliases;
  55. extern int pep_dll_warn_dup_exports;
  56. --
  57. 2.1.4