Date: Monday, October 23, 2017 @ 11:49:42 Author: heftig Revision: 264051
archrelease: copy trunk to multilib-testing-x86_64 Added: gcc-multilib/repos/multilib-testing-x86_64/ gcc-multilib/repos/multilib-testing-x86_64/PKGBUILD (from rev 264050, gcc-multilib/trunk/PKGBUILD) gcc-multilib/repos/multilib-testing-x86_64/PR82155.patch (from rev 264050, gcc-multilib/trunk/PR82155.patch) gcc-multilib/repos/multilib-testing-x86_64/Revert-eeb6872bf.patch (from rev 264050, gcc-multilib/trunk/Revert-eeb6872bf.patch) ------------------------+ PKGBUILD | 411 +++++++++++++++++++++++++++++++++++++++++++++++ PR82155.patch | 119 +++++++++++++ Revert-eeb6872bf.patch | 82 +++++++++ 3 files changed, 612 insertions(+) Copied: gcc-multilib/repos/multilib-testing-x86_64/PKGBUILD (from rev 264050, gcc-multilib/trunk/PKGBUILD) =================================================================== --- multilib-testing-x86_64/PKGBUILD (rev 0) +++ multilib-testing-x86_64/PKGBUILD 2017-10-23 11:49:42 UTC (rev 264051) @@ -0,0 +1,411 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Allan McRae <al...@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: libtool requires rebuilt with each new gcc version + +pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') +pkgver=7.2.0 +_pkgver=${pkgver:0:1} +_islver=0.18 +pkgrel=3 +_commit=1bd23ca8c30f4827c4bea23deedf7ca33a86ffb5 +pkgdesc="The GNU Compiler Collection for multilib" +arch=('x86_64') +license=('GPL' 'LGPL' 'FDL' 'custom') +url="http://gcc.gnu.org" +makedepends=('binutils>=2.29' 'libmpc' 'gcc-ada-multilib' 'doxygen' 'git' + 'lib32-glibc>=2.26') +checkdepends=('dejagnu' 'inetutils') +options=('!emptydirs') +source=(git+https://gcc.gnu.org/git/gcc.git#commit=${_commit} + http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2 + Revert-eeb6872bf.patch + PR82155.patch) +md5sums=('SKIP' + '11436d6b205e516635b666090b94ab32' + 'e4c9c8b498b04c0f51d219d025ca8407' + 'e77419f7d25aad0980c765012dc8c417') + +_libdir="usr/lib/gcc/$CHOST/$pkgver" + +prepare() { + cd ${srcdir}/gcc + + # link isl for in-tree build + ln -s ../isl-${_islver} isl + + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + # Arch Linux installs x86_64 libraries /lib + [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 + + # hack! - some configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80717 + git apply ../Revert-eeb6872bf.patch + + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82155 + patch -p1 -i ../PR82155.patch + + mkdir ${srcdir}/gcc-build +} + +build() { + cd ${srcdir}/gcc-build + + # using -pipe causes spurious test-suite failures + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 + CFLAGS=${CFLAGS/-pipe/} + CXXFLAGS=${CXXFLAGS/-pipe/} + + ${srcdir}/gcc/configure --prefix=/usr \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ + --enable-shared \ + --enable-threads=posix \ + --enable-libmpx \ + --with-system-zlib \ + --with-isl \ + --enable-__cxa_atexit \ + --disable-libunwind-exceptions \ + --enable-clocale=gnu \ + --disable-libstdcxx-pch \ + --disable-libssp \ + --enable-gnu-unique-object \ + --enable-linker-build-id \ + --enable-lto \ + --enable-plugin \ + --enable-install-libiberty \ + --with-linker-hash-style=gnu \ + --enable-gnu-indirect-function \ + --enable-multilib \ + --disable-werror \ + --enable-checking=release \ + --enable-default-pie \ + --enable-default-ssp + + make + + # make documentation + make -C $CHOST/libstdc++-v3/doc doc-man-doxygen +} + +check() { + cd ${srcdir}/gcc-build + + # increase stack size to prevent test failures + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 + ulimit -s 32768 + + # do not abort on error as some are "expected" + make -k check || true + ${srcdir}/gcc/contrib/test_summary +} + +package_lib32-gcc-libs() +{ + pkgdesc="Runtime libraries shipped by GCC (32-bit)" + depends=('lib32-glibc>=2.25') + options=('!emptydirs' '!strip') + + cd ${srcdir}/gcc-build + + make -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared + rm ${pkgdir}/${_libdir}/32/libgcc_eh.a + + for lib in libatomic \ + libcilkrts \ + libgfortran \ + libgo \ + libgomp \ + libitm \ + libquadmath \ + libsanitizer/{a,l,ub}san \ + libstdc++-v3/src \ + libvtv; do + make -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + done + + make -C $CHOST/32/libobjc DESTDIR=${pkgdir} install-libs + + make -C $CHOST/32/libmpx DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib32/libmpx.spec + + # remove stuff in gcc-libs-multilib + rm -r ${pkgdir}/usr/lib + + # Install Runtime Library Exception + install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \ + "$pkgdir/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION" +} + +package_gcc-libs-multilib() +{ + pkgdesc="Runtime libraries shipped by GCC for multilib" + depends=('glibc>=2.25' "lib32-gcc-libs=$pkgver-$pkgrel") + provides=("gcc-libs=$pkgver-$pkgrel") + conflicts=('gcc-libs') + options=('!emptydirs' '!strip') + + cd ${srcdir}/gcc-build + + make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared + rm ${pkgdir}/${_libdir}/libgcc_eh.a + + for lib in libatomic \ + libcilkrts \ + libgfortran \ + libgo \ + libgomp \ + libitm \ + libquadmath \ + libsanitizer/{a,l,ub}san \ + libstdc++-v3/src \ + libvtv; do + make -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + done + + [[ $CARCH == "x86_64" ]] && \ + make -C $CHOST/libsanitizer/tsan DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + + make -C $CHOST/libobjc DESTDIR=${pkgdir} install-libs + + make -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install + + make -C $CHOST/libmpx DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib/libmpx.spec + + for lib in libgomp \ + libitm \ + libquadmath; do + make -C $CHOST/$lib DESTDIR=${pkgdir} install-info + done + + # remove stuff in lib32-gcc-libs + rm -r ${pkgdir}/usr/lib32 + + # Install Runtime Library Exception + install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \ + "$pkgdir/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION" +} + +package_gcc-multilib() +{ + pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib" + depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils>=2.28' 'libmpc') + groups=('multilib-devel') + options=('staticlibs') + provides=("gcc=$pkgver-$pkgrel") + conflicts=('gcc') + + cd ${srcdir}/gcc-build + + make -C gcc DESTDIR=${pkgdir} install-driver install-cpp install-gcc-ar \ + c++.install-common install-headers install-plugin install-lto-wrapper + + install -m755 -t $pkgdir/usr/bin/ gcc/gcov{,-tool} + install -m755 -t $pkgdir/${_libdir}/ gcc/{cc1,cc1plus,collect2,lto1} + + make -C $CHOST/libgcc DESTDIR=${pkgdir} install + make -C $CHOST/32/libgcc DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib{,32}/libgcc_s.so* + + make -C $CHOST/libstdc++-v3/src DESTDIR=${pkgdir} install + make -C $CHOST/libstdc++-v3/include DESTDIR=${pkgdir} install + make -C $CHOST/libstdc++-v3/libsupc++ DESTDIR=${pkgdir} install + make -C $CHOST/libstdc++-v3/python DESTDIR=${pkgdir} install + make -C $CHOST/32/libstdc++-v3/src DESTDIR=${pkgdir} install + make -C $CHOST/32/libstdc++-v3/include DESTDIR=${pkgdir} install + make -C $CHOST/32/libstdc++-v3/libsupc++ DESTDIR=${pkgdir} install + + make DESTDIR=${pkgdir} install-libcc1 + install -d $pkgdir/usr/share/gdb/auto-load/usr/lib + mv $pkgdir/usr/lib/libstdc++.so.6.*-gdb.py \ + $pkgdir/usr/share/gdb/auto-load/usr/lib/ + rm ${pkgdir}/usr/lib{,32}/libstdc++.so* + + make DESTDIR=${pkgdir} install-fixincludes + make -C gcc DESTDIR=${pkgdir} install-mkheaders + + make -C lto-plugin DESTDIR=${pkgdir} install + install -dm755 ${pkgdir}/usr/lib/bfd-plugins/ + ln -s /usr/lib/gcc/$CHOST/${pkgver}/liblto_plugin.so \ + ${pkgdir}/usr/lib/bfd-plugins/ + + make -C $CHOST/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \ + install-nodist_cilkincludeHEADERS + make -C $CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \ + install-nodist_libsubincludeHEADERS + make -C $CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS + make -C $CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS + make -C $CHOST/libsanitizer DESTDIR=${pkgdir} install-nodist_{saninclude,toolexeclib}HEADERS + make -C $CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS + make -C $CHOST/libmpx DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS + make -C $CHOST/32/libcilkrts DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS + make -C $CHOST/32/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS + make -C $CHOST/32/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS + make -C $CHOST/32/libsanitizer DESTDIR=${pkgdir} install-nodist_{saninclude,toolexeclib}HEADERS + make -C $CHOST/32/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS + make -C $CHOST/32/libmpx DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS + + make -C libiberty DESTDIR=${pkgdir} install + # install PIC version of libiberty + install -m644 ${srcdir}/gcc-build/libiberty/pic/libiberty.a ${pkgdir}/usr/lib + + make -C gcc DESTDIR=${pkgdir} install-man install-info + rm ${pkgdir}/usr/share/man/man1/{gccgo,gfortran}.1 + rm ${pkgdir}/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info + + make -C libcpp DESTDIR=${pkgdir} install + make -C gcc DESTDIR=${pkgdir} install-po + + # many packages expect this symlink + ln -s gcc ${pkgdir}/usr/bin/cc + + # POSIX conformance launcher scripts for c89 and c99 + cat > $pkgdir/usr/bin/c89 <<"EOF" +#!/bin/sh +fl="-std=c89" +for opt; do + case "$opt" in + -ansi|-std=c89|-std=iso9899:1990) fl="";; + -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 + exit 1;; + esac +done +exec gcc $fl ${1+"$@"} +EOF + + cat > $pkgdir/usr/bin/c99 <<"EOF" +#!/bin/sh +fl="-std=c99" +for opt; do + case "$opt" in + -std=c99|-std=iso9899:1999) fl="";; + -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 + exit 1;; + esac +done +exec gcc $fl ${1+"$@"} +EOF + + chmod 755 $pkgdir/usr/bin/c{8,9}9 + + # install the libstdc++ man pages + make -C $CHOST/libstdc++-v3/doc DESTDIR=$pkgdir doc-install-man + + # Install Runtime Library Exception + install -d "$pkgdir/usr/share/licenses/$pkgname/" + ln -s /usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION \ + "$pkgdir/usr/share/licenses/$pkgname/" +} + +package_gcc-fortran-multilib() +{ + pkgdesc="Fortran front-end for GCC for multilib" + depends=("gcc-multilib=$pkgver-$pkgrel") + provides=("gcc-fortran=$pkgver-$pkgrel") + conflicts=('gcc-fortran') + options=('!emptydirs') + + cd ${srcdir}/gcc-build + make -C $CHOST/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \ + install-{toolexeclibDATA,nodist_fincludeHEADERS} + make -C $CHOST/32/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \ + install-{toolexeclibDATA,nodist_fincludeHEADERS} + make -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS + make -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} + install -Dm755 gcc/f951 $pkgdir/${_libdir}/f951 + + ln -s gfortran ${pkgdir}/usr/bin/f95 + + # Install Runtime Library Exception + install -d "$pkgdir/usr/share/licenses/$pkgname/" + ln -s /usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION \ + "$pkgdir/usr/share/licenses/$pkgname/" +} + +package_gcc-objc-multilib() +{ + pkgdesc="Objective-C front-end for GCC for multilib" + depends=("gcc-multilib=$pkgver-$pkgrel") + provides=("gcc-objc=$pkgver-$pkgrel") + conflicts=('gcc-objc') + + cd ${srcdir}/gcc-build + make DESTDIR=$pkgdir -C $CHOST/libobjc install-headers + install -dm755 $pkgdir/${_libdir} + install -m755 gcc/cc1obj{,plus} $pkgdir/${_libdir}/ + + # Install Runtime Library Exception + install -d "$pkgdir/usr/share/licenses/$pkgname/" + ln -s /usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION \ + "$pkgdir/usr/share/licenses/$pkgname/" +} + +package_gcc-ada-multilib() +{ + pkgdesc="Ada front-end for GCC (GNAT) for multilib" + depends=("gcc-multilib=$pkgver-$pkgrel") + provides=("gcc-ada=$pkgver-$pkgrel") + conflicts=('gcc-ada') + options=('staticlibs' '!emptydirs') + + cd ${srcdir}/gcc-build/gcc + make DESTDIR=$pkgdir ada.install-{common,info} + install -m755 gnat1 $pkgdir/${_libdir} + + cd ../$CHOST/32/libada + make DESTDIR=${pkgdir} INSTALL="install" \ + INSTALL_DATA="install -m644" install-gnatlib + + ln -s gcc ${pkgdir}/usr/bin/gnatgcc + + # insist on dynamic linking, but keep static libraries because gnatmake complains + mv ${pkgdir}/${_libdir}/adalib/libgna{rl,t}-${_pkgver}.so ${pkgdir}/usr/lib + ln -s libgnarl-${_pkgver}.so ${pkgdir}/usr/lib/libgnarl.so + ln -s libgnat-${_pkgver}.so ${pkgdir}/usr/lib/libgnat.so + rm ${pkgdir}/${_libdir}/adalib/libgna{rl,t}.so + + install -d ${pkgdir}/usr/lib32/ + mv ${pkgdir}/${_libdir}/32/adalib/libgna{rl,t}-${_pkgver}.so ${pkgdir}/usr/lib32 + ln -s libgnarl-${_pkgver}.so ${pkgdir}/usr/lib32/libgnarl.so + ln -s libgnat-${_pkgver}.so ${pkgdir}/usr/lib32/libgnat.so + rm ${pkgdir}/${_libdir}/32/adalib/libgna{rl,t}.so + + # Install Runtime Library Exception + install -d "$pkgdir/usr/share/licenses/$pkgname/" + ln -s /usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION \ + "$pkgdir/usr/share/licenses/$pkgname/" +} + +package_gcc-go-multilib() +{ + pkgdesc="Go front-end for GCC for multilib" + depends=("gcc-multilib=$pkgver-$pkgrel") + provides=("gcc-go=$pkgver-$pkgrel" "go=1.8.1") + conflicts=('go' 'gcc-go') + options=('!emptydirs') + + cd ${srcdir}/gcc-build + make -C $CHOST/libgo DESTDIR=$pkgdir install-exec-am + make -C $CHOST/32/libgo DESTDIR=$pkgdir install-exec-am + rm ${pkgdir}/usr/lib/libgo.so* ${pkgdir}/usr/lib32/libgo.so* + make -C gcc DESTDIR=$pkgdir go.install-{common,man,info} + install -Dm755 gcc/go1 $pkgdir/${_libdir}/go1 + + make DESTDIR=${pkgdir} install-gotools + + # Install Runtime Library Exception + install -d "$pkgdir/usr/share/licenses/$pkgname/" + ln -s /usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION \ + "$pkgdir/usr/share/licenses/$pkgname/" +} Copied: gcc-multilib/repos/multilib-testing-x86_64/PR82155.patch (from rev 264050, gcc-multilib/trunk/PR82155.patch) =================================================================== --- multilib-testing-x86_64/PR82155.patch (rev 0) +++ multilib-testing-x86_64/PR82155.patch 2017-10-23 11:49:42 UTC (rev 264051) @@ -0,0 +1,119 @@ +From: Pierre-Marie de Rodat <derodat at adacore dot com> +To: gcc-patches at gcc dot gnu dot org +Cc: Pierre-Marie de Rodat <derodat at adacore dot com> +Subject: [PATCH] [PR82155] Fix crash in dwarf2out_abstract_function +Date: Tue, 12 Sep 2017 08:00:03 +0200 +Message-Id: <20170912060003.32378-1-dero...@adacore.com> +X-IsSubscribed: yes + +Hello, + +This patch is an attempt to fix the crash reported in PR82155. + +When generating a C++ class method for a class that is itself nested in +a class method, dwarf2out_early_global_decl currently leaves the +existing context DIE as it is if it already exists. However, it is +possible that this call happens at a point where this context DIE is +just a declaration that is itself not located in its own context. + +>From there, if dwarf2out_early_global_decl is not called on any of the +FUNCTION_DECL in the context chain, DIEs will be left badly scoped and +some (such as the nested method) will be removed by the type pruning +machinery. As a consequence, dwarf2out_abstract_function will will +crash when called on the corresponding DECL because it asserts that the +DECL has a DIE. + +This patch fixes this crash making dwarf2out_early_global_decl process +context DIEs the same way we process abstract origins for FUNCTION_DECL: +if the corresponding DIE exists but is only a declaration, call +dwarf2out_decl anyway on it so that it is turned into a more complete +DIE and so that it is relocated in the proper context. + +Bootstrapped and regtested on x86_64-linux. The crash this addresses is +present both on trunk and on the gcc-7 branch: I suggest we commit this +patch on both branches. Ok to commit? Thank you in advance! + +gcc/ + + PR debug/82155 + * dwarf2out.c (dwarf2out_early_global_decl): Call dwarf2out_decl + on the FUNCTION_DECL function context if it has a DIE that is a + declaration. + +gcc/testsuite/ + + * g++.dg/pr82155.C: New testcase. +--- + gcc/dwarf2out.c | 10 ++++++++-- + gcc/testsuite/g++.dg/pr82155.C | 36 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+), 2 deletions(-) + create mode 100644 gcc/testsuite/g++.dg/pr82155.C + +diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c +index 00d6d951ba3..4cfc9c186af 100644 +--- a/gcc/dwarf2out.c ++++ b/gcc/dwarf2out.c +@@ -25500,10 +25500,16 @@ dwarf2out_early_global_decl (tree decl) + so that all nested DIEs are generated at the proper scope in the + first shot. */ + tree context = decl_function_context (decl); +- if (context != NULL && lookup_decl_die (context) == NULL) ++ if (context != NULL) + { ++ dw_die_ref context_die = lookup_decl_die (context); + current_function_decl = context; +- dwarf2out_decl (context); ++ ++ /* Avoid emitting DIEs multiple times, but still process CONTEXT ++ enough so that it lands in its own context. This avoids type ++ pruning issues later on. */ ++ if (context_die == NULL || is_declaration_die (context_die)) ++ dwarf2out_decl (context); + } + + /* Emit an abstract origin of a function first. This happens +diff --git a/gcc/testsuite/g++.dg/pr82155.C b/gcc/testsuite/g++.dg/pr82155.C +new file mode 100644 +index 00000000000..75d9b615f39 +--- /dev/null ++++ b/gcc/testsuite/g++.dg/pr82155.C +@@ -0,0 +1,36 @@ ++/* { dg-do compile { target c++11 } } */ ++/* { dg-options "-g -O2" } */ ++ ++template <typename a> struct b { a c; }; ++template <typename d> struct e { d *operator->(); }; ++template <typename d> class h { ++public: ++ typedef e<d> ag; ++}; ++class i { ++protected: ++ i(int); ++}; ++class j { ++ virtual void k(int) = 0; ++ ++public: ++ int f; ++ void l() { k(f); } ++}; ++struct m : i { ++ int cn; ++ m() : i(cn) { ++ struct n : j { ++ n() {} ++ void k(int) {} ++ }; ++ } ++}; ++struct o { ++ o() { ++ for (h<b<b<j *>>>::ag g;;) ++ g->c.c->l(); ++ } ++}; ++void fn1() { o(); } +-- +2.14.1 + Copied: gcc-multilib/repos/multilib-testing-x86_64/Revert-eeb6872bf.patch (from rev 264050, gcc-multilib/trunk/Revert-eeb6872bf.patch) =================================================================== --- multilib-testing-x86_64/Revert-eeb6872bf.patch (rev 0) +++ multilib-testing-x86_64/Revert-eeb6872bf.patch 2017-10-23 11:49:42 UTC (rev 264051) @@ -0,0 +1,82 @@ +commit 43d83a70267a9e5c456d28de8e7348820446b712 +Author: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> +Date: Tue May 16 07:50:42 2017 +0200 + + Revert "Prevent LTO wrappers to process a recursive execution" + + This reverts commit eeb6872bfdfd1e71b27de6f62a5f5c08a2efb015. + +diff --git a/gcc/file-find.c b/gcc/file-find.c +index b072a4993d76..b5a1fe8494e8 100644 +--- a/gcc/file-find.c ++++ b/gcc/file-find.c +@@ -208,38 +208,3 @@ prefix_from_string (const char *p, struct path_prefix *pprefix) + } + free (nstore); + } +- +-void +-remove_prefix (const char *prefix, struct path_prefix *pprefix) +-{ +- struct prefix_list *remove, **prev, **remove_prev = NULL; +- int max_len = 0; +- +- if (pprefix->plist) +- { +- prev = &pprefix->plist; +- for (struct prefix_list *pl = pprefix->plist; pl->next; pl = pl->next) +- { +- if (strcmp (prefix, pl->prefix) == 0) +- { +- remove = pl; +- remove_prev = prev; +- continue; +- } +- +- int l = strlen (pl->prefix); +- if (l > max_len) +- max_len = l; +- +- prev = &pl; +- } +- +- if (remove_prev) +- { +- *remove_prev = remove->next; +- free (remove); +- } +- +- pprefix->max_len = max_len; +- } +-} +diff --git a/gcc/file-find.h b/gcc/file-find.h +index 8f49a3af273e..407feba26e74 100644 +--- a/gcc/file-find.h ++++ b/gcc/file-find.h +@@ -41,7 +41,6 @@ extern void find_file_set_debug (bool); + extern char *find_a_file (struct path_prefix *, const char *, int); + extern void add_prefix (struct path_prefix *, const char *); + extern void add_prefix_begin (struct path_prefix *, const char *); +-extern void remove_prefix (const char *prefix, struct path_prefix *); + extern void prefix_from_env (const char *, struct path_prefix *); + extern void prefix_from_string (const char *, struct path_prefix *); + +diff --git a/gcc/gcc-ar.c b/gcc/gcc-ar.c +index 78d2fc1ad306..d5d80e042e5a 100644 +--- a/gcc/gcc-ar.c ++++ b/gcc/gcc-ar.c +@@ -194,14 +194,6 @@ main (int ac, char **av) + #ifdef CROSS_DIRECTORY_STRUCTURE + real_exe_name = concat (target_machine, "-", PERSONALITY, NULL); + #endif +- /* Do not search original location in the same folder. */ +- char *exe_folder = lrealpath (av[0]); +- exe_folder[strlen (exe_folder) - strlen (lbasename (exe_folder))] = '\0'; +- char *location = concat (exe_folder, PERSONALITY, NULL); +- +- if (access (location, X_OK) == 0) +- remove_prefix (exe_folder, &path); +- + exe_name = find_a_file (&path, real_exe_name, X_OK); + if (!exe_name) + {