From owner-svn-src-projects@freebsd.org  Sun Sep 23 02:51:55 2018
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7631D10AB223
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun, 23 Sep 2018 02:51:55 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 2C1308D278;
 Sun, 23 Sep 2018 02:51:55 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 270D924987;
 Sun, 23 Sep 2018 02:51:55 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8N2ptCM027096;
 Sun, 23 Sep 2018 02:51:55 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8N2ptcp027095;
 Sun, 23 Sep 2018 02:51:55 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201809230251.w8N2ptcp027095@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
 jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Sun, 23 Sep 2018 02:51:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r338896 - projects/openssl111/crypto/openssl/crypto
X-SVN-Group: projects
X-SVN-Commit-Author: jkim
X-SVN-Commit-Paths: projects/openssl111/crypto/openssl/crypto
X-SVN-Commit-Revision: 338896
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Sep 2018 02:51:55 -0000

Author: jkim
Date: Sun Sep 23 02:51:54 2018
New Revision: 338896
URL: https://svnweb.freebsd.org/changeset/base/338896

Log:
  Add a hack to build on ARMv4 and ARMv5.

Modified:
  projects/openssl111/crypto/openssl/crypto/threads_pthread.c

Modified: projects/openssl111/crypto/openssl/crypto/threads_pthread.c
==============================================================================
--- projects/openssl111/crypto/openssl/crypto/threads_pthread.c	Sun Sep 23 02:16:47 2018	(r338895)
+++ projects/openssl111/crypto/openssl/crypto/threads_pthread.c	Sun Sep 23 02:51:54 2018	(r338896)
@@ -157,7 +157,8 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPT
 
 int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock)
 {
-# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL)
+# if defined(__GNUC__) && defined(__ATOMIC_ACQ_REL) && \
+     !(defined(__arm__) && __ARM_ARCH < 6)
     if (__atomic_is_lock_free(sizeof(*val), val)) {
         *ret = __atomic_add_fetch(val, amount, __ATOMIC_ACQ_REL);
         return 1;