diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2018-10-01 00:01:33 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2018-10-01 00:07:19 +0100 |
| commit | 6d8e37b7787e68f6b3aafb55b81f2781c54f8665 (patch) | |
| tree | 4190dc16c55eeb89903df262bf1a0aae1f45ef8c /dev-libs/libffi/files | |
| parent | x11-misc/shared-mime-info-1.10: arm64 stable (bug #666872) (diff) | |
| download | gentoo-6d8e37b7787e68f6b3aafb55b81f2781c54f8665.tar.gz gentoo-6d8e37b7787e68f6b3aafb55b81f2781c54f8665.tar.bz2 gentoo-6d8e37b7787e68f6b3aafb55b81f2781c54f8665.zip | |
dev-libs/libffi: bump up to 3.3_rc0
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Diffstat (limited to 'dev-libs/libffi/files')
| -rw-r--r-- | dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch b/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch new file mode 100644 index 000000000000..c6286f349900 --- /dev/null +++ b/dev-libs/libffi/files/libffi-3.3_rc0-hppa-no-TEXTREL.patch @@ -0,0 +1,93 @@ +From 955e3c56459556284cf4a7fb23c51f9d310be80c Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Sat, 19 May 2018 10:49:07 +0100 +Subject: [PATCH] hppa: avoid TEXTREL in .eh_frame section + +Before the change hand-crafted .eh_frame section contained +ABS relocation and caused TEXTREL tag to be emitted: + +``` +$ ./configure --host=hppa2.0-unknown-linux-gnu LDFLAGS=-Wl,-z,text +$ make +... +/usr/libexec/gcc/hppa2.0-unknown-linux-gnu/ld: + read-only segment has dynamic relocations. +``` + +Link failure is caused by absolute address of FDEs +encoded into .eh_frame entries. + +Fixed TEXTREL by using pcrel (instead of ABS) encoding +for absolute addresses (__PIC__ code) by adding augmentation +information ("zR" CIE type). + +All tests still pass on hppa2.0. The specific tests that still pass +and exercise this code path: + testsuite/libffi.call/unwindtest.cc + testsuite/libffi.call/unwindtest_ffi_call.cc + +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + src/pa/linux.S | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +diff --git a/src/pa/linux.S b/src/pa/linux.S +index f11ae76..ab04c75 100644 +--- a/src/pa/linux.S ++++ b/src/pa/linux.S +@@ -297,10 +297,18 @@ ffi_closure_pa32: + .LSCIE1: + .word 0x0 ;# CIE Identifier Tag + .byte 0x1 ;# CIE Version ++#ifdef __PIC__ ++ .ascii "zR\0" ;# CIE Augmentation: 'z' - data, 'R' - DW_EH_PE_... data ++#else + .ascii "\0" ;# CIE Augmentation ++#endif + .uleb128 0x1 ;# CIE Code Alignment Factor + .sleb128 4 ;# CIE Data Alignment Factor + .byte 0x2 ;# CIE RA Column ++#ifdef __PIC__ ++ .uleb128 0x1 ;# Augmentation size ++ .byte 0x1b ;# FDE Encoding (DW_EH_PE_pcrel|DW_EH_PE_sdata4) ++#endif + .byte 0xc ;# DW_CFA_def_cfa + .uleb128 0x1e + .uleb128 0x0 +@@ -310,9 +318,15 @@ ffi_closure_pa32: + .word .LEFDE1-.LASFDE1 ;# FDE Length + .LASFDE1: + .word .LASFDE1-.Lframe1 ;# FDE CIE offset +- .word .LFB1 ;# FDE initial location ++#ifdef __PIC__ ++ .word .LFB1-. ;# FDE initial location ++#else ++ .word .LFB1 ;# FDE initial location ++#endif + .word .LFE1-.LFB1 ;# FDE address range +- ++#ifdef __PIC__ ++ .uleb128 0x0 ;# Augmentation size: no data ++#endif + .byte 0x4 ;# DW_CFA_advance_loc4 + .word .LCFI11-.LFB1 + .byte 0x83 ;# DW_CFA_offset, column 0x3 +@@ -338,8 +352,15 @@ ffi_closure_pa32: + .word .LEFDE2-.LASFDE2 ;# FDE Length + .LASFDE2: + .word .LASFDE2-.Lframe1 ;# FDE CIE offset ++#ifdef __PIC__ ++ .word .LFB2-. ;# FDE initial location ++#else + .word .LFB2 ;# FDE initial location ++#endif + .word .LFE2-.LFB2 ;# FDE address range ++#ifdef __PIC__ ++ .uleb128 0x0 ;# Augmentation size: no data ++#endif + .byte 0x4 ;# DW_CFA_advance_loc4 + .word .LCFI21-.LFB2 + .byte 0x83 ;# DW_CFA_offset, column 0x3 +-- +2.19.0 + |