From patchwork Tue Jun 21 05:07:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yury Norov X-Patchwork-Id: 13264 Received: (qmail 29090 invoked by alias); 21 Jun 2016 05:13:36 -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 20466 invoked by uid 89); 21 Jun 2016 05:13:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1781 X-HELO: na01-bn1-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 17/27] [AARCH64] Add ldd-rewrite.sed so that ilp32 ld.so can be found Date: Tue, 21 Jun 2016 08:07:01 +0300 Message-ID: <1466485631-3532-19-git-send-email-ynorov@caviumnetworks.com> In-Reply-To: <1466485631-3532-1-git-send-email-ynorov@caviumnetworks.com> References: <1466485631-3532-1-git-send-email-ynorov@caviumnetworks.com> MIME-Version: 1.0 X-ClientProxiedBy: HE1PR03CA0015.eurprd03.prod.outlook.com (10.163.170.153) To BN4PR07MB2241.namprd07.prod.outlook.com (10.164.63.147) X-MS-Office365-Filtering-Correlation-Id: c6c4d4b9-fce1-45d7-0ae9-08d399926d25 X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2241; 2:F8b7VzJN77CK3jJVcvuOzda8SXaapD6+GOtigp64O+amnQ/GF5SqQcfhZHawdw8TE0RudnqGwrHisqGyMgDGZ9j9uP6vuMgLQlFgb8DT2jCNuG5BYhKEXq0Jt5acFhdm3aeUn75K5wtAp8rkZ3VuLUWhM2+SfaE7uYWiWakr0zOs9YARsQTiUphyXUTPxtye; 3:c7c2NgtsG9LPNYlEfIF3F6DsJyfzE/q8VVlWFlewLCeduhypdkUYshYJgOO6QxIFsvN99ty5WafamHbU27TIjo4ZmyGBEGBe65LYTMHLEoljoxra3JdNIgzGnLAdUbAM X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN4PR07MB2241; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2241; 25:MT2MZjj1lPYAKPGZY7JoV/8VQdFImeeDExn5+JHkWdhYITFDBDAwOj4vufVkVqBUEXu9ZdNUE1HfGp+M/u7pkd/rRMlvu3efYMcDMgdVrhHV08RmDkosfC3rfK7Hw+CVfZ31oxeSX4loQRE3nnY87zM3I1igWuyc/ZLRR+ZENALzTI+hLpSc+Xld3/UGuwHtM2ASls9150U0YCTe4CH9GVGURKujSgbvsceCJpgFMcCdKR4GxxILdLx+c5cFSS3HC2zwG0m3lSSS8/iXbRpuyS9DHSm4DkpgA3AS2XEPtnw670L0uZCQ+y43XZj2uYQm+7h1d4NyLjjeepEOBPBiYSnq28ip+4QEa9wxeWooQ7ZWdeVRhRHN0L1AqnUcDFVYSM3jFXOtYPDmDQnXed/vlYPYygOH7sT46Y4maDmu/1igs/UZByyO6ZTzB7aaZgyUtMiWZFqaVOLJQTVuBpMm25wiyJOoy/yD8qwn6OhsEYKR6y4zFw7z4GVhJKVF6KIRBw7n4j5k/DfwR//MC1iApiyP8UXFlEIB5ly6vKBXCEWXW7l7yVAqSGBRG5eFLKx3Sz0RKtN2/AU5zVFz+1B2ZVY3aTBBgrAsmK8rg9PFhCA1ixLhs0PLXj61Yx4Tq1i6DhFSHWaDpetEiBwayzo1cvG77L69XVnu0vhP0U2r2N35LC3RRvnn7XkFpOKuHb4fDNt83lmSn1aOqZxsAZKaDlapFOJWnY2fo9tjOQqQUAY= X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2241; 20:0/w9/XXXHAdURVNu+//yK9R1kbDMp2IKv/F9b42PLLZt+u0ahFlC7xgU3cuyhotzhHHD49SjiQdRX3qX+A1Ufrv5t39Cci/CrwDicCYYLiqEBb0H5ZYW5BVhxUntfhE0EWyjJlIPyl7rRwzCA5z1h00ceX2IYKnXQV4D+a0E4ZI9mrC+O6TKVHYVuLbbmaUZuV6WmxM/MxVSKukHde0tGf3kmG1zP/rn4QItqSW3rZCuciWHoj7PBlfgt90A/sUjwP7yHRI4fVgaV75Rcy739a3zZ6o40yxfG/lmq9ylkdAWjbD9NkjU9CBQgnXLGgFl9ItSrwhLhTplwCl3Of81yKBZXfMq3ZmNyxdZiRcDRwBMOlNtPs4mLSLydp0CdGeR/b+KIbBV5hvu49gn8wPKLZhhT9syr8gbUOLZVf0wlJ069/C3y1QrPTRPJljuk1uyAb5imMwHdW7dN/yDUv2tv6Gc+zTTHU2YSrfymsSVO6HRZ8B7vaRsy8e78cjtJSKqx83xQqd9nKMT7Oe3BDNQidlaDDU48JCBGX0ChSXAXQdnUR7VvRL6G9fLgcUjE3m1N5BXG58d77E4Pst0yb0AsD0GmB4iHxtK4cNmjXTAFVg= 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)(3002001)(10201501046); SRVR:BN4PR07MB2241; BCL:0; PCL:0; RULEID:; SRVR:BN4PR07MB2241; X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2241; 4:hz/yKNneUYFf3pA1HRvGDrQFscm1Tw8a+U2Jl5LOaHEvxkVPs9SVOJnn0MH0QvKyjGxmkjS33Ungg2MS/72Lw+xsBO1/3IwlTDVVau+oInI7BrnVkMt/BCqhrupHKWVoOrV7n2jOnXTiyjLuiU4ZPsAe9hI1iGFwgii3NjAC8H4C05RfE7prrhHbwmSol2Nw1P0DONyKCwBSVzU2844RL7n2RJLqq49111IFq1e6leR2rnfOjIb9TL78do/PBb5ucq8yvawrwJPIfUkm7q5iPbqSlj/C6qk0MtkvW6mUVIXn+p0Ql44CW1Vu8jMX7TqlqCSWHzplL7qNBYeR16NdzDpB75FvbjhJnTlJvhad8EQWagaw2muF1BLuTxVo+Bsh X-Forefront-PRVS: 098076C36C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(979002)(6069001)(6009001)(7916002)(199003)(189002)(77096005)(105586002)(42186005)(50226002)(106356001)(68736007)(76506005)(229853001)(7846002)(4326007)(5003940100001)(19580405001)(7736002)(36756003)(50466002)(19580395003)(47776003)(3846002)(586003)(6116002)(2950100001)(66066001)(81156014)(76176999)(2906002)(50986999)(33646002)(92566002)(48376002)(5001770100001)(189998001)(81166006)(8676002)(101416001)(4001430100002)(97736004)(107886002)(2101003)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN4PR07MB2241; 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; BN4PR07MB2241; 23:Lupwrx6MkaGMG9w3kkRr0BSkaSM/q8Hf6BsIPQqTZ?= =?us-ascii?Q?CYrj+6moO5m5JlBXPn1bm4Y8Kn0gEXkrsQyHYPF44VYJKn42RBvNKVpKkYfF?= =?us-ascii?Q?3+3a/5SdM7dThjP6hyXjsgrWNYtTX5fg1Aj5TOTNuJlio4aAakvffiTPJSrj?= =?us-ascii?Q?SooORHPXz5MU3Mb5BDpIa0QRQl38GHmdyajVbDa3V1BZZJCILK7DTZbP3rek?= =?us-ascii?Q?Yp6hPqCXY7da7mONmogYPF27gxCuIpbu2+sGMy2Vo2vO+9DbAEDMp/Jk5BUw?= =?us-ascii?Q?w7VqeMr1/Z2I8TEmrQ8urnU37CvzgfjwnQuM26GVAAp1hXSobsMc/TS5JN2V?= =?us-ascii?Q?nYeBOpZiGk10w2uS4Wt3Ebtb/o83EUW1Wr/lz2Wq8WszDXrIAmXbuygicepV?= =?us-ascii?Q?J7HlS8+k44WijYKZPtj7BSte5t/5vdhKT8oJNRgiB1EU3uTGZjUi2m2fXjw7?= =?us-ascii?Q?8VV+RCoUjauXsTCTlSkT1WGDIKgy9c4ddvcci2BwP63Q5jHwSAkrSQqEyHlX?= =?us-ascii?Q?J6X4COKf9ne3Zs9lC3ZFEHeNWEq+O7O33+trW6jKzqm085xgkTUhpWmepnIf?= =?us-ascii?Q?E7A2RCCpxJJ0tvYOsKwDezJKa48PJV8wZzb0BXa9N0fqvadiwEhri07UWfVq?= =?us-ascii?Q?AGGggHu/2M39/QKompxbmraucT8p0NJ5/uW4aSZZ0RYhB6WoTa5VZfNNXnkJ?= =?us-ascii?Q?3Mlj4oFWOtA7exNcx/s5A9SIdHW4yOiZR+6sRQsrmnGV9aD94yjLhsUUOf+y?= =?us-ascii?Q?hqXAYz43LE8l8duCQHdqGlYbouAkoFfoH44SnPzr1EvL0hJ2CIB5Mhm6vlON?= =?us-ascii?Q?ZDoidZfcqu07W0ED7qEu2kDp5UrUOY0N3AxIaME5IsjDOLl5esPQ5+Ag7c69?= =?us-ascii?Q?du5H0VfNawWwOJ3rqYnreLdFAyjxqHBywVYV7qCbt9zO8zHPa3iPSc5Q6uBf?= =?us-ascii?Q?H9a8crzx5frQbNq5xeZDBAEPCQYQUuzyYdvIbK//1CUsy3I75SwRFP2k2wQO?= =?us-ascii?Q?uezKF/VAawk/t7d9SmasQAW1VjbT5QtE1Fbt/aRCTnMIvhHsJcPf1uAhrMC+?= =?us-ascii?Q?APawgJuXbsizjetwTRK+FQ8MjWTY9cSgySAdXXJWuPFj8P35Bq3LKMUddaqS?= =?us-ascii?Q?rWVjIXca/QteeKgv+x6ztasgJQiGwclgABvc4koDpxnRwo8wDLT6rOGVu/Ww?= =?us-ascii?Q?P+073RyPLIat4QFD//f/VhoYfuqTfIlo0EYCpbAX7bn7NqUjHk13ll3Gw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN4PR07MB2241; 6:4bc51ICmvkRSdIBgEzPaN0XFH26XZUN+iojrrWgOxDZ+tWlfUOpTr8lXbbexSFGO98LP9Clf/QXPefIzyTegQ+v3HztOxokrHj2X9rEbJSvlhT2HDhiVo327O4kSqQ4Ooinw9Hpf8b0xl4jUuY20hbr0BuDXH94OXna0YKoGVl90VtI3SItNIX8NDuvQDsl1nfzwTEPTXtblU0rClpDKioDboJXX3g5iN/YQWDDBhjxWfdrFvgvDYNgfPDKAq2qz0SL71mAwQjj3YL+2PvKEpzaUDoOshFJ69BdsAI+or94=; 5:/rWJpS9DD5dZPNtxhhR9DYfPBsFWdgGx8tLxO1u20GKROjgjieaLjVNWt3Z9jtt34+uVJLjHlvs0C/1WqSZVNpiP1V+h9QuLQXMHCcPmMeAEKR5jfT33wbDluDO2ENhePiOlp1CsKMaNrnWdMaF/HQ==; 24:iRdu6OskGdpi7TZ8azfvvRtFe3+ys6Cy3JlJ50drNXR5VgBzDb7mA+9jEuvoPX1fBopIYF7LDeR0Zjyl5eRp8c5toMthSMaT/r1WKiiVK80=; 7:aL1zvh0QI0NO6GumoMPC6sUXqhg4yik6O7y0Z88m09PGWx6xC/2YMiQHPbL3EZ3YL1u4v7/WyRvBysM8ImpNAFzK4xIF70rF2n7GnOitw6Yx9hGOXq9IDvHyc5iLhWLtG4D5hFXuB77p1U5aHgJ89cIN1wqekmOJVXevFYlOMb7E1jiTN8Dy715rDU64+q7aRjIDcQPZsKfhbCYN+XyXZn9eUdhIL7ZpXvLbFYOW7sd8xfYrYwcC3b8+B+yi0LRr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2016 05:10:56.0477 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN4PR07MB2241 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 2563e83..325422f 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 6526816..3ca8ed1 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"_