From 8d685ec867c4975013b11e72b280a1af850737f5 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Sun, 3 Mar 2019 21:13:23 -0600 Subject: [PATCH] modes/asm/ghash-armv4.pl: address "infixes are deprecated" warnings. This imports ce5eb5e8149d8d03660575f4b8504c993851988a and 1212818eb07add297fe562eba80ac46a9893781e from OpenSSL's 1.1.1 branch. Change-Id: I121c0771371697191a163a28d972a7b3cee37762 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/35164 Reviewed-by: Adam Langley --- crypto/fipsmodule/modes/asm/ghash-armv4.pl | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/crypto/fipsmodule/modes/asm/ghash-armv4.pl b/crypto/fipsmodule/modes/asm/ghash-armv4.pl index e93e5b38..778b5436 100644 --- a/crypto/fipsmodule/modes/asm/ghash-armv4.pl +++ b/crypto/fipsmodule/modes/asm/ghash-armv4.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2010-2016 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2010-2018 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy @@ -150,6 +150,8 @@ $code=<<___; .text #if defined(__thumb2__) || defined(__clang__) .syntax unified +#define ldrplb ldrbpl +#define ldrneb ldrbne #endif #if defined(__thumb2__) .thumb @@ -157,11 +159,6 @@ $code=<<___; .code 32 #endif -#ifdef __clang__ -#define ldrplb ldrbpl -#define ldrneb ldrbne -#endif - .type rem_4bit,%object .align 5 rem_4bit: