aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2023-07-27 13:32:38 -0400
committerSimon Marchi <simon.marchi@polymtl.ca>2023-07-27 13:33:03 -0400
commitb871f5ee3374590a4206da3ca14a32c4e68d0355 (patch)
treefb5cfd7cff4945c6e43f259e50f539ce742a0598
parent2f01a2b9eaa44cdf5d7c9ec926705831f8ce4c16 (diff)
downloadbinutils-b871f5ee3374590a4206da3ca14a32c4e68d0355.zip
binutils-b871f5ee3374590a4206da3ca14a32c4e68d0355.tar.gz
binutils-b871f5ee3374590a4206da3ca14a32c4e68d0355.tar.bz2
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 <tom@tromey.com>
-rwxr-xr-xgdb/ada-unicode.py1
-rwxr-xr-xgdb/gdbarch.py2
-rw-r--r--gdb/gdbcopyright.py3
-rwxr-xr-xgdb/make-target-delegates.py12
-rw-r--r--gdb/target-delegates.c1
5 files changed, 12 insertions, 7 deletions
diff --git a/gdb/ada-unicode.py b/gdb/ada-unicode.py
index 86685a2..fe5be56 100755
--- a/gdb/ada-unicode.py
+++ b/gdb/ada-unicode.py
@@ -91,5 +91,6 @@ with open("ada-casefold.h", "w") as f:
gdbcopyright.copyright("ada-unicode.py", "UTF-32 case-folding for GDB"),
file=f,
)
+ print("", file=f)
for r in all_ranges:
print(f" {{{r[0]}, {r[1]}, {r[2]}, {r[3]}}},", file=f)
diff --git a/gdb/gdbarch.py b/gdb/gdbarch.py
index 62592c1..d776707 100755
--- a/gdb/gdbarch.py
+++ b/gdb/gdbarch.py
@@ -52,6 +52,7 @@ with open("gdbarch-gen.h", "w") as f:
print(copyright, file=f)
print(file=f)
print(file=f)
+ print(file=f)
print("/* The following are pre-initialized by GDBARCH. */", file=f)
# Do Info components first.
@@ -121,6 +122,7 @@ with open("gdbarch-gen.h", "w") as f:
with open("gdbarch.c", "w") as f:
print(copyright, file=f)
print(file=f)
+ print(file=f)
print("/* Maintain the struct gdbarch object. */", file=f)
print(file=f)
#
diff --git a/gdb/gdbcopyright.py b/gdb/gdbcopyright.py
index 4e27356..ae4f6d6 100644
--- a/gdb/gdbcopyright.py
+++ b/gdb/gdbcopyright.py
@@ -49,5 +49,4 @@ def copyright(tool: str, description: str):
/* To regenerate this file, run:
./{tool}
-*/
-"""
+*/"""
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] = []
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 57b66ce..e4e1438 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -4535,4 +4535,3 @@ debug_target::store_memtags (CORE_ADDR arg0, size_t arg1, const gdb::byte_vector
gdb_puts ("\n", gdb_stdlog);
return result;
}
-