From b871f5ee3374590a4206da3ca14a32c4e68d0355 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 27 Jul 2023 13:32:38 -0400 Subject: gdb: remove trailing empty line in target-delegates.c In a review [1], I pointed out that applying the patch, git would say: .git/rebase-apply/patch:147: new blank line at EOF. However, since the empty line is in target-delegates.c (a generated file), there's nothing the author can do about it. To avoid this comment coming up again in the future, change make-target-delegates.py to avoid the trailing empty line. Do this by making it output empty lines before each entity, not after. Since this needs removing a newline output in gdbcopyright, adjust ada-unicode.py and gdbarch.py to avoid changes in the files they generate. [1] https://inbox.sourceware.org/gdb-patches/20230427210113.45380-1-jhb@FreeBSD.org/T/#m083598405bef19157f67c9d97846d3dd90dc7d1c Change-Id: Ic4c648f06443b432168cb76603402c918aa6e5d2 Approved-By: Tom Tromey --- gdb/make-target-delegates.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gdb/make-target-delegates.py') diff --git a/gdb/make-target-delegates.py b/gdb/make-target-delegates.py index c8e5a94..704d3f1 100755 --- a/gdb/make-target-delegates.py +++ b/gdb/make-target-delegates.py @@ -199,6 +199,7 @@ def write_declaration(f: TextIO, name: str, return_type: str, argtypes: List[str # Write out a delegation function. def write_delegator(f: TextIO, name: str, return_type: str, argtypes: List[str]): + print("", file=f) names = write_function_header( f, False, "target_ops::" + name, return_type, argtypes ) @@ -208,7 +209,7 @@ def write_delegator(f: TextIO, name: str, return_type: str, argtypes: List[str]) print("this->beneath ()->" + name + " (", file=f, end="") print(", ".join(names), file=f, end="") print(");", file=f) - print("}\n", file=f) + print("}", file=f) # Write out a default function. @@ -220,6 +221,7 @@ def write_tdefault( return_type: str, argtypes: List[str], ): + print("", file=f) name = "dummy_target::" + name names = write_function_header(f, False, name, return_type, argtypes) if style == "FUNC": @@ -238,7 +240,7 @@ def write_tdefault( pass else: raise RuntimeError("unrecognized style: " + style) - print("}\n", file=f) + print("}", file=f) def munge_type(typename: str): @@ -263,6 +265,7 @@ def munge_type(typename: str): def write_debugmethod( f: TextIO, content: str, name: str, return_type: str, argtypes: List[str] ): + print("", file=f) debugname = "debug_target::" + name names = write_function_header(f, False, debugname, return_type, argtypes) if return_type != "void": @@ -305,7 +308,7 @@ def write_debugmethod( if return_type != "void": print(" return result;", file=f) - print("}\n", file=f) + print("}", file=f) def print_class( @@ -314,6 +317,7 @@ def print_class( delegators: List[str], entries: Dict[str, Entry], ): + print("", file=f) print("struct " + class_name + " : public target_ops", file=f) print("{", file=f) print(" const target_info &info () const override;", file=f) @@ -326,7 +330,7 @@ def print_class( entry = entries[name] write_declaration(f, name, entry.return_type, entry.argtypes) - print("};\n", file=f) + print("};", file=f) delegators: List[str] = [] -- cgit v1.1