From patchwork Sat Nov 24 02:23:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 201435 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 366172C008F for ; Sat, 24 Nov 2012 13:23:51 +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=1354328632; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=LlVhr0i gk9zsi+ml+Kn3xo8jz8A=; b=jDekPhzNftgYC69JcG33Qv1ER+qthMplpOBIWwm 7lmJQMQl4uigZAmcqrqX7Z7uJF5m+TdS2S+P+nmWfPjufkKSLksfUgFl5aX9hlcS 6AAXcvhkS2NOnw4Q/J71C0f9We7xUx03S6cVhgpb6sV+I4fc5LZBIOUiPa9BbU9/ J93o= 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:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=AEEwNVyoSDCv8gaMfEoEOtLMWi6GW3/kx3qgFjYzG0LZlnciVtb3oCKO45w9tB 6TbN5hyL8sGqchZjwhxgFLL7OglieABmu+cIIPFqeVKA7Fm4og96dGA0jRy4UxaX WZ0VnAq1g5J3rf3P8bBDMeeqSlmRphzz6AjzYm3risdFs=; Received: (qmail 13527 invoked by alias); 24 Nov 2012 02:23:47 -0000 Received: (qmail 13519 invoked by uid 22791); 24 Nov 2012 02:23:46 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 24 Nov 2012 02:23:09 +0000 Received: from dslb-088-073-119-082.pools.arcor-ip.net ([88.73.119.82] helo=[192.168.42.216]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1Tc5Od-0006Hg-Kj; Sat, 24 Nov 2012 02:23:07 +0000 Message-ID: <50B02F86.3050207@ubuntu.com> Date: Sat, 24 Nov 2012 03:23:02 +0100 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: GCC Patches CC: Thorsten Glaser Subject: [patch] fix two multiarch issues 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 Fixing two multiarch issues: - the kfreebsd configuration gets the MULTILIB_OSDIRNAMES from the linux definition, which now has x32 defined. Just filter out the x32 definition, kfreebsd is plain 32/64 biarch. - the configure.ac used $withval instead of $enableval. Explicit --{en,dis}able-multiarch options didn't have any effect. Pointed out by Thorsten Glaser. Committing these two fixes as obvious. Matthias 2012-11-24 Matthias Klose * configure.ac (multiarch): Use $enableval instead of $withval. * configure: Regenerate. * config/i386/t-kfreebsd (MULTILIB_OSDIRNAMES): Filter out x32. Index: configure.ac =================================================================== --- configure.ac (Revision 193775) +++ configure.ac (Arbeitskopie) @@ -617,9 +617,9 @@ AC_ARG_ENABLE(multiarch, [AS_HELP_STRING([--enable-multiarch], [enable support for multiarch paths])], -[case "${withval}" in -yes|no|auto) enable_multiarch=$withval;; -*) AC_MSG_ERROR(bad value ${withval} given for --enable-multiarch option) ;; +[case "${enableval}" in +yes|no|auto) enable_multiarch=$enableval;; +*) AC_MSG_ERROR(bad value ${enableval} given for --enable-multiarch option) ;; esac], [enable_multiarch=auto]) if test x${enable_multiarch} = xauto; then if test x${with_native_system_header_dir} != x; then Index: config/i386/t-kfreebsd =================================================================== --- config/i386/t-kfreebsd (Revision 193775) +++ config/i386/t-kfreebsd (Arbeitskopie) @@ -2,4 +2,4 @@ # MULTILIB_OSDIRNAMES are set in t-linux64. KFREEBSD_OS = $(filter kfreebsd%, $(word 3, $(subst -, ,$(target)))) -MULTILIB_OSDIRNAMES := $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES)) +MULTILIB_OSDIRNAMES := $(filter-out mx32=% $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES))) Index: configure =================================================================== --- configure (Revision 193775) +++ configure (Arbeitskopie) @@ -7024,9 +7024,9 @@ # Determine whether or not multiarch is enabled. # Check whether --enable-multiarch was given. if test "${enable_multiarch+set}" = set; then : - enableval=$enable_multiarch; case "${withval}" in -yes|no|auto) enable_multiarch=$withval;; -*) as_fn_error "bad value ${withval} given for --enable-multiarch option" "$LINENO" 5 ;; + enableval=$enable_multiarch; case "${enableval}" in +yes|no|auto) enable_multiarch=$enableval;; +*) as_fn_error "bad value ${enableval} given for --enable-multiarch option" "$LINENO" 5 ;; esac else enable_multiarch=auto