From ed4b2dc313cc398844c7bacf7a6a5995f13b1ae3 Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Wed, 22 Jul 2009 10:35:05 +0000 Subject: [PATCH] Revert commit 76707, it was breaking the llvm-gcc build on linux platforms. The binutils assembler does not recognize the "s" flag, see for example http://sourceware.org/binutils/docs/as/Section.html git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76733 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ELFTargetAsmInfo.cpp | 3 +-- test/CodeGen/Mips/2008-07-22-Cstpool.ll | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/Target/ELFTargetAsmInfo.cpp b/lib/Target/ELFTargetAsmInfo.cpp index cf4e3a2f148..b5babed817d 100644 --- a/lib/Target/ELFTargetAsmInfo.cpp +++ b/lib/Target/ELFTargetAsmInfo.cpp @@ -160,8 +160,7 @@ ELFTargetAsmInfo::getSectionForMergableConstant(uint64_t Size, if (SecName) return getNamedSection(SecName, - SectionFlags::setEntitySize(SectionFlags::Mergeable| - SectionFlags::Small, + SectionFlags::setEntitySize(SectionFlags::Mergeable, 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 31ab3b47cf0..2af7ab17c2c 100644 --- a/test/CodeGen/Mips/2008-07-22-Cstpool.ll +++ b/test/CodeGen/Mips/2008-07-22-Cstpool.ll @@ -1,12 +1,9 @@ -; RUN: llvm-as < %s | llc -march=mips -f | FileCheck %s - +; 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 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 ; :0 [#uses=1]