MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport go-cross: set alignment for the .rel.plt section on 32-bit architectures

Browse Source 
submitted to upstream https://github.com/errordeveloper/oe-meta-go

    go-cross: set alignment for the .rel.plt section on 32-bit architectures

    This patch is cherry picked from golang's upstream, and this patch will
    fix the package of etcd's following build error:

    ERROR: debugedit failed with exit code 256 (cmd was 'bitbake_build/tmp/sysroots/x86_64-linux/usr/lib/rpm/bin/debugedit' -b 'bitbake_build/tmp/work/cortexa7t2hf-vfp-neon-wrs-linux-gnueabi' -d '/usr/src/debug' -i -l 'bitbake_build/tmp/work/cortexa7t2hf-vfp-neon-wrs-linux-gnueabi/etcd/git-r0/debugsources.list' 'bitbake_build/tmp/work/cortexa7t2hf-vfp-neon-wrs-linux-gnueabi/etcd/git-r0/package/usr/bin/etcd'):
    bitbake_build/tmp/sysroots/x86_64-linux/usr/lib/rpm/bin/debugedit: elf_update: invalid section alignment
    ERROR: Function failed: split_and_strip_files
    ERROR: Logfile of failure stored in: bitbake_build/tmp/work/cortexa7t2hf-vfp-neon-wrs-linux-gnueabi/etcd/git-r0/temp/do_package/log.do_package.109414
    ERROR: Task 12 (layers/meta-overc/meta-pod/recipes-connectivity/etcd/etcd_git.bb, do_package) failed with exit code '1'

    Signed-off-by: fupan li <fupan.li@windriver.com>

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Amy Fong 2015-10-06 14:41:12 -04:00 committed by Bruce Ashfield
parent 4988689b73
commit 7817649098
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
recipes-devtools/go-cross/files/0001-cmd-ld-set-alignment-for-the-.rel.plt-section-on-32-.patch Normal file
View File

@ -0,0 +1,30 @@
From 855145d5c03c4b4faf60736c38d7a299c682af4a Mon Sep 17 00:00:00 2001
From: Shenghou Ma <minux@golang.org>
Date: Sat, 7 Feb 2015 14:06:02 -0500
Subject: [PATCH] cmd/ld: set alignment for the .rel.plt section on 32-bit
architectures
Fixes #9802.
Change-Id: I22c52a37bdb23a14cc4615c9519431bb14ca81ca
Reviewed-on: https://go-review.googlesource.com/4170
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---
src/cmd/ld/elf.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/cmd/ld/elf.c b/src/cmd/ld/elf.c
index 12ced98..97ed4bd 100644
--- a/src/cmd/ld/elf.c
+++ b/src/cmd/ld/elf.c
@@ -1363,6 +1363,7 @@ asmbelf(vlong symo)
sh->type = SHT_REL;
sh->flags = SHF_ALLOC;
sh->entsize = ELF32RELSIZE;
+ sh->addralign = 4;
sh->link = elfshname(".dynsym")->shnum;
shsym(sh, linklookup(ctxt, ".rel.plt", 0));
--
1.9.1

1
recipes-devtools/go-cross/go-cross_1.3.bb
View File

@ -20,6 +20,7 @@ SRC_URI[sha256sum] = "eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ff
SRC_URI += "\
file://bsd_svid_source.patch \
file://ccache.patch \
file://0001-cmd-ld-set-alignment-for-the-.rel.plt-section-on-32-.patch \
"
do_compile() {