From 82efca013e6aec12e82fecebafe3a838506e6dbc4d6fa31b524e387c06ecc845 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 15 May 2012 11:32:25 +0000 Subject: [PATCH] - gcc47 fix: use .init_array section instead of .ctors OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=40 --- syslinux-4.04-gcc47.diff | 27 +++++++++++++++++++++++++++ syslinux.changes | 5 +++++ syslinux.spec | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 syslinux-4.04-gcc47.diff diff --git a/syslinux-4.04-gcc47.diff b/syslinux-4.04-gcc47.diff new file mode 100644 index 0000000..2a0629b --- /dev/null +++ b/syslinux-4.04-gcc47.diff @@ -0,0 +1,27 @@ +--- com32/lib/sys/entry.S ++++ com32/lib/sys/entry.S +@@ -92,8 +92,8 @@ + pushl %eax # Save argc + + /* Look for library initialization functions */ +- leal __ctors_start@GOTOFF(%ebx),%esi +- leal __ctors_end@GOTOFF(%ebx),%edi ++ leal __init_array_start@GOTOFF(%ebx),%esi ++ leal __init_array_end@GOTOFF(%ebx),%edi + 6: + cmpl %edi,%esi + jae 7f +--- com32/lib/sys/exit.S ++++ com32/lib/sys/exit.S +@@ -17,9 +17,9 @@ + #endif + + /* Run any destructors */ +- movl $__dtors_start, %esi ++ movl $__fini_array_start, %esi + 2: +- cmpl $__dtors_end, %esi ++ cmpl $__fini_array_end, %esi + jae 1f + call *(%esi) + addl $4,%esi diff --git a/syslinux.changes b/syslinux.changes index 3067e17..b6ecc62 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 15 13:31:20 CEST 2012 - snwint@suse.de + +- gcc47 fix: use .init_array section instead of .ctors + ------------------------------------------------------------------- Tue May 8 11:22:14 CEST 2012 - snwint@suse.de diff --git a/syslinux.spec b/syslinux.spec index f814274..18914ee 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -40,6 +40,7 @@ Patch3: %{name}-%{version}-mboot_bootif.diff Patch4: %{name}-%{version}-isohybrid-hex-option-parsing.diff Patch5: %{name}-%{version}-md5pass.diff Patch6: %{name}-%{version}-umode.diff +Patch7: %{name}-%{version}-gcc47.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,6 +64,7 @@ Authors: %patch4 -p1 %patch5 -p1 %patch6 -p0 +%patch7 -p0 %build cp %{SOURCE2} .