0001-Fix-gcc-5-ALIGN-causing-Boot-error.patch 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576
  1. commit e5f2b577ded109291c9632dacb6eaa621d8a59fe
  2. Author: Sylvain Gault <sylvain.gault@gmail.com>
  3. Date: Tue Sep 29 02:38:25 2015 +0200
  4. bios: Fix alignment change with gcc 5
  5. The section aligment specified in the ld scripts have to be greater or
  6. equal to those in the .o files generated by gcc.
  7. Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com>
  8. Tested-by: poma <pomidorabelisima@gmail.com>
  9. Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
  10. Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
  11. diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld
  12. index 7b4e012..7390451 100644
  13. --- a/core/i386/syslinux.ld
  14. +++ b/core/i386/syslinux.ld
  15. @@ -266,7 +266,7 @@ SECTIONS
  16. __text_end = .;
  17. }
  18. - . = ALIGN(16);
  19. + . = ALIGN(32);
  20. __rodata_vma = .;
  21. __rodata_lma = __rodata_vma + __text_lma - __text_vma;
  22. @@ -361,7 +361,7 @@ SECTIONS
  23. __dynamic_end = .;
  24. }
  25. - . = ALIGN(16);
  26. + . = ALIGN(32);
  27. __data_vma = .;
  28. __data_lma = __data_vma + __text_lma - __text_vma;
  29. @@ -377,7 +377,7 @@ SECTIONS
  30. __pm_code_dwords = (__pm_code_len + 3) >> 2;
  31. . = ALIGN(128);
  32. -
  33. +
  34. __bss_vma = .;
  35. __bss_lma = .; /* Dummy */
  36. .bss (NOLOAD) : AT (__bss_lma) {
  37. diff --git a/core/x86_64/syslinux.ld b/core/x86_64/syslinux.ld
  38. index 1057112..bf815c4 100644
  39. --- a/core/x86_64/syslinux.ld
  40. +++ b/core/x86_64/syslinux.ld
  41. @@ -266,7 +266,7 @@ SECTIONS
  42. __text_end = .;
  43. }
  44. - . = ALIGN(16);
  45. + . = ALIGN(32);
  46. __rodata_vma = .;
  47. __rodata_lma = __rodata_vma + __text_lma - __text_vma;
  48. @@ -361,7 +361,7 @@ SECTIONS
  49. __dynamic_end = .;
  50. }
  51. - . = ALIGN(16);
  52. + . = ALIGN(32);
  53. __data_vma = .;
  54. __data_lma = __data_vma + __text_lma - __text_vma;
  55. @@ -377,7 +377,7 @@ SECTIONS
  56. __pm_code_dwords = (__pm_code_len + 3) >> 2;
  57. . = ALIGN(128);
  58. -
  59. +
  60. __bss_vma = .;
  61. __bss_lma = .; /* Dummy */
  62. .bss (NOLOAD) : AT (__bss_lma) {