diff --git a/llvm/include/llvm/CodeGen/CommandFlags.inc b/llvm/include/llvm/CodeGen/CommandFlags.inc
index 8739b644873d8c..92a925123647ce 100644
--- a/llvm/include/llvm/CodeGen/CommandFlags.inc
+++ b/llvm/include/llvm/CodeGen/CommandFlags.inc
@@ -387,8 +387,19 @@ setFunctionAttributes(StringRef CPU, StringRef Features, Function &F) {
 
   if (!CPU.empty() && !F.hasFnAttribute("target-cpu"))
     NewAttrs.addAttribute("target-cpu", CPU);
-  if (!Features.empty())
-    NewAttrs.addAttribute("target-features", Features);
+  if (!Features.empty()) {
+    // Append the command line features to any that are already on the function.
+    StringRef OldFeatures
+      = F.getFnAttribute("target-features").getValueAsString();
+    if (OldFeatures.empty())
+      NewAttrs.addAttribute("target-features", Features);
+    else {
+      SmallString<256> Appended(OldFeatures);
+      Appended.push_back(',');
+      Appended.append(Features);
+      NewAttrs.addAttribute("target-features", Appended);
+    }
+  }
   if (FramePointerUsage.getNumOccurrences() > 0) {
     if (FramePointerUsage == llvm::FramePointer::All)
       NewAttrs.addAttribute("frame-pointer", "all");
diff --git a/llvm/test/CodeGen/WebAssembly/target-features.ll b/llvm/test/CodeGen/WebAssembly/target-features.ll
index 8c05ca3b12372c..3a3af3a2eda2e7 100644
--- a/llvm/test/CodeGen/WebAssembly/target-features.ll
+++ b/llvm/test/CodeGen/WebAssembly/target-features.ll
@@ -9,14 +9,14 @@
 target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown"
 
-define void @foo(i32* %p1, float %f2) #0 {
+define void @fn_atomics(i32* %p1, float %f2) #0 {
   %a = atomicrmw min i32* undef, i32 42 seq_cst
   %v = fptoui float %f2 to i32
   store i32 %v, i32* %p1
   ret void
 }
 
-define void @bar(i32* %p1, float %f2) #1 {
+define void @fn_nontrapping_fptoint(i32* %p1, float %f2) #1 {
   %a = atomicrmw min i32* undef, i32 42 seq_cst
   %v = fptoui float %f2 to i32
   store i32 %v, i32* %p1
@@ -26,32 +26,27 @@ define void @bar(i32* %p1, float %f2) #1 {
 attributes #0 = { "target-features"="+atomics" }
 attributes #1 = { "target-features"="+nontrapping-fptoint" }
 
-
-; CHECK-LABEL: foo:
+; CHECK-LABEL: fn_atomics:
 
 ; Expanded atomicrmw min
 ; ATTRS:       loop
-; ATTRS:       i32.atomic.rmw.cmpxchg
-; SIMD128-NOT: i32.atomic.rmw.cmpxchg
+; CHECK:       i32.atomic.rmw.cmpxchg
 ; ATTRS:       end_loop
 
 ; nontrapping fptoint
-; ATTRS:       i32.trunc_sat_f32_u
-; SIMD128-NOT: i32.trunc_sat_f32_u
+; CHECK:       i32.trunc_sat_f32_u
 ; ATTRS:       i32.store
 
-; `bar` should be the same as `foo`
-; CHECK-LABEL: bar:
+; `fn_nontrapping_fptoint` should be the same as `fn_atomics`
+; CHECK-LABEL: fn_nontrapping_fptoint:
 
 ; Expanded atomicrmw min
 ; ATTRS:       loop
-; ATTRS:       i32.atomic.rmw.cmpxchg
-; SIMD128-NOT: i32.atomic.rmw.cmpxchg
+; CHECK:       i32.atomic.rmw.cmpxchg
 ; ATTRS:       end_loop
 
 ; nontrapping fptoint
-; ATTRS:       i32.trunc_sat_f32_u
-; SIMD128-NOT: i32.trunc_sat_f32_u
+; CHECK:       i32.trunc_sat_f32_u
 ; ATTRS:       i32.store
 
 ; CHECK-LABEL: .custom_section.target_features,"",@
@@ -65,12 +60,15 @@ attributes #1 = { "target-features"="+nontrapping-fptoint" }
 ; ATTRS-NEXT: .int8 19
 ; ATTRS-NEXT: .ascii "nontrapping-fptoint"
 
-; -atomics, +simd128
-; SIMD128-NEXT: .int8 2
-; SIMD128-NEXT: .int8 45
+; +atomics, +simd128
+; SIMD128-NEXT: .int8 3
+; SIMD128-NEXT: .int8 43
 ; SIMD128-NEXT: .int8 7
 ; SIMD128-NEXT: .ascii "atomics"
 ; SIMD128-NEXT: .int8 43
+; SIMD128-NEXT: .int8 19
+; SIMD128-NEXT: .ascii  "nontrapping-fptoint"
+; SIMD128-NEXT: .int8 43
 ; SIMD128-NEXT: .int8 7
 ; SIMD128-NEXT: .ascii "simd128"
 
diff --git a/llvm/test/Other/opt-override-mcpu-mattr.ll b/llvm/test/Other/opt-override-mcpu-mattr.ll
index 967df2c7af8351..bb95bd4ce54b19 100644
--- a/llvm/test/Other/opt-override-mcpu-mattr.ll
+++ b/llvm/test/Other/opt-override-mcpu-mattr.ll
@@ -4,8 +4,8 @@
 ; target-cpu and target-features using command line options -mcpu and
 ; -mattr.
 
-; CHECK: attributes #0 = { nounwind readnone ssp uwtable "target-cpu"="broadwell" "target-features"="+avx2" "use-soft-float"="false" }
-; CHECK: attributes #1 = { nounwind readnone ssp uwtable "target-cpu"="core2" "target-features"="+avx2" "use-soft-float"="false" }
+; CHECK: attributes #0 = { nounwind readnone ssp uwtable "target-cpu"="broadwell" "target-features"="+ssse3,+cx16,+sse,+sse2,+sse3,+avx2" "use-soft-float"="false" }
+; CHECK: attributes #1 = { nounwind readnone ssp uwtable "target-cpu"="core2" "target-features"="+ssse3,+cx16,+sse,+sse2,+sse3,+avx2" "use-soft-float"="false" }
 
 define i32 @no_target_cpu() #0 {
 entry: