From 7b36d26b22d147ffc347f427f9fd584700578a94 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 3 Dec 2018 14:40:48 +0100 Subject: [PATCH] Fix test-as-const-jmp_buf-ssp.c generation on gnu-i386 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit hurd's jmp_buf-ssp.sym does not define any symbol. scripts/gen-as-const.py currently was emitting an empty line in that case, and the gawk invocation was prepending "asconst_" to it, ending up with: .../build/glibc/setjmp/test-as-const-jmp_buf-ssp.c:1:2: error: expected « = », « , », « ; », « asm » or « __attribute__ » at end of input 1 | asconst_ | ^~~~~~~~ * scripts/gen-as-const.py (main): Avoid emitting empty line when there is no element in `consts'. --- ChangeLog | 5 +++++ scripts/gen-as-const.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 98c7ac761e..030c567a77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-12-03 Samuel Thibault + + * scripts/gen-as-const.py (main): Avoid emitting empty line when + there is no element in `consts'. + 2018-12-01 Florian Weimer * support/support_capture_subprocess.c diff --git a/scripts/gen-as-const.py b/scripts/gen-as-const.py index b7a5744bb1..cabf401ed1 100644 --- a/scripts/gen-as-const.py +++ b/scripts/gen-as-const.py @@ -153,7 +153,7 @@ def main(): print(gen_test(sym_data)) else: consts = compute_c_consts(sym_data, args.cc) - print('\n'.join('#define %s %s' % c for c in sorted(consts.items()))) + print(''.join('#define %s %s\n' % c for c in sorted(consts.items())), end='') if __name__ == '__main__': main()