From patchwork Tue Nov 2 09:47:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 46950 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F33F93858034 for ; Tue, 2 Nov 2021 09:48:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F33F93858034 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1635846497; bh=+I5GGN5QA9iFV8dTcItTWHR/8XF1tvfbupvN9Wmavf0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=qAozy2owxDFl/lnCBwhUiS0dxhktiMiGDhX3CEVHc+f9IOd2wbr1jVptK/J7R3/E3 YDlYxXKnN/lFkckyXqRSzN1D/9L49nva9DzPJs+PNaQtIvt3PAIi3NPcVhKnUT6Fp2 TSzgB8CL6bYUuZYHZpWy+plSUhVsiJv1Sv54fx0M= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smarthost1.atos.net (smtppost.atos.net [193.56.114.176]) by sourceware.org (Postfix) with ESMTPS id 4DAFD3858C27 for ; Tue, 2 Nov 2021 09:47:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4DAFD3858C27 X-IronPort-AV: E=Sophos;i="5.87,202,1631570400"; d="scan'208,223";a="279555944" X-MGA-submission: MDFN3mke/W5F/iZt4kTwKRQGjEvZI+IJRDQ+ROVba5Jy8ilSGMnPVbVHAxWXWYv9antw8OlENb5uhleujcHq7k3aqXzah9wxNm6dXbLsDJUadGjifvBpQFcQE8SXnEjheyEX8T82kCDVu0f37WSp17xE Received: from mail.sis.atos.net (HELO GITEXCPRDMB13.ww931.my-it-solutions.net) ([10.89.28.143]) by smarthost1.atos.net with ESMTP/TLS/AES256-GCM-SHA384; 02 Nov 2021 10:47:41 +0100 Received: from GITEXCPRDMB12.ww931.my-it-solutions.net (10.89.28.142) by GITEXCPRDMB13.ww931.my-it-solutions.net (10.89.28.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Tue, 2 Nov 2021 10:47:41 +0100 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (172.16.214.172) by GITEXCPRDMB12.ww931.my-it-solutions.net (10.89.28.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15 via Frontend Transport; Tue, 2 Nov 2021 10:47:41 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lmue8a3KeW7QekUygyBZd/q0wS2haQIq/8Bh8LDESkEGgM9nO1zjAj1vMHv+7tV+Vqe+O/xxwrNPeJsjWxlDYY/7lMfut4EeYk8IqQAwYfZ1E3At25dRFXYi2XaZX+VLbQP25R4q1DDxw6PVZYPowlcHxdMU50L2jmIYoG5Zw3/iN+/xDpFH30aR7RBlWzI1UW+k7Nh8CRk1K7gMpAfHlhhzTv1qaNTMvA8SUn7Ax9qAa5bZFYLGFRa/OR0qEoZU0R1hie1x9RfHAEOhIAaSW+TRKY064haCoFwshhOTACaRIWs/pJcuZlLrCIoQh9Mx6fM+TSZO3om6w0kFsfvt9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+I5GGN5QA9iFV8dTcItTWHR/8XF1tvfbupvN9Wmavf0=; b=KK30E4NFXeKO6GUAQ6HCxPaiElCdQuN+6jY0FWQC7lK0G4oVaX6Q3Pjl05ocbMJiAVZokkeprEJ7DeU7Zkj/WsuejGGZ5MIKgzknJel4rVCNi5LfQwMPbOvdhAT24IwQQAGISNo9MjZEMdefF9k4KNCi5jFNqt6CzAlSlCbbNYZm20GU6vSTHOYvfVIa6VJYi9zDyE2l6Uq01Y3kiiobxwRUrjhSB5cQnomnzxcfTJBsmHc2l/t3YN2YlxVxUSMP7JLEvF5u+k4j+a5L60ZzDFA0TjmqYZAWsZ77AHJ9Ye+gjVPJbp7KdRJs59gzCqV6gG7c3/lgLwPINU4YdOmcUw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=atos.net; dmarc=pass action=none header.from=atos.net; dkim=pass header.d=atos.net; arc=none Received: from PA4PR02MB6686.eurprd02.prod.outlook.com (2603:10a6:102:ff::14) by PA4PR02MB6829.eurprd02.prod.outlook.com (2603:10a6:102:d5::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14; Tue, 2 Nov 2021 09:47:40 +0000 Received: from PA4PR02MB6686.eurprd02.prod.outlook.com ([fe80::2c38:ed65:ad69:ee67]) by PA4PR02MB6686.eurprd02.prod.outlook.com ([fe80::2c38:ed65:ad69:ee67%5]) with mapi id 15.20.4649.019; Tue, 2 Nov 2021 09:47:40 +0000 To: "gcc-patches@gcc.gnu.org" Subject: aix: Add FAT library support for libffi for AIX Thread-Topic: aix: Add FAT library support for libffi for AIX Thread-Index: AQHXz83SlrxZ92Kxn02pN3fl59v6dg== Date: Tue, 2 Nov 2021 09:47:40 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: msip_labels: MSIP_Label_e463cba9-5f6c-478d-9329-7b2295e4e8ed_Enabled=True; MSIP_Label_e463cba9-5f6c-478d-9329-7b2295e4e8ed_SiteId=33440fc6-b7c7-412c-bb73-0e70b0198d5a; MSIP_Label_e463cba9-5f6c-478d-9329-7b2295e4e8ed_SetDate=2021-11-02T09:49:30.365Z; MSIP_Label_e463cba9-5f6c-478d-9329-7b2295e4e8ed_Name=Atos For Internal Use - All Employees; MSIP_Label_e463cba9-5f6c-478d-9329-7b2295e4e8ed_ContentBits=0; MSIP_Label_e463cba9-5f6c-478d-9329-7b2295e4e8ed_Method=Standard; suggested_attachment_session_id: a42213bd-4ac1-add8-ea9e-25a96acb04be x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5b965f3e-496c-4f10-1b7d-08d99de5cfb8 x-ms-traffictypediagnostic: PA4PR02MB6829: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3968; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: vWfs38JYKaqgaOJAIsktRuOyrItjF0SKpBUoQRuBP4ZIQ9jXl0GtbonYxIELr3m5JJEQNxdTW5sMzK6gOEyBD5/K2ZxTEXs+lQdkZV2WlThrksvqIRzC4VRmAQY1xUuf50Lg68n8VCY6lxTXwY3FZfjtI1Zr2l6NoXqq+bcyVJiJCAOtpyK9emussqxveWDMccCceR07G8viWg2VhSlX0NyDs9vPzsmcRPOliY9bvGLrGEQ7DPQKHqIQg2kg+8i6eqxbPWjsdV4+N99kuDWixQrfCKm6qhxmVKwalD3Sqf+g1YnJEJz0clTS2b1MsSZASEmgm4NJ2yyLXSa4SlqPOxCEXs6IY68HEXs+4YQln6vd83tRJeFaSFhrwCTBoxwz/mom9hjQuETRJQginWWvvSesoYX0Gyq9zuCHrUMYzFECZDp4XkjMMmgCQTnyvsSypGThXcLhE/b4aSVvBNvZYBkRSXEsygd+z52k+zRFr4x5wOwRdYd2+Y99Af+aMkLDA6rLgxn9dNvAVTs8NW18pX3U004Atsyoo2WvVQx5tUUglPkHnrQYNAOjV7Hwr5O3vAHXno1jqRAE0XWhUyFQdk5d4pCsgqoHVKMj+3S/Ubiq2WSSn7JNLDhzUQIwcdfbcfyLEsINEe7CSfNq+BKWHOLbvVhG4NR3qsNBCH9SG2YER1Knl2/vYTeEXL0t7pYbHa/ZfySkq/TeyhWKCOJ+Grw7jEQOH5LiiOCFUlFSlzpEEoib5Mi1evVXMKYV5Dqa x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR02MB6686.eurprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(186003)(5660300002)(4326008)(8676002)(38070700005)(122000001)(83380400001)(8936002)(508600001)(4744005)(71200400001)(26005)(966005)(66574015)(52536014)(6916009)(66476007)(99936003)(55016002)(9686003)(4001150100001)(316002)(76116006)(66946007)(82960400001)(54906003)(7696005)(66556008)(6506007)(38100700002)(33656002)(64756008)(66446008)(55236004)(2906002)(86362001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?RgPCTVunGoQETia5gqx2+ir?= =?iso-8859-1?q?1ld9+SGZR84VPRf//si+SzdDLaddFHsVvCgZQIDuNn5lIVDdGrKfvN9fcbbt?= =?iso-8859-1?q?lKXILXKCaWhgxvO6LUVTNZeha+GYh4u3SDAA2wXbcf/ZrXoCJlkSqtmMoxQT?= =?iso-8859-1?q?SYtgSPlQXxaJeFO7q3nkIOmfLoKeUSTMEdD818MHaAHzWaUrMifvoLlLDVDE?= =?iso-8859-1?q?O+K1jCjVsXXCx6bgSrBF8Y8o3XbwmnxljLQvyMzf9A1/nRrxUIBe/WGTRHFu?= =?iso-8859-1?q?o69/xxP/AkRf7lq/5yJ5ZH03W5kWAHTIcKL9zPUoxutoIKRuhvPGhWC+tveG?= =?iso-8859-1?q?0m6PA/KOvnwlPuAplC2o9i8u7UwmF2nMc276n1Ge4I4kJ8zhmTQVE3aoALA0?= =?iso-8859-1?q?S5/MoaUex6iXsSkQSnPz/LfaSp91Pf7iu3cmDwcjf4IbvRQmHh7hi4QS4Qf7?= =?iso-8859-1?q?88R2QT2eTNpAM3es09TnRuPYXSb/ThDACmq1HS+YcUDzkRJCXxuz/V4NcQ6U?= =?iso-8859-1?q?KpWDrDaIeNqnTvtU1EuMrif8m9TD6oKL/2cCf39ywiR/2fiE8cyNqgJDjFnd?= =?iso-8859-1?q?O1UQt3EzjG5tf2jzgudcvfEQI320ETbY8Bk79igutdRFPNLoKNH6vVHbmtck?= =?iso-8859-1?q?vL4nNj5HLDTrBuZDzM10t9uhLZ1MQZ1YgtDbJNlJWGNvTvPxYKvt3nGJrdUh?= =?iso-8859-1?q?jVbPmGNsUEAYrOoejibiziKtT1UbBbHYkGY0m4FG4OX56jNuNe/zAGcNBA0g?= =?iso-8859-1?q?+DoI0I00zxOcKx/grMm6XYt9k7ttVU3G6OD1/rdfAckWveet3DRYQH63Kxqp?= =?iso-8859-1?q?FEHvPb3XO77yUyIFa8RO/1227el6DdcW2hSeXJ0mji1fxmi6fH3OiTToEfJ2?= =?iso-8859-1?q?pT4065fiKOHZIP4RZmJo6upQ1brtBPGDTTQIT1UzTMaXbokV7LhG9sCGW+5C?= =?iso-8859-1?q?6mdkOaG2wdAwBoOBkiedCaOOsXEeyy9Jm/bUUxZGBEuHzc7ofiqSyNJG8vJp?= =?iso-8859-1?q?4nhUguWGyw65im32eeEDrtdyO7gf7s4O1XTl9/oIKCDjpkb54V1j6fpS3goz?= =?iso-8859-1?q?aDNkb5/esNEjsL/OB7CkG1w5pycskJKEmjzZX4U5FL1fywvASVSL8qFsnNIQ?= =?iso-8859-1?q?0tWfXRmBBm7uqMrdSl2jNmtC3vBB2Q5wnV2w9KbnVA4FKFm1DYAjM+fformU?= =?iso-8859-1?q?w8Zg+Ad5bp24LgWkHQYyFhz7ZQjH6ebORg6yrYV5Ai0D5tifAgpplGmLhNaa?= =?iso-8859-1?q?rn2dEFJFGhU6D8bLrGATygrioMg51kTm+SalMyDS+kBo9mjjegbUFmsDwMN1?= =?iso-8859-1?q?Pdy/455I35im71nFIq6f/qHOrJfHJUQ6bLMJhnZuBx5jYIK6QJ4wNXbyExMP?= =?iso-8859-1?q?UF1SKYmnjVbu+H+HFfwH2Pp/iLRiXNpUHBLzabvO29QKZpXusaRc7bnLsidK?= =?iso-8859-1?q?tLma4PQI3j+9+4mw68CvigSk0xUnGPmGyid0KxOG+PGZhdZD4r7ttdGrP4Cl?= =?iso-8859-1?q?/HDm/oQ7CUQIGGqOx9erfH7Bs1R6V6ONjTD6+sR1ZCxpJeqDoSyXen31/GTJ?= =?iso-8859-1?q?0/z6vmIcIvdkE5IOCYmc8i8QxHL2a3hGBW3+q3/QGLw6Gbm9/vl5/TyMxmwe?= =?iso-8859-1?q?pbunACbbOuAn7WEJ+Cx/esA2iZ4yDkDhuUl/6yg=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PA4PR02MB6686.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b965f3e-496c-4f10-1b7d-08d99de5cfb8 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Nov 2021 09:47:40.6442 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 33440fc6-b7c7-412c-bb73-0e70b0198d5a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4r960HWMZqDIT32V7HJjGpTcu3ZUffNVNMRuDtpjLMHJZWcnSQXmTARx00RIjmlEGl+zYrkKO4sX9eN8M6wMfw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR02MB6829 X-OriginatorOrg: atos.net X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, GIT_PATCH_0, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "CHIGOT, CLEMENT via Gcc-patches" From: "Li, Pan2 via Gcc-patches" Reply-To: "CHIGOT, CLEMENT" Cc: David Edelsohn Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Even if GCC64 is able to boostrap without libffi being a FAT library on AIX, the tests for "-maix32" are not working without it. libffi/ChangeLog: 2021-10-21  Clément Chigot           * Makefile.am (tmake_file): Build and install AIX-style FAT           libraries.         * Makefile.in: Regenerate.         * include/Makefile.in: Regenerate.         * man/Makefile.in: Regenerate.         * testsuite/Makefile.in: Regenerate.         * configure (tmake_file): Substitute.         * configure.ac: Regenerate.         * configure.host (powerpc-*-aix*): Define tmake_file.         * src/powerpc/t-aix: New file. I've already made a PR to libffi itself in order to add the common part of this patch to it. But for now, it's still unmerged: https://github.com/libffi/libffi/pull/661. Clément From 9722d209326b84d8817c1ae654190bdc6b546690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Date: Thu, 21 Oct 2021 09:07:04 +0200 Subject: [PATCH] aix: Add FAT library support for libffi for AIX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Even if GCC64 is able to boostrap without libffi being a FAT library on AIX, the tests for "-maix32" are not working without it. libffi/ChangeLog: 2021-10-21 Clément Chigot * Makefile.am (tmake_file): Build and install AIX-style FAT libraries. * Makefile.in: Regenerate. * include/Makefile.in: Regenerate. * man/Makefile.in: Regenerate. * testsuite/Makefile.in: Regenerate. * configure (tmake_file): Substitute. * configure.ac: Regenerate. * configure.host (powerpc-*-aix*): Define tmake_file. * src/powerpc/t-aix: New file. --- libffi/Makefile.am | 3 +++ libffi/Makefile.in | 4 ++++ libffi/configure | 17 +++++++++++++++-- libffi/configure.ac | 12 ++++++++++++ libffi/configure.host | 2 ++ libffi/include/Makefile.in | 1 + libffi/man/Makefile.in | 1 + libffi/src/powerpc/t-aix | 14 ++++++++++++++ libffi/testsuite/Makefile.in | 1 + 9 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 libffi/src/powerpc/t-aix diff --git a/libffi/Makefile.am b/libffi/Makefile.am index 02e36176c67..c671444c57c 100644 --- a/libffi/Makefile.am +++ b/libffi/Makefile.am @@ -228,4 +228,7 @@ clean-recursive: clean-multi distclean-recursive: distclean-multi maintainer-clean-recursive: maintainer-clean-multi +# target overrides +-include $(tmake_file) + include $(top_srcdir)/../multilib.am diff --git a/libffi/Makefile.in b/libffi/Makefile.in index 6ff0c67a779..86eb1104f94 100644 --- a/libffi/Makefile.in +++ b/libffi/Makefile.in @@ -439,6 +439,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +tmake_file = @tmake_file@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ top_build_prefix = @top_build_prefix@ @@ -1931,6 +1932,9 @@ clean-recursive: clean-multi distclean-recursive: distclean-multi maintainer-clean-recursive: maintainer-clean-multi +# target overrides +-include $(tmake_file) + # GNU Make needs to see an explicit $(MAKE) variable in the command it # runs to enable its job server during parallel builds. Hence the # comments below. diff --git a/libffi/configure b/libffi/configure index 4bababb87f5..9550a0906eb 100755 --- a/libffi/configure +++ b/libffi/configure @@ -644,6 +644,7 @@ LIBFFI_BUILD_VERSIONED_SHLIB_FALSE LIBFFI_BUILD_VERSIONED_SHLIB_TRUE OPT_LDFLAGS SECTION_LDFLAGS +tmake_file toolexeclibdir toolexecdir FFI_DEBUG_FALSE @@ -11481,7 +11482,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11484 "configure" +#line 11485 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11587,7 +11588,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11590 "configure" +#line 11591 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16384,6 +16385,18 @@ esac +# Conditionalize the makefile for this target machine. +tmake_file_= +for f in ${tmake_file} +do + if test -f ${srcdir}/src/$TARGETDIR/$f + then + tmake_file_="${tmake_file_} \$(srcdir)/src/$TARGETDIR/$f" + fi +done +tmake_file="${tmake_file_}" + + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" else diff --git a/libffi/configure.ac b/libffi/configure.ac index bff5a1e7189..71777ea9b11 100644 --- a/libffi/configure.ac +++ b/libffi/configure.ac @@ -403,6 +403,18 @@ esac AC_SUBST(toolexecdir) AC_SUBST(toolexeclibdir) +# Conditionalize the makefile for this target machine. +tmake_file_= +for f in ${tmake_file} +do + if test -f ${srcdir}/src/$TARGETDIR/$f + then + tmake_file_="${tmake_file_} \$(srcdir)/src/$TARGETDIR/$f" + fi +done +tmake_file="${tmake_file_}" +AC_SUBST(tmake_file) + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" else diff --git a/libffi/configure.host b/libffi/configure.host index 268267183a0..49704cb7056 100644 --- a/libffi/configure.host +++ b/libffi/configure.host @@ -207,6 +207,8 @@ case "${host}" in ;; powerpc-*-aix* | rs6000-*-aix*) TARGET=POWERPC_AIX; TARGETDIR=powerpc + # Create AIX-style "FAT" libraries. + tmake_file="t-aix" ;; powerpc-*-freebsd* | powerpc-*-openbsd* | powerpc-*-netbsd*) TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc diff --git a/libffi/include/Makefile.in b/libffi/include/Makefile.in index c76e2a8c6f5..a0c4d7ea5e3 100644 --- a/libffi/include/Makefile.in +++ b/libffi/include/Makefile.in @@ -311,6 +311,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +tmake_file = @tmake_file@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ top_build_prefix = @top_build_prefix@ diff --git a/libffi/man/Makefile.in b/libffi/man/Makefile.in index 8dbe52ff5af..93c7a834c96 100644 --- a/libffi/man/Makefile.in +++ b/libffi/man/Makefile.in @@ -293,6 +293,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +tmake_file = @tmake_file@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ top_build_prefix = @top_build_prefix@ diff --git a/libffi/src/powerpc/t-aix b/libffi/src/powerpc/t-aix new file mode 100644 index 00000000000..098a806c005 --- /dev/null +++ b/libffi/src/powerpc/t-aix @@ -0,0 +1,14 @@ +ifeq ($(MULTIBUILDTOP),) +BITS=$(shell if test -z "`$(CC) -x c -E /dev/null -g3 -o - | grep 64BIT`" ; then \ + echo '64'; else echo '32'; fi) +ARX=$(shell echo $(AR) | sed -e 's/-X[^ ]*//g') +LIBTOOL_VERSION_CURRENT=$(firstword $(subst :, ,$(shell grep -v '^\#' $(srcdir)/libtool-version))) +LIBTOOL_VERSION_AGE=$(lastword $(subst :, ,$(shell grep -v '^\#' $(srcdir)/libtool-version))) +MAJOR=$(shell echo $(LIBTOOL_VERSION_CURRENT)-$(LIBTOOL_VERSION_AGE) | bc) +all-local: $(toolexeclib_LTLIBRARIES) + -rm -f .libs/$(PACKAGE).a ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a + $(AR) rc .libs/$(PACKAGE).a .libs/$(PACKAGE).so.$(MAJOR) + $(AR) rc ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a ../pthread/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR) + $(ARX) -X$(BITS) rc .libs/$(PACKAGE).a ../ppc$(BITS)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR) + $(ARX) -X$(BITS) rc ../pthread/$(PACKAGE)/.libs/$(PACKAGE).a ../pthread/ppc$(BITS)/$(PACKAGE)/.libs/$(PACKAGE).so.$(MAJOR) +endif \ No newline at end of file diff --git a/libffi/testsuite/Makefile.in b/libffi/testsuite/Makefile.in index 3e9e937b752..ae9d870ee0f 100644 --- a/libffi/testsuite/Makefile.in +++ b/libffi/testsuite/Makefile.in @@ -266,6 +266,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +tmake_file = @tmake_file@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ top_build_prefix = @top_build_prefix@ -- 2.33.0