Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

binutils: revert NT_DLL_AUTO_IMAGE_MASK change

Browse Source 
The address space overlaps with cygwin managed memory, so we either
reduce it a bit again, or we try to find a different solution.

See #2723
This commit is contained in:
Christoph Reiter 2021-12-19 16:42:40 +01:00
parent 6e40fc5b77
commit 7b1ac40b78
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
binutils/3000-more-base-entropy.patch
View File

@ -1,11 +0,0 @@
--- binutils-2.36.1/ld/emultempl/pep.em.orig 2021-05-10 08:58:40.005554200 +0200
+++ binutils-2.36.1/ld/emultempl/pep.em 2021-05-10 09:01:58.002803000 +0200
@@ -117,7 +117,7 @@
: 0x1C0000000LL))
#undef NT_DLL_AUTO_IMAGE_MASK
#define NT_DLL_AUTO_IMAGE_MASK \
- ((bfd_vma) (${move_default_addr_high} ? 0x1ffff0000LL \
+ ((bfd_vma) (${move_default_addr_high} ? 0x7fffff0000LL \
: 0x1ffff0000LL))
#else
#undef NT_EXE_IMAGE_BASE

11
binutils/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgname=binutils pkgname=binutils
pkgver=2.37 pkgver=2.37
pkgrel=4 pkgrel=5
pkgdesc="A set of programs to assemble and manipulate binary and object files" pkgdesc="A set of programs to assemble and manipulate binary and object files"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="https://www.gnu.org/software/binutils/" url="https://www.gnu.org/software/binutils/"
@ -16,15 +16,13 @@ source=(https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.xz{,.sig}
0050-bfd-Increase-_bfd_coff_max_nscns-to-65279.patch 0050-bfd-Increase-_bfd_coff_max_nscns-to-65279.patch
0100-binutils-2.37-msys2.patch 0100-binutils-2.37-msys2.patch
2000-Temporarily-revert-default-dll-characteristics.patch 2000-Temporarily-revert-default-dll-characteristics.patch
2002-Allow-spaces-in-the-name-of-the-external-preprocesso.patch 2002-Allow-spaces-in-the-name-of-the-external-preprocesso.patch)
3000-more-base-entropy.patch)
sha256sums=('820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c' sha256sums=('820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c'
'SKIP' 'SKIP'
'4e8ac055df61b1b5d6ae29dc87e1154737c2e87c7b244b44866702cabf1a5d18' '4e8ac055df61b1b5d6ae29dc87e1154737c2e87c7b244b44866702cabf1a5d18'
'4c5b251beb036814992bc1b6538b5ff49259e073b7cc982e036c76050a866a51' '4c5b251beb036814992bc1b6538b5ff49259e073b7cc982e036c76050a866a51'
'29c1aab1eb96bc188c1ad29422f611e7c946cca901aed29ee2d0b9e861c75a23' '29c1aab1eb96bc188c1ad29422f611e7c946cca901aed29ee2d0b9e861c75a23'
'57478b9971183d430c93701b1d533e3724dab5334bbf44db924777e4a93c1063' '57478b9971183d430c93701b1d533e3724dab5334bbf44db924777e4a93c1063')
'ce3cda1ad8ff8379869142226178b5f7fdb5b93f85a43d3437475ea0314dbf1b')
validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93' validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93'
'3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') '3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F')
@ -39,9 +37,6 @@ prepare() {
# https://github.com/msys2/MSYS2-packages/issues/2379 # https://github.com/msys2/MSYS2-packages/issues/2379
patch -R -p1 -i "${srcdir}"/2002-Allow-spaces-in-the-name-of-the-external-preprocesso.patch patch -R -p1 -i "${srcdir}"/2002-Allow-spaces-in-the-name-of-the-external-preprocesso.patch
# https://github.com/msys2/MSYS2-packages/issues/2487
patch -p1 -i "${srcdir}"/3000-more-base-entropy.patch
# hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure