diff -Nru syslinux-6.03+dfsg/debian/changelog syslinux-6.03+dfsg/debian/changelog --- syslinux-6.03+dfsg/debian/changelog 2015-08-13 19:43:18.000000000 +0100 +++ syslinux-6.03+dfsg/debian/changelog 2015-11-24 22:13:19.000000000 +0000 @@ -1,3 +1,10 @@ +syslinux (3:6.03+dfsg-8ubuntu3) wily; urgency=medium + + * debian/patches/0008-Fix-gcc-5-ALIGN-causing-Boot-error.patch: backport + fix for gcc 5 ALIGN changes. (LP: #1507002) + + -- TJ Tue, 24 Nov 2015 21:30:00 +0000 + syslinux (3:6.03+dfsg-8ubuntu2) wily; urgency=medium * debian/patches/0001-SYSAPPEND-Fix-space-stripping.patch: backport fix to diff -Nru syslinux-6.03+dfsg/debian/patches/0008-Fix-gcc-5-ALIGN-causing-Boot-error.patch syslinux-6.03+dfsg/debian/patches/0008-Fix-gcc-5-ALIGN-causing-Boot-error.patch --- syslinux-6.03+dfsg/debian/patches/0008-Fix-gcc-5-ALIGN-causing-Boot-error.patch 1970-01-01 01:00:00.000000000 +0100 +++ syslinux-6.03+dfsg/debian/patches/0008-Fix-gcc-5-ALIGN-causing-Boot-error.patch 2015-11-24 22:12:53.000000000 +0000 @@ -0,0 +1,75 @@ +commit e5f2b577ded109291c9632dacb6eaa621d8a59fe +Author: Sylvain Gault +Date: Tue Sep 29 02:38:25 2015 +0200 + + bios: Fix alignment change with gcc 5 + + The section aligment specified in the ld scripts have to be greater or + equal to those in the .o files generated by gcc. + + Signed-off-by: Sylvain Gault + Tested-by: poma + Signed-off-by: Paulo Alcantara + +diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld +index 7b4e012..7390451 100644 +--- a/core/i386/syslinux.ld ++++ b/core/i386/syslinux.ld +@@ -266,7 +266,7 @@ SECTIONS + __text_end = .; + } + +- . = ALIGN(16); ++ . = ALIGN(32); + + __rodata_vma = .; + __rodata_lma = __rodata_vma + __text_lma - __text_vma; +@@ -361,7 +361,7 @@ SECTIONS + __dynamic_end = .; + } + +- . = ALIGN(16); ++ . = ALIGN(32); + + __data_vma = .; + __data_lma = __data_vma + __text_lma - __text_vma; +@@ -377,7 +377,7 @@ SECTIONS + __pm_code_dwords = (__pm_code_len + 3) >> 2; + + . = ALIGN(128); +- ++ + __bss_vma = .; + __bss_lma = .; /* Dummy */ + .bss (NOLOAD) : AT (__bss_lma) { +diff --git a/core/x86_64/syslinux.ld b/core/x86_64/syslinux.ld +index 1057112..bf815c4 100644 +--- a/core/x86_64/syslinux.ld ++++ b/core/x86_64/syslinux.ld +@@ -266,7 +266,7 @@ SECTIONS + __text_end = .; + } + +- . = ALIGN(16); ++ . = ALIGN(32); + + __rodata_vma = .; + __rodata_lma = __rodata_vma + __text_lma - __text_vma; +@@ -361,7 +361,7 @@ SECTIONS + __dynamic_end = .; + } + +- . = ALIGN(16); ++ . = ALIGN(32); + + __data_vma = .; + __data_lma = __data_vma + __text_lma - __text_vma; +@@ -377,7 +377,7 @@ SECTIONS + __pm_code_dwords = (__pm_code_len + 3) >> 2; + + . = ALIGN(128); +- ++ + __bss_vma = .; + __bss_lma = .; /* Dummy */ + .bss (NOLOAD) : AT (__bss_lma) { diff -Nru syslinux-6.03+dfsg/debian/patches/series syslinux-6.03+dfsg/debian/patches/series --- syslinux-6.03+dfsg/debian/patches/series 2015-08-13 19:46:07.000000000 +0100 +++ syslinux-6.03+dfsg/debian/patches/series 2015-11-24 22:13:04.000000000 +0000 @@ -5,3 +5,4 @@ 0005-load-linux-correct-type.patch 0006-load-linux-protected-mode.patch 0001-SYSAPPEND-Fix-space-stripping.patch +0008-Fix-gcc-5-ALIGN-causing-Boot-error.patch