summaryrefslogtreecommitdiffstats
path: root/src/crypto/perlasm/arm-xlate.pl
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-09-25 02:29:14 +0000
committerKenny Root <kroot@google.com>2015-09-25 02:29:14 +0000
commitb8494591d1b1a143f3b192d845c238bbf3bc629d (patch)
treedd743d9d64af3145fe96b8d5fc2f3427544794bd /src/crypto/perlasm/arm-xlate.pl
parenta04d78d392463df4e69a64360c952ffa5abd22f7 (diff)
downloadexternal_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.zip
external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.gz
external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.bz2
Revert "Revert "external/boringssl: sync with upstream.""
This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7. Underlying issue was fixed. Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88
Diffstat (limited to 'src/crypto/perlasm/arm-xlate.pl')
-rwxr-xr-xsrc/crypto/perlasm/arm-xlate.pl5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/crypto/perlasm/arm-xlate.pl b/src/crypto/perlasm/arm-xlate.pl
index 81ceb31..706fa70 100755
--- a/src/crypto/perlasm/arm-xlate.pl
+++ b/src/crypto/perlasm/arm-xlate.pl
@@ -116,6 +116,9 @@ sub expand_line {
return $line;
}
+print "#if defined(__arm__)\n" if ($flavour eq "linux32");
+print "#if defined(__aarch64__)\n" if ($flavour eq "linux64");
+
while($line=<>) {
if ($line =~ m/^\s*(#|@|\/\/)/) { print $line; next; }
@@ -162,4 +165,6 @@ while($line=<>) {
print "\n";
}
+print "#endif" if ($flavour eq "linux32" || $flavour eq "linux64");
+
close STDOUT;