Commit 68d848b9 authored by Bill Wendling's avatar Bill Wendling
Browse files

Approved by Duncan: 

$ svn merge -c 113483 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113483 into '.':
U    test/FrontendC/2010-05-18-asmsched.c
U    test/FrontendC/asm-reg-var-local.c
$ svn merge -c 113484 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113484 into '.':
U    test/FrontendC/cstring-align.c
$ svn merge -c 113485 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r113485 into '.':
U    test/FrontendC/2010-07-14-overconservative-align.c

Fix tests to pass on platforms which don't support -m64.

llvm-svn: 113529
parent 709c44a9

llvm/test/FrontendC/2010-05-18-asmsched.c

+2 −2
Original line number Diff line number Diff line 
// RUN: %llvmgcc %s -c -O3 -m64 -emit-llvm -o - | llc -march=x86-64 -mtriple=x86_64-apple-darwin | FileCheck %s

// RUN: %llvmgcc %s -c -O3 -emit-llvm -o - | llc -march=x86-64 -mtriple=x86_64-apple-darwin | FileCheck %s

// r9 used to be clobbered before its value was moved to r10.  7993104.



void foo(int x, int y) {

llvm/test/FrontendC/2010-07-14-overconservative-align.c

+2 −2
Original line number Diff line number Diff line 
// RUN: %llvmgcc %s -emit-llvm -m64 -S -o - | FileCheck %s

// RUN: %llvmgcc %s -emit-llvm -S -o - | FileCheck %s

// PR 5995

struct s {

    int word;
@@ -9,6 +9,6 @@ struct s { 


void func (struct s *s)

{

// CHECK: load %struct.s** %s_addr, align 8

// CHECK: load %struct.s** %s_addr, align {{[48]}}

    s->word = 0;

}

llvm/test/FrontendC/asm-reg-var-local.c

+1 −1
Original line number Diff line number Diff line 
// RUN: %llvmgcc %s -m64 -S -o - | FileCheck %s

// RUN: %llvmgcc %s -S -o - | FileCheck %s

// Exercise various use cases for local asm "register variables".

// XFAIL: *

// XTARGET: x86_64,i686,i386

llvm/test/FrontendC/cstring-align.c

+4 −10
Original line number Diff line number Diff line 
// RUN: %llvmgcc %s -c -Os -m32 -emit-llvm -o - | llc -march=x86 -mtriple=i386-apple-darwin10 | FileCheck %s -check-prefix=DARWIN32

// RUN: %llvmgcc %s -c -Os -m64 -emit-llvm -o - | llc -march=x86-64 -mtriple=x86_64-apple-darwin10 | FileCheck %s -check-prefix=DARWIN64

// XTARGET: darwin

// RUN: %llvmgcc %s -c -Os -emit-llvm -o - | llc -march=x86 -mtriple=i386-apple-darwin10 | FileCheck %s



extern void func(const char *, const char *);
@@ -8,10 +6,6 @@ void long_function_name() { 
  func("%s: the function name", __func__);

}



// DARWIN64: .align 4

// DARWIN64: ___func__.

// DARWIN64: .asciz "long_function_name"



// DARWIN32: .align 4

// DARWIN32: ___func__.

// DARWIN32: .asciz "long_function_name"
 
// CHECK: .align 4

// CHECK: ___func__.

// CHECK: .asciz "long_function_name"