From patchwork Tue Nov 13 23:43:45 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: 198799 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 D57B32C0079 for ; Wed, 14 Nov 2012 10:43:54 +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=1353455037; 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=m56gbrsoZynXCmXKBI2yWHyqWXY=; b=BqFeCXQHHl1MuzmxZ1PXKhFPIcg+7FFBay7Gbbtr1TcN2thc+yJDOyYFiafzs4 CYvPVahJ41rMwm6CKUjMHuR9kmP1/sMviXnG2q6r1dZBGyoxfwyzQ3O9ITel8OSY 5OtOwQLAvnnJFXpGFhqKbr6K/68SHhNLhpNj+f6MuAHIY= 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=g8N0Ezs7XmjgKRhsYLAhyRzdhX8TnqkDp2MYqTszYxo9jE679RcGgC7lb93oTA rQ6yyLwZvdZaopOiZ96BHF3Osxsbm8uvhM7d8EqdWoUMMcmgcIIW4CfavB31NwKV U4aoyNgq3g6/LWJnOHhlyePyqKFjfrzxX/j8FxQHUIN+g=; Received: (qmail 3726 invoked by alias); 13 Nov 2012 23:43:51 -0000 Received: (qmail 3718 invoked by uid 22791); 13 Nov 2012 23:43:50 -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-pb0-f47.google.com (HELO mail-pb0-f47.google.com) (209.85.160.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 13 Nov 2012 23:43:45 +0000 Received: by mail-pb0-f47.google.com with SMTP id ro12so5169161pbb.20 for ; Tue, 13 Nov 2012 15:43:45 -0800 (PST) MIME-Version: 1.0 Received: by 10.68.189.233 with SMTP id gl9mr71240142pbc.166.1352850225399; Tue, 13 Nov 2012 15:43:45 -0800 (PST) Received: by 10.68.19.138 with HTTP; Tue, 13 Nov 2012 15:43:45 -0800 (PST) In-Reply-To: <50A2D83D.3070904@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> <50A2D83D.3070904@gnu.org> Date: Tue, 13 Nov 2012 15:43:45 -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:31 PM, Paolo Bonzini wrote: > Il 14/11/2012 00:27, H.J. Lu ha scritto: >> 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. > > I don't understand why removing files needs > --enable-version-specific-runtime-libs or multilibs. > This works. 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..cd57a69 100644 --- a/libsanitizer/configure.ac +++ b/libsanitizer/configure.ac @@ -1,10 +1,10 @@ # -*- 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(..) AM_INIT_AUTOMAKE(foreign) # Checks for programs.