From 36840e95ca2813ead51db7f8992c9ce0f47a942d Mon Sep 17 00:00:00 2001
From: Johann <johann.koenig@duck.com>
Date: Tue, 28 Aug 2018 12:56:34 -0700
Subject: [PATCH] rtcd: fix --required flag

Always parse --required options. Previously they were only parsed for
x86_64.

Make entries passed in additive if there are existing required flags.

Mark 'neon' as required for armv8/aarch64.

BUG=chromium:876548

Change-Id: I55c6aad4536a9d8423e223e5616f3aa26d6b2941
---
 build/make/rtcd.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/make/rtcd.pl b/build/make/rtcd.pl
index 68e92b5..7483200 100755
--- a/build/make/rtcd.pl
+++ b/build/make/rtcd.pl
@@ -400,12 +400,13 @@ EOF
 #
 
 &require("c");
+&require(keys %required);
 if ($opts{arch} eq 'x86') {
   @ALL_ARCHS = filter(qw/mmx sse sse2 sse3 ssse3 sse4_1 avx avx2 avx512/);
   x86;
 } elsif ($opts{arch} eq 'x86_64') {
   @ALL_ARCHS = filter(qw/mmx sse sse2 sse3 ssse3 sse4_1 avx avx2 avx512/);
-  @REQUIRES = filter(keys %required ? keys %required : qw/mmx sse sse2/);
+  @REQUIRES = filter(qw/mmx sse sse2/);
   &require(@REQUIRES);
   x86;
 } elsif ($opts{arch} eq 'mips32' || $opts{arch} eq 'mips64') {
@@ -433,6 +434,7 @@ if ($opts{arch} eq 'x86') {
   arm;
 } elsif ($opts{arch} eq 'armv8' || $opts{arch} eq 'arm64' ) {
   @ALL_ARCHS = filter(qw/neon/);
+  &require("neon");
   arm;
 } elsif ($opts{arch} =~ /^ppc/ ) {
   @ALL_ARCHS = filter(qw/vsx/);
-- 
2.7.4