commit e3da9f180ce7df03893e1bb544f078c8c2033da2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:11:09 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:11:09 2022 +0000
tree 096d350312787c858e6f0f65d2665031156b8f5c
parent 4f6bbf04ab45b869dc6279ec01f9eadc27b11f8c
parent d07cf39201435d1b84d2cb247bacc7fe465d699d

Snap for 8564071 from d07cf39201435d1b84d2cb247bacc7fe465d699d to mainline-tethering-release

Change-Id: I49e7314b043c530e4af59e5f91b7479d910b5bfb

Android.bp

diff --git a/Android.bp b/Android.bp
index 23dd084..e64dec1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -249,5 +249,8 @@
         linux_glibc_x86_64: {
             enabled: true,
         },
+        linux_musl_x86_64: {
+            enabled: true,
+        },
     },
 }

src/aarch32/operands-aarch32.h

diff --git a/src/aarch32/operands-aarch32.h b/src/aarch32/operands-aarch32.h
index 2b45295..9a143d4 100644
--- a/src/aarch32/operands-aarch32.h
+++ b/src/aarch32/operands-aarch32.h
@@ -293,7 +293,7 @@
 
   bool IsInteger32() const { return immediate_type_.Is(I32); }
   bool IsInteger64() const { return immediate_type_.Is(I64); }
-  bool IsInteger() const { return IsInteger32() | IsInteger64(); }
+  bool IsInteger() const { return IsInteger32() || IsInteger64(); }
   bool IsFloat() const { return immediate_type_.Is(F32); }
   bool IsDouble() const { return immediate_type_.Is(F64); }
   bool IsFloatZero() const {

src/aarch64/assembler-aarch64.cc

diff --git a/src/aarch64/assembler-aarch64.cc b/src/aarch64/assembler-aarch64.cc
index e98de89..534e1d9 100644
--- a/src/aarch64/assembler-aarch64.cc
+++ b/src/aarch64/assembler-aarch64.cc
@@ -2735,7 +2735,7 @@
     Emit(FMOV_s_imm | Rd(vd) | ImmFP32(imm));
   } else {
     VIXL_ASSERT(CPUHas(CPUFeatures::kNEON));
-    VIXL_ASSERT(vd.Is2S() | vd.Is4S());
+    VIXL_ASSERT(vd.Is2S() || vd.Is4S());
     Instr op = NEONModifiedImmediate_MOVI;
     Instr q = vd.Is4S() ? NEON_Q : 0;
     uint32_t encoded_imm = FP32ToImm8(imm);
@@ -2752,7 +2752,7 @@
     Emit(FMOV_h_imm | Rd(vd) | ImmFP16(imm));
   } else {
     VIXL_ASSERT(CPUHas(CPUFeatures::kNEON, CPUFeatures::kNEONHalf));
-    VIXL_ASSERT(vd.Is4H() | vd.Is8H());
+    VIXL_ASSERT(vd.Is4H() || vd.Is8H());
     Instr q = vd.Is8H() ? NEON_Q : 0;
     uint32_t encoded_imm = FP16ToImm8(imm);
     Emit(q | NEONModifiedImmediate_FMOV | ImmNEONabcdefgh(encoded_imm) |