From owner-svn-src-head@FreeBSD.ORG  Wed Nov  6 03:36:44 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 8392C903;
 Wed,  6 Nov 2013 03:36:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F9422C91;
 Wed,  6 Nov 2013 03:36:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA63aiUA081762;
 Wed, 6 Nov 2013 03:36:44 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA63aiVO081761;
 Wed, 6 Nov 2013 03:36:44 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201311060336.rA63aiVO081761@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 6 Nov 2013 03:36:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257733 - head/gnu/lib/libgcc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Nov 2013 03:36:44 -0000

Author: gjb
Date: Wed Nov  6 03:36:43 2013
New Revision: 257733
URL: http://svnweb.freebsd.org/changeset/base/257733

Log:
  Revert r257691, r257645:
   Let amd64/amd64 build again.

Modified:
  head/gnu/lib/libgcc/Makefile

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Wed Nov  6 02:49:16 2013	(r257732)
+++ head/gnu/lib/libgcc/Makefile	Wed Nov  6 03:36:43 2013	(r257733)
@@ -27,19 +27,6 @@ CFLAGS+=	-DIN_GCC -DIN_LIBGCC2 -D__GCC_F
 		-I${GCCDIR}/config -I${GCCDIR} -I. \
 		-I${.CURDIR}/../../usr.bin/cc/cc_tools
 
-# Added to quiesce warning around gcc_assert() for an inline macro that uses
-# a static variable.  This code has been moved around in gcc, but is still in
-# use in the latest trunk version of the compiler.
-#
-# gnu/lib/libgcc/../../../contrib/gcc/unwind-dw2.c:208:36:
-#      warning: static variable 'dwarf_reg_size_table' is used in an inline
-#               function with external linkage [-Wstatic-in-inline]
-# gcc_assert (index < (int) sizeof(dwarf_reg_size_table));
-#                                  ^
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS+=	-Wno-static-in-inline
-.endif
-
 LDFLAGS+=	-nodefaultlibs
 LDADD+=		-lc