From patchwork Tue Jun 28 16:39:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 13438 Received: (qmail 27019 invoked by alias); 28 Jun 2016 16:42:42 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 26738 invoked by uid 89); 28 Jun 2016 16:42:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=7_ X-HELO: na01-bl2-obe.outbound.protection.outlook.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@caviumnetworks.com; From: Yury Norov To: , CC: , , , , , , , , , , , , , , , , Andrew Pinski , Yury Norov Subject: [PATCH 15/23] [AARCH64] Add ldd-rewrite.sed so that ilp32 ld.so can be found Date: Tue, 28 Jun 2016 19:39:30 +0300 Message-ID: <1467131978-669-16-git-send-email-ynorov@caviumnetworks.com> In-Reply-To: <1467131978-669-1-git-send-email-ynorov@caviumnetworks.com> References: <1467131978-669-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-ClientProxiedBy: AM5PR0901CA0001.eurprd09.prod.outlook.com (10.164.186.139) To CY1PR07MB2248.namprd07.prod.outlook.com (10.164.112.150) X-MS-Office365-Filtering-Correlation-Id: dbbed66b-462a-443f-4278-08d39f732fe4 X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 2:UnVZKvwmglHtxQRJmrAZDitQKS16RH6pGTO5XU9/mEd2qfDc+pEyHkm4+dVz8iwCPp7M/yn0rpAf8iQ8hKzrCT6Ea4TjQMsEed0LXhmR0ibmrmRXY0vq6CG4i9tFIBmpFwUWWnALDY/zCr4iQMF2RYKH7xuy6S/giUpLwBF0lrK10/Fz2EtRlLmqDm6CgCGn; 3:SPyeSgRzAajiHHG0IKEdYXU+KLxr8EnovVlEcVNsxEHmeTIGwUTQ1sBx7nGSAMnb8fB2tETubuX54DEMyf631DzpwCAxnQUWS7IThvgZPYKloB3opjMPN/5fvVoQ71ja X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR07MB2248; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 25:/HXSB/UoCt/o03qHPYXdVATrIjLnQ48typyIC8jUcVz250wuYnV1jV439uzeE7hoF2JZ7Fm+4A6Bf3HJ6mfLP5z/tVVhKZjwm/n9MkiCugO9fD5n2TOmjX2Zik/a0rDnDDeoPYg2/glgynm7lTayDa5JNn5I49tGJJnoDKP36/kUtSS8mFHSTY8LXIews4F/yaUIKbhrVAz2DdLen2tmoaN3hVpOWLhHkFF5lBWIRCkXonxVWrHCMX+ifOnP6YjK23sZ/G4nsrdL6GlUVrOKU645sOZJwFuNelRFMCrCzDsb9VcyX59hpEsS8UX7zdjsiLNTKY/kO+3I3+T8lZdiF/EbfJdW9TwcVb/vMTDPVYqOJhiITqjclwCAh70QNKgSD+ebOvzFR6UcPUv5RIPext+tA3IzSgYKaL2HcaBCDS4SMTkaa6z0OWDdzTm4yke7/kKbSJy+yiYSKe2EwavW+Hh07iwbJn1tlvEW8GaSiiqxXvgO+IvvB6JfsvI74dK+l03YOV8AwVF413k/a8G1gGkcQVZvHfHzWN1uqub6DM1tmpQdfoB53tpVYeGAdJLMoArUzpswhxFFvyTrVPBrssnxzzFqNzbZNcfFGLD4aXEsDHhi7GZ1eLGwn3SKk3z/ckt92TgdbNP0VZilizpRhQYUmV9oDidYiyOjjYtO1fU9Vsg6z+1T0GXN/tp+6AWtmaGvYCSmQE/7i2dZyHTobj2HX5HXo9FyNKFbUxHtFZI= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 20:3xqeh7PezZBE+xHlgqGX1TzYlG9oKscl6NIF6POVedRP3qoPzxkLfUV+ixz2HqC6SKvdwnKxTTe+EvWDU6zJZ7/T5l5sdSxOBHiK6CiPpa8GtFNHQI2PmhCXaJ1jsG7ImxXrAI64JJ5BR6v3kX18B4mUeD/H+RpyNYLFkdHOxA8DC8k1wJfeF5wAcWZmvGB7t7fuNC6/olByTg6jNNTYBZVYxAwKezyZMv2V35IW1ZzPQpX0ZgrW5kyklz4asKFANn8jasbdIlEbmLPwrhEGYm0g/XiBhaT5Gn8aXnSHk4Zpts8azKQF/sOkF1YpGtAluF9YvIvCkl5iY2UPEtXsytAKwSvec11QBqtUiWj3NvQB2Y0QVAzky06qXtywJjSTTARHZ1aM68iP44NlbgDvCocsC5HHdQHRMH529W4sH65Zo04HD3y4b3T/WECE3Sf2lq65dQgzfJlXZH9lhn9dRtQgcDCEOJxy9rWEXZzk9zfst0uWkpcc7sh/bEMUUQLsVQoQ7qO3hFxF2EUUV8J/FspAfpdUf/rDjFvQ4O96XnQ5CpR4psrptTAcs25KGhAm5AjQh9Tw08bcpZXIEHYjD0tUha8tV01Tvkgn32DCL94= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001); SRVR:CY1PR07MB2248; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2248; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 4:2oNN1SOPp3uWwJ+fbWW9+0yh2EJuvZV1Ai+AErB7QFEj9kiXup+TvzVlU+uU5s47ZIcQ0e4LODGmzH/GvYvl3UgsqAIeb4N7ninSHGf8MKlni0/hWSK6JKXoVkPpl8Db3MxUguR7mcupeX4Fvw5gpGhYVZ2LxfenkY8n7/KZ4o1/gBbnBrcdsQ16frfOYn5aV/6GM3oLJpw9ywpOcm3dN0gNiEZQbpn0kqkL9nuoQNtYRSbOcthyjsgWFPOJ0osW4l3N9oeSoFAsCTTP9/FGnut4YUwZl/L6lsfA/+3foCYg33h5CJLGEsIE2P9Jj1UawWJLo1WUNSt59LdhoMcXmWFnZqJyAY6rGTNQBusfFTiBZrzSujatbhHFboHuZpbN X-Forefront-PRVS: 0987ACA2E2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(7916002)(199003)(189002)(305945005)(50226002)(4001430100002)(97736004)(68736007)(8676002)(5001770100001)(81156014)(81166006)(47776003)(66066001)(106356001)(77096005)(107886002)(92566002)(2950100001)(189998001)(229853001)(76506005)(36756003)(33646002)(3846002)(4326007)(6116002)(50986999)(586003)(76176999)(48376002)(50466002)(42186005)(7846002)(7736002)(19580395003)(101416001)(5003940100001)(19580405001)(105586002)(2906002)(2101003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2248; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: caviumnetworks.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2248; 23:SX8XFdkuoRMip6HGBiG1PTWwcoPBF0+SQUifWIymN?= =?us-ascii?Q?2W8pw+ftj6YaBrw3ffhhnj9gytqauV+Yr71oTjKpXEeyT0ZdsEWDCZs0cmvw?= =?us-ascii?Q?iMxVi4k5Go4c4kJ0uYqRQTFQ9w9L2vXftWyKWb6w0tz6b9d5hZCsydH/OE7W?= =?us-ascii?Q?fvXVzXPiN/GmvBmV4HbXzmAZwd0oJMWkhh5oClLwvL3QLYLyZd1PrVixGyhn?= =?us-ascii?Q?7qAqtvUgyha+eXpmAWye/q/yNk7XIRm3LoYOI/QulJZRu55HJ3UPlsMQ/GDh?= =?us-ascii?Q?tAG+AZO/0B/HP2DSoB3kEuoKbUT/aAhtufg+gsQ0U1unrGKKkhOfIFFU5EJY?= =?us-ascii?Q?+qdeyWdLKSCJ4S7PbiDZPXhvAmZ4Kqy+0KQEdDpO79x6/eY7hk8HPR7FgOv/?= =?us-ascii?Q?yIYu6aC/PdkDGpjW8JeZuA7xeU6yacdtTg0b4h7VObaoZpAuvrjPpigEw7lB?= =?us-ascii?Q?mGBi/N9146JfA00Bgm0+BlR7v1p5wzndtlRWD4y7k/3Mm4fpjrnsVB1yNZn5?= =?us-ascii?Q?v8jtGpqqwa3SUfjg/9L/y/VG73i1vnPu+qQj8LENdjgVtTIp5g6wjWolaQTk?= =?us-ascii?Q?EApOdyyLGnH/kSgAeGJVe/9OkXHAZflVuLbYGNAVVTEXTAXs8zO7S+bYq2Ab?= =?us-ascii?Q?i47eQvFVec6AuRXwY8dSUWoPk+ZooOqQY29fGwCE654Mw0ke+/aoIS61wgr8?= =?us-ascii?Q?R1G6FaqM+Cg/Oo2g1wOzx5JDLZDR1R3Uwh5lEcLoLJeOQ2TfEd+eAI/JW+d8?= =?us-ascii?Q?AXCsGhVDy5Xa7uQnuiWOIQRxYuSlBcCsHQ0jyeUE8DSBSELXgQhB7vfjflyO?= =?us-ascii?Q?on/ngiVrLkiVk+3c2jNId2vvjIcT+N1+4daY6r4z38xhR20RTFwkdntbcRT5?= =?us-ascii?Q?HjFOIoZscInWkRllaISSMMPnJxl0QlLqIl0qeqgcQiuoTduWYzJO5NlZzxcT?= =?us-ascii?Q?QlLATDw8wtG+bYS/ZXaqBavowxjgHhhUcTPMWbwGLqGwKsem5AOClo5aayWZ?= =?us-ascii?Q?UzMPYuDHPe1sfbTiWIJ4k5dz/fdFgMVPUZrXvdHgYWNHboEDof/JzALcaC80?= =?us-ascii?Q?ntwFtAZdxqNvJ4RlhIk8sIMvOuphkXQkYGN9OFSOmdUQ7iCKyLl9Y41ZyF0/?= =?us-ascii?Q?PFXAJnuAUToy8BXm2m8yPNWrXdw3urM?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2248; 6:5u6kmN9zyePK6borqEoJEet5oGyMzDJacsObGcQ5dMXesyfU7laWQtWSbmADfki/RsEILe0w1IR4xQjiep8R7JtvLac0YmZWstpvcCzVOkwFeCSQCmPtWVqkqgkCsadCWuSJshSi1/1kCv6nIQKwTfiVmvXkZVlmjRpjPrPE4bng+DxXkGx/CmfdwNSqCEDOEJYYqW2MldTmFFtiHY2peDj+d8eSjsUj9zBG9AJ6aSeQ7M2jH5OK5qib2TIENDPYWp+luy49uMDAqPe6csFHt0ZAZGXoE88bvmtB8HjVswkJsHh3Uv0znDFODtuThPn1; 5:4JqGDWFqbnn+fmQ75FYvBK0j5WwxikdbXqzEzqv7Pvbgle2DWYZJin177C9jTKmm7O58hQMuLe1Q1v3fc0DUEUMzwS9W3iFOHeSQEaPu0SedO+n6iQOQuMM7v3VrPpKs5/M8ZwJRTFtF0sCFl6t8aw==; 24:NF5PTDRP2Bm56yqj1HceGXA0COOF/JWhZPGa89UztckIYz8bcbWsekT+Ir0BqnQmMKKOcuZmK7L3WO2l/YsNjqg9T5youI+5tj2uVEBWKtA=; 7:2rOXFJir2ijlZI3aOItJ89aSUZRMgjGEK/EEYiDneBru82UDoo3V7sFwqvrHjnghFZMSKkow5vzh6qlrwa5aggrBGSN2Lho3SDGSXJdLI9KZrxC2IGntn+kEYIZJi5qTkU3d1sq/uka5xrEnqKaMmkwQgFSo75q2Nu7Ve07Lwng6yIdE7bsgmnb5FKUN5DqbOOA+ZFT8cSYMEBMbYYrbVIsbpWQiX5bcpsEjxKiOgKncW80LDZAFfqgWVmeok/RZHVOLSka5CACCnojVnxiuhg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2016 16:42:25.9152 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2248 From: Andrew Pinski To be support multi-lib with ldd, we need to add a ldd-rewrite.sed file to rewrite RTLDLIST to include both ld.so's. * sysdeps/unix/sysv/linux/aarch64/configure.ac (ldd_rewrite_script): Set. * sysdeps/unix/sysv/linux/aarch64/configure: Regenerate. * sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed: New file. Signed-off-by: Yury Norov --- sysdeps/unix/sysv/linux/aarch64/configure | 2 ++ sysdeps/unix/sysv/linux/aarch64/configure.ac | 2 ++ sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed | 1 + 3 files changed, 5 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed diff --git a/sysdeps/unix/sysv/linux/aarch64/configure b/sysdeps/unix/sysv/linux/aarch64/configure index c6fca86..037cef3 100755 --- a/sysdeps/unix/sysv/linux/aarch64/configure +++ b/sysdeps/unix/sysv/linux/aarch64/configure @@ -31,3 +31,5 @@ case "$prefix" in esac fi +ldd_rewrite_script=$dir/ldd-rewrite.sed + diff --git a/sysdeps/unix/sysv/linux/aarch64/configure.ac b/sysdeps/unix/sysv/linux/aarch64/configure.ac index b37a7eb..245b72f 100644 --- a/sysdeps/unix/sysv/linux/aarch64/configure.ac +++ b/sysdeps/unix/sysv/linux/aarch64/configure.ac @@ -9,3 +9,5 @@ else LIBC_SLIBDIR_RTLDDIR([lib64], [lib]) fi +ldd_rewrite_script=$dir/ldd-rewrite.sed + diff --git a/sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed new file mode 100644 index 0000000..2f3bbb9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/aarch64/ldd-rewrite.sed @@ -0,0 +1 @@ +s_^\(RTLDLIST=\)\(.*lib/\)\([^/]*\)\(-aarch64\)\(\|\_be\)\(\|\_ilp32\)\(.so\.[0-9.]*\)$_\1"\2\3-aarch64\5\7 \2\3-aarch64\5\_ilp32\7"_