From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 81176 invoked by alias); 9 Nov 2016 00:35:08 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 81158 invoked by uid 89); 9 Nov 2016 00:35:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_PASS,URIBL_RED autolearn=ham version=3.3.2 spammy=20161109, 2016-11-09, exec_prefix, 68 X-HELO: relay1.mentorg.com Date: Wed, 09 Nov 2016 00:35:00 -0000 From: Joseph Myers To: Chris Metcalf CC: Subject: Re: Library directories for tilegx In-Reply-To: <1e1c3a65-b62f-7736-3fb8-741aa6afe09f@mellanox.com> Message-ID: References: <1e1c3a65-b62f-7736-3fb8-741aa6afe09f@mellanox.com> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) X-SW-Source: 2016-11/txt/msg00312.txt.bz2 On Thu, 3 Nov 2016, Chris Metcalf wrote: > I will have to go look at exactly how we contrive the 32-bit installation in > our commercial build; we do some nasty cross-bootstrapping from x86, which as > I'm sure you recall was particularly unpleasant back in the glibc 2.12 days > (our current "tip" release for tilegx is still CentOS 6.8). And for my > ongoing git testing, I always just test from the build tree, so I never > noticed that 32-bit wanted to install natively in /lib. FYI: this patch makes the library directories match what GCC expects, so allowing the build to work (then I see the same check-installed-headers failures for sys/dataplane.h as for tilepro, but otherwise the compile-only test results are clean with GCC 5). Make tilegx32 install libraries in lib32 directories. This patch makes tilegx32 install libraries in lib32 directories, matching what GCC expects and avoiding conflict with 64-bit libraries installed in lib directories. Tested (compilation only) for tilegx (32-bit and 64-bit, BE and LE, GCC 5). 2016-11-09 Joseph Myers * sysdeps/unix/sysv/linux/tile/tilegx/configure.ac: Use LIBC_SLIBDIR_RTLDDIR for tilegx32. * sysdeps/unix/sysv/linux/tile/tilegx/configure: Regenerated. diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/configure b/sysdeps/unix/sysv/linux/tile/tilegx/configure index 0a6a63f..36e42e0 100644 --- a/sysdeps/unix/sysv/linux/tile/tilegx/configure +++ b/sysdeps/unix/sysv/linux/tile/tilegx/configure @@ -2,3 +2,20 @@ # Local configure fragment for sysdeps/unix/sysv/linux/tile/tilegx ldd_rewrite_script=$dir/ldd-rewrite.sed + +case $machine in +tile/tilegx/tilegx32) + test -n "$libc_cv_slibdir" || +case "$prefix" in +/usr | /usr/) + libc_cv_slibdir=/lib32 + libc_cv_rtlddir=/lib32 + if test "$libdir" = '${exec_prefix}/lib'; then + libdir='${exec_prefix}/lib32'; + # Locale data can be shared between 32-bit and 64-bit libraries. + libc_cv_complocaledir='${exec_prefix}/lib/locale' + fi + ;; +esac + ;; +esac diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/configure.ac b/sysdeps/unix/sysv/linux/tile/tilegx/configure.ac index 87d86bd..baca1f6 100644 --- a/sysdeps/unix/sysv/linux/tile/tilegx/configure.ac +++ b/sysdeps/unix/sysv/linux/tile/tilegx/configure.ac @@ -2,3 +2,9 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # Local configure fragment for sysdeps/unix/sysv/linux/tile/tilegx ldd_rewrite_script=$dir/ldd-rewrite.sed + +case $machine in +tile/tilegx/tilegx32) + LIBC_SLIBDIR_RTLDDIR([lib32], [lib32]) + ;; +esac -- Joseph S. Myers joseph@codesourcery.com