From owner-svn-src-head@FreeBSD.ORG Mon Sep 16 10:46:59 2013 Return-Path: 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 651004A8; Mon, 16 Sep 2013 10:46:59 +0000 (UTC) (envelope-from zbb@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 4C5992F73; Mon, 16 Sep 2013 10:46:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8GAkxnQ084657; Mon, 16 Sep 2013 10:46:59 GMT (envelope-from zbb@svn.freebsd.org) Received: (from zbb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8GAkxEM084656; Mon, 16 Sep 2013 10:46:59 GMT (envelope-from zbb@svn.freebsd.org) Message-Id: <201309161046.r8GAkxEM084656@svn.freebsd.org> From: Zbigniew Bodek Date: Mon, 16 Sep 2013 10:46:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255613 - head/sys/arm/arm 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Sep 2013 10:46:59 -0000 Author: zbb Date: Mon Sep 16 10:46:58 2013 New Revision: 255613 URL: http://svnweb.freebsd.org/changeset/base/255613 Log: Fix GCC build error when building for ARMv6 Apply theravens's idea to move __strong_reference macros into the proper ifdef section. Approved by: cognet (mentor) Approved by: re Modified: head/sys/arm/arm/stdatomic.c Modified: head/sys/arm/arm/stdatomic.c ============================================================================== --- head/sys/arm/arm/stdatomic.c Mon Sep 16 10:39:35 2013 (r255612) +++ head/sys/arm/arm/stdatomic.c Mon Sep 16 10:46:58 2013 (r255613) @@ -834,6 +834,10 @@ EMIT_ALL_OPS_N(1, uint8_t, "ldrb", "strb EMIT_ALL_OPS_N(2, uint16_t, "ldrh", "strh", "streqh") EMIT_ALL_OPS_N(4, uint32_t, "ldr", "str", "streq") +#endif /* _KERNEL */ + +#endif + #ifndef __clang__ __strong_reference(__sync_lock_test_and_set_1_c, __sync_lock_test_and_set_1); __strong_reference(__sync_lock_test_and_set_2_c, __sync_lock_test_and_set_2); @@ -858,8 +862,4 @@ __strong_reference(__sync_fetch_and_xor_ __strong_reference(__sync_fetch_and_xor_4_c, __sync_fetch_and_xor_4); #endif -#endif /* _KERNEL */ - -#endif - #endif /* __SYNC_ATOMICS */