From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 232FB13835A for ; Tue, 22 Dec 2020 21:30:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CCB9E0AB5; Tue, 22 Dec 2020 21:30:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3BB54E0AB6 for ; Tue, 22 Dec 2020 21:30:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C728634116B for ; Tue, 22 Dec 2020 21:30:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38625431 for ; Tue, 22 Dec 2020 21:30:09 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1608671822.48b366594ab49dd0be7a6807561f31e82d0d82d0.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: sys-devel/binutils-config/files/, sys-devel/binutils-config/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: sys-devel/binutils-config/binutils-config-5.1-r3.ebuild sys-devel/binutils-config/files/ldwrapper.c X-VCS-Directories: sys-devel/binutils-config/ sys-devel/binutils-config/files/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 48b366594ab49dd0be7a6807561f31e82d0d82d0 X-VCS-Branch: master Date: Tue, 22 Dec 2020 21:30:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0ea95bec-e50c-497a-b98b-ebbcd1aeb2c2 X-Archives-Hash: 65a366bdedb1ae25fe85a2b69409d86b commit: 48b366594ab49dd0be7a6807561f31e82d0d82d0 Author: Fabian Groffen gentoo org> AuthorDate: Tue Dec 22 21:17:02 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Dec 22 21:17:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=48b36659 sys-devel/binutils-config: drop ~ppc-aix Bug: https://bugs.gentoo.org/760057 Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> .../binutils-config/binutils-config-5.1-r3.ebuild | 2 +- sys-devel/binutils-config/files/ldwrapper.c | 23 ---------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/sys-devel/binutils-config/binutils-config-5.1-r3.ebuild b/sys-devel/binutils-config/binutils-config-5.1-r3.ebuild index fd26184271..dc28f6c5a4 100644 --- a/sys-devel/binutils-config/binutils-config-5.1-r3.ebuild +++ b/sys-devel/binutils-config/binutils-config-5.1-r3.ebuild @@ -13,7 +13,7 @@ WRAPPER_REV="${PV%%.*}.3.4" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" # We also RDEPEND on sys-apps/findutils which is in base @system diff --git a/sys-devel/binutils-config/files/ldwrapper.c b/sys-devel/binutils-config/files/ldwrapper.c index 3ff5a0bc3e..7410afd334 100644 --- a/sys-devel/binutils-config/files/ldwrapper.c +++ b/sys-devel/binutils-config/files/ldwrapper.c @@ -210,7 +210,6 @@ main(int argc, char *argv[]) char is_cross = 0; char is_darwin = 0; char darwin_use_rpath = 1; - char is_aix = 0; char *p; size_t len; int i; @@ -269,7 +268,6 @@ main(int argc, char *argv[]) snprintf(ctarget, sizeof(ctarget), "%s", CHOST); is_darwin = strstr(ctarget, "-darwin") != NULL; - is_aix = strstr(ctarget, "-aix") != NULL; /* cannonicanise wrapper step2: strip CTARGET from wrapper */ len = strlen(ctarget); @@ -349,11 +347,6 @@ main(int argc, char *argv[]) /* add the 4 paths we want (-L + -R) */ newargc += 8; } - - if (is_aix) { - /* AIX ld accepts -R only with -bsvr4 */ - newargc++; /* -bsvr4 */ - } } /* account the original arguments */ @@ -396,19 +389,6 @@ main(int argc, char *argv[]) /* position k right after the original arguments */ k = j - 1 + argc; for (i = 1; i < argc; i++, j++) { - if (is_aix) { - /* AIX ld has this problem: - * $ /usr/ccs/bin/ld -bsvr4 -bE:xx.exp -bnoentry xx.o - * ld: 0706-005 Cannot find or open file: l - * ld:open(): No such file or directory - * Simplest workaround is to put -bsvr4 last. - */ - if (strcmp(argv[i], "-bsvr4") == 0) { - --j; --k; - continue; - } - } - newargv[j] = argv[i]; if (is_cross || (is_darwin && !darwin_use_rpath)) @@ -484,9 +464,6 @@ main(int argc, char *argv[]) newargv[k++] = "-L" EPREFIX "/lib"; newargv[k++] = "-R" EPREFIX "/lib"; } - - if (is_aix) - newargv[k++] = "-bsvr4"; /* last one, see above */ } newargv[k] = NULL;