From patchwork Wed Nov 14 12:23:34 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: 198884 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 873EF2C009F for ; Wed, 14 Nov 2012 23:23:48 +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=1353500630; 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=5L3QT/Ue1fOFFFFNg6v+YRV3IG8=; b=si6Z3AEWr/vy4DQdrachleU2DV8lDbTNxtiPCFEy3CWwclkfxIgZoRKvgxLgVf /hsgw5FC2nOYELfSUgnYc9pqOxHEaMtFUVY5cgJG5clK5KcvODOLuQzlgxK1y0ti C7B/G9dxWBkcsPjO6bZiSGiAK3Dz4t0hg5ZSm9bpIM/D4= 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=Uv44lvdP1iwXrsvm2z1gzcZRhwYj/pu4EDqafDIxR6jeKmKmbdqgd4Lg8/53xP 1yRk83kp1jLJH1C+1BINZXjIDMC/EVHj6d2HIhGWqn+/6TYZzgmGU1YcXaOslVjb la7gd7IReBye9ufMFKbY12MQGwTPVua8b3jCx10a96ogo=; Received: (qmail 15191 invoked by alias); 14 Nov 2012 12:23:43 -0000 Received: (qmail 15183 invoked by uid 22791); 14 Nov 2012 12:23:42 -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; Wed, 14 Nov 2012 12:23:35 +0000 Received: by mail-pb0-f47.google.com with SMTP id ro12so313126pbb.20 for ; Wed, 14 Nov 2012 04:23:35 -0800 (PST) MIME-Version: 1.0 Received: by 10.68.197.71 with SMTP id is7mr70875924pbc.79.1352895814928; Wed, 14 Nov 2012 04:23:34 -0800 (PST) Received: by 10.68.19.138 with HTTP; Wed, 14 Nov 2012 04:23:34 -0800 (PST) In-Reply-To: <50A2DC42.7070305@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> <50A2DC42.7070305@gnu.org> Date: Wed, 14 Nov 2012 04:23:34 -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:48 PM, Paolo Bonzini wrote: > Il 14/11/2012 00:43, H.J. Lu ha scritto: >> This works. > > Ok, then please test remove install-sh and friends and do > autoconf/automake again. If it works, commit the result (I don't care > if you make it one or two commits). > > Then, wait 24 hours for breakages and commit the multilib patch. > > Paolo GCC target libraries don't set AC_CONFIG_AUX_DIR. I checked in this patch to remove it and fix Makefile.in. diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 6074d5b..c67c7f1 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2012-11-14 H.J. Lu + + * configure.ac (AC_CONFIG_AUX_DIR): Removed. + * Makefile.in: Regenerated. + * configure: Likewise. + 2012-11-13 H.J. Lu PR other/55304 diff --git a/libsanitizer/Makefile.in b/libsanitizer/Makefile.in index 8049a7e..babe91f 100644 --- a/libsanitizer/Makefile.in +++ b/libsanitizer/Makefile.in @@ -38,11 +38,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/../config.guess \ $(srcdir)/../config.sub $(srcdir)/../install-sh \ $(srcdir)/../ltmain.sh $(srcdir)/../missing \ $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure ../ABOUT-NLS \ - ../COPYING ../COPYING.LIB ../ChangeLog ../README ../compile \ - ../config.guess ../config.rpath ../config.sub ../depcomp \ - ../install-sh ../ltmain.sh ../missing ../mkinstalldirs \ - ../ylwrap + $(srcdir)/Makefile.in $(top_srcdir)/configure ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ diff --git a/libsanitizer/configure b/libsanitizer/configure index ba6fe67..d69f5a7 100755 --- a/libsanitizer/configure +++ b/libsanitizer/configure @@ -2215,8 +2215,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +am__api_version='1.11' + ac_aux_dir= -for ac_dir in .. "$srcdir"/..; do +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do for ac_t in install-sh install.sh shtool; do if test -f "$ac_dir/$ac_t"; then ac_aux_dir=$ac_dir @@ -2226,7 +2228,7 @@ for ac_dir in .. "$srcdir"/..; do done done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in .. \"$srcdir\"/.." "$LINENO" 5 + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2238,8 +2240,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.11' - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: diff --git a/libsanitizer/configure.ac b/libsanitizer/configure.ac index cd57a69..0b6cdef 100644 --- a/libsanitizer/configure.ac +++ b/libsanitizer/configure.ac @@ -4,7 +4,6 @@ AC_PREREQ([2.64]) AC_INIT(package-unused, version-unused, libsanitizer) AC_CONFIG_SRCDIR([include/sanitizer/common_interface_defs.h]) -AC_CONFIG_AUX_DIR(..) AM_INIT_AUTOMAKE(foreign) # Checks for programs.