From owner-svn-src-all@FreeBSD.ORG Sun Dec 14 13:32:15 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 800831C9; Sun, 14 Dec 2014 13:32:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6117AA2D; Sun, 14 Dec 2014 13:32:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBEDWFjp081030; Sun, 14 Dec 2014 13:32:15 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBEDWFsf081029; Sun, 14 Dec 2014 13:32:15 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201412141332.sBEDWFsf081029@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sun, 14 Dec 2014 13:32:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r275758 - head/contrib/llvm/patches X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Dec 2014 13:32:15 -0000 Author: dim Date: Sun Dec 14 13:32:14 2014 New Revision: 275758 URL: https://svnweb.freebsd.org/changeset/base/275758 Log: Update patch-r274286-llvm-r201784-asm-dollar.diff, so test/MC/AsmParser/macros.s is properly deleted when patching. Modified: head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff Modified: head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff ============================================================================== --- head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff Sun Dec 14 11:03:22 2014 (r275757) +++ head/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff Sun Dec 14 13:32:14 2014 (r275758) @@ -64,8 +64,104 @@ Index: test/MC/AsmParser/exprs.s .macro check_expr .if ($0) != ($1) -Index: test/MC/AsmParser/macros.s (deleted) +Index: test/MC/AsmParser/macros.s =================================================================== +--- test/MC/AsmParser/macros.s ++++ test/MC/AsmParser/macros.s +@@ -1,93 +0,0 @@ +-// RUN: not llvm-mc -triple i386-unknown-unknown %s 2> %t.err | FileCheck %s +-// RUN: FileCheck --check-prefix=CHECK-ERRORS %s < %t.err +- +-.macro .test0 +-.macrobody0 +-.endmacro +-.macro .test1 +-.test0 +-.endmacro +- +-.test1 +-// CHECK-ERRORS: :1:1: error: unknown directive +-// CHECK-ERRORS-NEXT: macrobody0 +-// CHECK-ERRORS-NEXT: ^ +-// CHECK-ERRORS: :1:1: note: while in macro instantiation +-// CHECK-ERRORS-NEXT: .test0 +-// CHECK-ERRORS-NEXT: ^ +-// CHECK-ERRORS: 11:1: note: while in macro instantiation +-// CHECK-ERRORS-NEXT: .test1 +-// CHECK-ERRORS-NEXT: ^ +- +-.macro test2 +-.byte $0 +-.endmacro +-test2 10 +- +-.macro test3 +-.globl "$0 $1 $2 $$3 $n" +-.endmacro +- +-// CHECK: .globl "1 (23) $3 2" +-test3 1, (2 3) +- +-// CHECK: .globl "1 2 $3 2" +-test3 1 2 +- +-.macro test4 +-.globl "$0 -- $1" +-.endmacro +- +-// CHECK: .globl "(ab)(,)) -- (cd)" +-test4 (a b)(,)),(cd) +- +-// CHECK: .globl "(ab)(,)) -- (cd)" +-test4 (a b)(,)),(cd) +- +-.macro test5 _a +-.globl "\_a" +-.endm +- +-// CHECK: .globl zed1 +-test5 zed1 +- +-.macro test6 $a +-.globl "\$a" +-.endm +- +-// CHECK: .globl zed2 +-test6 zed2 +- +-.macro test7 .a +-.globl "\.a" +-.endm +- +-// CHECK: .globl zed3 +-test7 zed3 +- +-.macro test8 _a, _b, _c +-.globl "\_a,\_b,\_c" +-.endmacro +- +-.macro test9 _a _b _c +-.globl "\_a \_b \_c" +-.endmacro +- +-// CHECK: .globl "a,b,c" +-test8 a, b, c +-// CHECK: .globl "%1,%2,%3" +-test8 %1 %2 %3 #a comment +-// CHECK: .globl "x-y,z,1" +-test8 x - y z 1 +-// CHECK: .globl "1 2 3" +-test9 1, 2,3 +- +-test8 1,2 3 +-// CHECK-ERRORS: error: macro argument '_c' is missing +-// CHECK-ERRORS-NEXT: test8 1,2 3 +-// CHECK-ERRORS-NEXT: ^ +- +-test8 1 2, 3 +-// CHECK-ERRORS: error: expected ' ' for macro argument separator +-// CHECK-ERRORS-NEXT:test8 1 2, 3 +-// CHECK-ERRORS-NEXT: ^ Index: test/MC/AsmParser/macros-darwin.s =================================================================== --- test/MC/AsmParser/macros-darwin.s