summaryrefslogtreecommitdiffstats
path: root/contrib/llvm/patches
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2014-12-14 13:32:14 +0000
committerdim <dim@FreeBSD.org>2014-12-14 13:32:14 +0000
commit9bf8c0f790982305237954fd8136a3cf8241302b (patch)
tree7796ef6540ee630525edb90b8118bf9a7d22f422 /contrib/llvm/patches
parentcb41c48320b2ebfc233bd4b72b1f70c3be279a72 (diff)
downloadFreeBSD-src-9bf8c0f790982305237954fd8136a3cf8241302b.zip
FreeBSD-src-9bf8c0f790982305237954fd8136a3cf8241302b.tar.gz
Update patch-r274286-llvm-r201784-asm-dollar.diff, so
test/MC/AsmParser/macros.s is properly deleted when patching.
Diffstat (limited to 'contrib/llvm/patches')
-rw-r--r--contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff98
1 files changed, 97 insertions, 1 deletions
diff --git a/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff b/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
index e5baca0..1d51e69 100644
--- a/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
+++ b/contrib/llvm/patches/patch-r274286-llvm-r201784-asm-dollar.diff
@@ -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: <instantiation>:1:1: error: unknown directive
+-// CHECK-ERRORS-NEXT: macrobody0
+-// CHECK-ERRORS-NEXT: ^
+-// CHECK-ERRORS: <instantiation>: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
OpenPOWER on IntegriCloud