From e5c3513ca8abb21eb5e9b8c19d1b9199b14ae07c Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Sat, 15 Sep 2012 22:20:09 -0700 Subject: qemu: fix relocatable patch for M4 Since M4 used 0.15 and the relocatable_sdk was made for 1.2, it needs to be moved and rebased Signed-off-by: Saul Wold --- .../qemu/qemu-0.15.1/relocatable_sdk.patch | 34 ++++++++++++++++++++++ .../qemu/qemu-1.2.0/relocatable_sdk.patch | 34 ---------------------- 2 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu-0.15.1/relocatable_sdk.patch delete mode 100644 meta/recipes-devtools/qemu/qemu-1.2.0/relocatable_sdk.patch diff --git a/meta/recipes-devtools/qemu/qemu-0.15.1/relocatable_sdk.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/relocatable_sdk.patch new file mode 100644 index 0000000000..0a01a8a048 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu-0.15.1/relocatable_sdk.patch @@ -0,0 +1,34 @@ +Upstream-Status: Inappropriate [SDK specific] + +In order to be able to change the dynamic loader path when relocating +binaries, the interp section has to be made big enough to accomodate +the new path (4096 is the maximum path length in Linux). + +Signed-off-by: Laurentiu Palcu + +Index: qemu-1.2.0/i386.ld +=================================================================== +--- qemu-1.2.0.orig/i386.ld ++++ qemu-1.2.0/i386.ld +@@ -8,7 +8,7 @@ SECTIONS + { + /* Read-only sections, merged into text segment: */ + . = 0x60000000 + SIZEOF_HEADERS; +- .interp : { *(.interp) } ++ .interp : { *(.interp); . = 0x1000; } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } +Index: qemu-1.2.0/x86_64.ld +=================================================================== +--- qemu-1.2.0.orig/x86_64.ld ++++ qemu-1.2.0/x86_64.ld +@@ -6,7 +6,7 @@ SECTIONS + { + /* Read-only sections, merged into text segment: */ + . = 0x60000000 + SIZEOF_HEADERS; +- .interp : { *(.interp) } ++ .interp : { *(.interp); . = 0x1000; } + .hash : { *(.hash) } + .dynsym : { *(.dynsym) } + .dynstr : { *(.dynstr) } diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/relocatable_sdk.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/relocatable_sdk.patch deleted file mode 100644 index 0a01a8a048..0000000000 --- a/meta/recipes-devtools/qemu/qemu-1.2.0/relocatable_sdk.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Inappropriate [SDK specific] - -In order to be able to change the dynamic loader path when relocating -binaries, the interp section has to be made big enough to accomodate -the new path (4096 is the maximum path length in Linux). - -Signed-off-by: Laurentiu Palcu - -Index: qemu-1.2.0/i386.ld -=================================================================== ---- qemu-1.2.0.orig/i386.ld -+++ qemu-1.2.0/i386.ld -@@ -8,7 +8,7 @@ SECTIONS - { - /* Read-only sections, merged into text segment: */ - . = 0x60000000 + SIZEOF_HEADERS; -- .interp : { *(.interp) } -+ .interp : { *(.interp); . = 0x1000; } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } -Index: qemu-1.2.0/x86_64.ld -=================================================================== ---- qemu-1.2.0.orig/x86_64.ld -+++ qemu-1.2.0/x86_64.ld -@@ -6,7 +6,7 @@ SECTIONS - { - /* Read-only sections, merged into text segment: */ - . = 0x60000000 + SIZEOF_HEADERS; -- .interp : { *(.interp) } -+ .interp : { *(.interp); . = 0x1000; } - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } -- cgit v1.2.3-54-g00ecf