1*4882a593SmuzhiyunFrom beb526ca925983c7da229043790ecd552d910650 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Christian Stewart <christian@paral.in> 3*4882a593SmuzhiyunDate: Thu, 4 Apr 2019 23:24:31 -0700 4*4882a593SmuzhiyunSubject: [PATCH] Fix build with binutils note gnu property section 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThis fixes the following build error with newer binutils: 7*4882a593Smuzhiyun 8*4882a593Smuzhiyun objcopy -O binary mbr.elf mbr.bin 9*4882a593Smuzhiyun perl /build/syslinux/src/syslinux/mbr/checksize.pl mbr.bin 10*4882a593Smuzhiyun mbr.bin: too big (452 > 440) 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunCorresponding bug reports: 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun - https://bugs.archlinux.org/task/60405 15*4882a593Smuzhiyun - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414 16*4882a593Smuzhiyun 17*4882a593SmuzhiyunStrips the .note.gnu.property in the linker scripts for the MBRs. 18*4882a593Smuzhiyun 19*4882a593SmuzhiyunSigned-off-by: Christian Stewart <christian@paral.in> 20*4882a593Smuzhiyun--- 21*4882a593Smuzhiyun mbr/i386/mbr.ld | 1 + 22*4882a593Smuzhiyun mbr/x86_64/mbr.ld | 1 + 23*4882a593Smuzhiyun 2 files changed, 2 insertions(+) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyundiff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld 26*4882a593Smuzhiyunindex d14ba802..53683461 100644 27*4882a593Smuzhiyun--- a/mbr/i386/mbr.ld 28*4882a593Smuzhiyun+++ b/mbr/i386/mbr.ld 29*4882a593Smuzhiyun@@ -70,4 +70,5 @@ SECTIONS 30*4882a593Smuzhiyun .debug_typenames 0 : { *(.debug_typenames) } 31*4882a593Smuzhiyun .debug_varnames 0 : { *(.debug_varnames) } 32*4882a593Smuzhiyun /DISCARD/ : { *(.note.GNU-stack) } 33*4882a593Smuzhiyun+ /DISCARD/ : { *(.note.gnu.property) } 34*4882a593Smuzhiyun } 35*4882a593Smuzhiyundiff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld 36*4882a593Smuzhiyunindex ae27d49a..b8c0d895 100644 37*4882a593Smuzhiyun--- a/mbr/x86_64/mbr.ld 38*4882a593Smuzhiyun+++ b/mbr/x86_64/mbr.ld 39*4882a593Smuzhiyun@@ -69,4 +69,5 @@ SECTIONS 40*4882a593Smuzhiyun .debug_typenames 0 : { *(.debug_typenames) } 41*4882a593Smuzhiyun .debug_varnames 0 : { *(.debug_varnames) } 42*4882a593Smuzhiyun /DISCARD/ : { *(.note.GNU-stack) } 43*4882a593Smuzhiyun+ /DISCARD/ : { *(.note.gnu.property) } 44*4882a593Smuzhiyun } 45*4882a593Smuzhiyun-- 46*4882a593Smuzhiyun2.21.0 47*4882a593Smuzhiyun 48