From 7c437023cac591f39ea09bfc75cbb9e5f0d5e38c Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Wed, 19 Apr 2017 10:13:29 +0000 Subject: [PATCH] Fix TestRegisterVariables for clang/arm Clang rejects __attribute__((regparm)) when targetting arm. The default calling convention passes arguments in registers anyway, so we can just remove them in this case. llvm-svn: 300670 --- .../lldbsuite/test/lang/c/register_variables/test.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/test.c b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/test.c index 476c32899edc..b95253ef9eea 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/test.c +++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/test.c @@ -1,17 +1,26 @@ #include +#if defined(__arm__) || defined(__aarch64__) +// Clang does not accept regparm attribute on these platforms. +// Fortunately, the default calling convention passes arguments in registers +// anyway. +#define REGPARM(N) +#else +#define REGPARM(N) __attribute__((regparm(N))) +#endif + struct bar { int m1; int m2; }; -void f1(int a, struct bar *b) __attribute__((noinline)) __attribute__((regparm(2))); +void f1(int a, struct bar *b) __attribute__((noinline)) REGPARM(2); void f1(int a, struct bar *b) { b->m2 = b->m1 + a; // set breakpoint here } -void f2(struct bar *b) __attribute__((noinline)) __attribute__((regparm(1))); +void f2(struct bar *b) __attribute__((noinline)) REGPARM(1); void f2(struct bar *b) { int c = b->m2; -- 2.34.1