[PATCH] [perf/core branch] perf coresight: Fix ARM builds caused by misplaced __printf

From: Kim Phillips
Date: Fri Jun 16 2017 - 15:59:14 EST


Trailing __printf attributes work for function declarations, but not
definitions. This patch fixes arm32/64 builds by placing __printf
before the declarator. Otherwise this happens:

arch/arm64/util/../../arm/util/cs-etm.c:586:1: error: attributes should be specified before the declarator in a function definition
static int cs_device__print_file(const char *name, const char *fmt, ...) __printf(2, 3)
^~~~~~
arch/arm64/util/../../arm/util/cs-etm.c: In function âcs_etm_set_drv_configâ:
arch/arm64/util/../../arm/util/cs-etm.c:610:8: error: implicit declaration of function âcs_device__print_fileâ [-Werror=implicit-function-declaration]
ret = cs_device__print_file(enable_sink, "%d", 1);
^~~~~~~~~~~~~~~~~~~~~
arch/arm64/util/../../arm/util/cs-etm.c:610:2: error: nested extern declaration of âcs_device__print_fileâ [-Werror=nested-externs]
ret = cs_device__print_file(enable_sink, "%d", 1);
^~~
At top level:
arch/arm64/util/../../arm/util/cs-etm.c:566:14: error: âcs_device__open_fileâ defined but not used [-Werror=unused-function]
static FILE *cs_device__open_file(const char *name)
^~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

Fixes: 2ee261d962ac "tools: Adopt __printf from kernel sources"
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
Signed-off-by: Kim Phillips <kim.phillips@xxxxxxx>
---
Applies to acme's perf/core branch

tools/perf/arch/arm/util/cs-etm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c
index 90a6f42ba904..7ce3d1a25133 100644
--- a/tools/perf/arch/arm/util/cs-etm.c
+++ b/tools/perf/arch/arm/util/cs-etm.c
@@ -583,7 +583,7 @@ static FILE *cs_device__open_file(const char *name)

}

-static int cs_device__print_file(const char *name, const char *fmt, ...) __printf(2, 3)
+static int __printf(2, 3) cs_device__print_file(const char *name, const char *fmt, ...)
{
va_list args;
FILE *file;
--
2.11.0