diff --git a/lib/Target/ELFTargetAsmInfo.cpp b/lib/Target/ELFTargetAsmInfo.cpp
index e33ae423ac1..fe006a3c607 100644
--- a/lib/Target/ELFTargetAsmInfo.cpp
+++ b/lib/Target/ELFTargetAsmInfo.cpp
@@ -157,7 +157,8 @@ ELFTargetAsmInfo::getSectionForMergableConstant(uint64_t Size,
   
   if (SecName)
     return getNamedSection(SecName,
-                           SectionFlags::setEntitySize(SectionFlags::Mergeable,
+                           SectionFlags::setEntitySize(SectionFlags::Mergeable|
+                                                       SectionFlags::Small,
                                                        Size));
   
   return getReadOnlySection();  // .rodata
diff --git a/test/CodeGen/Mips/2008-07-22-Cstpool.ll b/test/CodeGen/Mips/2008-07-22-Cstpool.ll
index 2af7ab17c2c..31ab3b47cf0 100644
--- a/test/CodeGen/Mips/2008-07-22-Cstpool.ll
+++ b/test/CodeGen/Mips/2008-07-22-Cstpool.ll
@@ -1,9 +1,12 @@
-; RUN: llvm-as < %s | llc -march=mips -f -o %t
-; RUN: grep {CPI\[01\]_\[01\]:} %t | count 2
-; RUN: grep {rodata.cst4,"aM",@progbits} %t | count 1
+; RUN: llvm-as < %s | llc -march=mips -f | FileCheck %s
+
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "mipsallegrexel-psp-elf"
 
+; CHECK: .section .rodata.cst4,"aMs",@progbits,4
+; CHECK: $CPI1_0:
+; CHECK: $CPI1_1:
+; CHECK: F:
 define float @F(float %a) nounwind {
 entry:
 	fadd float %a, 0x4011333340000000		; <float>:0 [#uses=1]