From patchwork Tue Nov 13 23:27:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 198798 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 59E612C0098 for ; Wed, 14 Nov 2012 10:27:20 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1353454041; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:In-Reply-To:References:Date: Message-ID:Subject:From:To:Cc:Content-Type:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=IwUMt2+x37gxH5Dw6QeKClDvOD0=; b=vJuveM9kZq4SQJokPbyqH8xng7mbE5UgdXMI46bw9iceRN/0ulq/Shj0k7Hyin TX99Z4YyWIeKNN6WlMqXMfXcPLef23+xRM9145spNJaXDIKpXBMiKtHMbNDd1IOq p1ue1uyIFWtEC1sP611l8d9tJ5ZWTxKGzxniLF9QZPvn0= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:MIME-Version:Received:Received:In-Reply-To:References:Date:Message-ID:Subject:From:To:Cc:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=OX/dFpdL0pETTYkvHrvcMx5g+MP69tylGzeOrFcA+dO3GipAOwx3I8BJ888aff ATcrPrMRW6WT/0pfnIe2ALTDvoxr/Pz+Lv22vwVWhDds4r4tpLr/LU/CUFjk2U4k ypgi9OI8fQlng42PlBvqH4BdYPbLEbezF5yhDENcpil4M=; Received: (qmail 19270 invoked by alias); 13 Nov 2012 23:27:17 -0000 Received: (qmail 19259 invoked by uid 22791); 13 Nov 2012 23:27:16 -0000 X-SWARE-Spam-Status: No, hits=-3.8 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE X-Spam-Check-By: sourceware.org Received: from mail-da0-f47.google.com (HELO mail-da0-f47.google.com) (209.85.210.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 13 Nov 2012 23:27:10 +0000 Received: by mail-da0-f47.google.com with SMTP id s35so3211595dak.20 for ; Tue, 13 Nov 2012 15:27:10 -0800 (PST) MIME-Version: 1.0 Received: by 10.68.189.233 with SMTP id gl9mr71115833pbc.166.1352849230227; Tue, 13 Nov 2012 15:27:10 -0800 (PST) Received: by 10.68.19.138 with HTTP; Tue, 13 Nov 2012 15:27:10 -0800 (PST) In-Reply-To: <50A2D597.9050606@gnu.org> References: <20121113163456.GA25438@gmail.com> <20121113164655.GA9969@gmail.com> <20121113165641.GZ1886@tucnak.redhat.com> <50A2C9EC.7080104@gnu.org> <50A2D1AF.9080605@gnu.org> <50A2D597.9050606@gnu.org> Date: Tue, 13 Nov 2012 15:27:10 -0800 Message-ID: Subject: Re: [PATCH] PR other/55291: Add support for GCC multilib run-time libraries to libsanitizer From: "H.J. Lu" To: Paolo Bonzini Cc: Jakub Jelinek , Alexandre Oliva , Dodji Seketeli , DJ Delorie , Ralf Wildenhues , gcc-patches@gcc.gnu.org X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On Tue, Nov 13, 2012 at 3:19 PM, Paolo Bonzini wrote: > Il 14/11/2012 00:16, H.J. Lu ha scritto: >>> > What has to be fixed about it? Anything except AC_PREREQ/AC_CONFIG_AUX_DIR? >>> > >>> > I really would prefer to do it in the order I mentioned above. >> We also need >> >> [hjl@gnu-tools-1 libsanitizer]$ cat acinclude.m4 >> dnl ---------------------------------------------------------------------- >> dnl This whole bit snagged from libgfortran. >> >> sinclude(../libtool.m4) >> dnl The lines below arrange for aclocal not to bring an installed >> dnl libtool.m4 into aclocal.m4, while still arranging for automake to >> dnl add a definition of LIBTOOL to Makefile.in. >> ifelse(,,,[AC_SUBST(LIBTOOL) >> AC_DEFUN([AM_PROG_LIBTOOL]) >> ]) >> [hjl@gnu-tools-1 libsanitizer]$ >> >> Otherwise, autoconf won't work. > > Sure, that's fine to include too. > We need all changes in: * acinclude.m4: New file. * Makefile.am (ACLOCAL_AMFLAGS): New. * configure.ac (AC_PREREQ): Set to 2.64. (AC_CONFIG_AUX_DIR): Set to "..". (--enable-version-specific-runtime-libs): New option. (AC_CANONICAL_SYSTEM): New. (AM_ENABLE_MULTILIB): Moved right after AM_INIT_AUTOMAKE. (toolexecdir): Support multilib. (toolexeclibdir): Likewise. Missing one will cause a problem. diff --git a/libsanitizer/Makefile.am b/libsanitizer/Makefile.am index b28eb32..91e3434 100644 --- a/libsanitizer/Makefile.am +++ b/libsanitizer/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I .. -I ../config + SUBDIRS = interception sanitizer_common asan # Work around what appears to be a GNU make bug handling MAKEFLAGS diff --git a/libsanitizer/acinclude.m4 b/libsanitizer/acinclude.m4 new file mode 100644 index 0000000..8e606e7 --- /dev/null +++ b/libsanitizer/acinclude.m4 @@ -0,0 +1,10 @@ +dnl ---------------------------------------------------------------------- +dnl This whole bit snagged from libgfortran. + +sinclude(../libtool.m4) +dnl The lines below arrange for aclocal not to bring an installed +dnl libtool.m4 into aclocal.m4, while still arranging for automake to +dnl add a definition of LIBTOOL to Makefile.in. +ifelse(,,,[AC_SUBST(LIBTOOL) +AC_DEFUN([AM_PROG_LIBTOOL]) +]) diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac index 3f186c2..47a44d3 100644 --- a/libsanitizer/configure.ac +++ b/libsanitizer/configure.ac @@ -1,11 +1,60 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ([2.68]) +AC_PREREQ([2.64]) AC_INIT(package-unused, version-unused, libsanitizer) AC_CONFIG_SRCDIR([include/sanitizer/common_interface_defs.h]) -AC_CONFIG_AUX_DIR(.) +AC_CONFIG_AUX_DIR(..) + +AC_MSG_CHECKING([for --enable-version-specific-runtime-libs]) +AC_ARG_ENABLE(version-specific-runtime-libs, +[ --enable-version-specific-runtime-libs Specify that runtime libraries sho uld be installed in a compiler-specific directory ], +[case "$enableval" in + yes) version_specific_libs=yes ;; + no) version_specific_libs=no ;; + *) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]); ; + esac], +[version_specific_libs=no]) +AC_MSG_RESULT($version_specific_libs) + +# Do not delete or change the following two lines. For why, see +# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html +AC_CANONICAL_SYSTEM +target_alias=${target_alias-$host_alias} +AC_SUBST(target_alias) + AM_INIT_AUTOMAKE(foreign) +AM_ENABLE_MULTILIB(, ..) + +# Calculate toolexeclibdir +# Also toolexecdir, though it's only used in toolexeclibdir +case ${version_specific_libs} in + yes) + # Need the gcc compiler version to know where to install libraries + # and header files if --enable-version-specific-runtime-libs option + # is selected. + toolexecdir='$(libdir)/gcc/$(target_alias)' + toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)' + ;; + no) + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + # Install a library built with a cross compiler in tooldir, not libdir. + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' + else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' + fi + multi_os_directory=`$CC -print-multi-os-directory` + case $multi_os_directory in + .) ;; # Avoid trailing /. + *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; + esac + ;; +esac +AC_SUBST(toolexecdir) +AC_SUBST(toolexeclibdir)