aboutsummaryrefslogtreecommitdiff
path: root/libgrust
diff options
context:
space:
mode:
authorPierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>2023-07-26 16:44:59 +0200
committerArthur Cohen <arthur.cohen@embecosm.com>2024-01-16 18:56:01 +0100
commitb190aaeff7b4b6e3b96dfe0b5277ccc93ccb9973 (patch)
tree6dc0bb34760f84cf0a836f1d379fea51b4cadbb5 /libgrust
parentde7e34bdd6c62294831d867188807216e186ed03 (diff)
downloadgcc-b190aaeff7b4b6e3b96dfe0b5277ccc93ccb9973.zip
gcc-b190aaeff7b4b6e3b96dfe0b5277ccc93ccb9973.tar.gz
gcc-b190aaeff7b4b6e3b96dfe0b5277ccc93ccb9973.tar.bz2
gccrs: proc_macro: Rename from_string callback symbol
The symbol had a different convention from rust standard naming convention (?) hence the change before adding new callback. gcc/rust/ChangeLog: * expand/rust-proc-macro.cc (load_macros_array): Symbol rename. libgrust/ChangeLog: * libproc_macro/proc_macro.cc (Procmacro::make_bang): Change symbol name. * libproc_macro/registration.h: Likewise. * libproc_macro/tokenstream.cc (TokenStream::make_tokenstream): Likewise. Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'libgrust')
-rw-r--r--libgrust/libproc_macro/proc_macro.cc2
-rw-r--r--libgrust/libproc_macro/registration.h2
-rw-r--r--libgrust/libproc_macro/tokenstream.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/libgrust/libproc_macro/proc_macro.cc b/libgrust/libproc_macro/proc_macro.cc
index effe717..a404691 100644
--- a/libgrust/libproc_macro/proc_macro.cc
+++ b/libgrust/libproc_macro/proc_macro.cc
@@ -51,4 +51,4 @@ Procmacro::make_bang (const char *name, BangMacro macro)
} // namespace ProcMacro
-ProcMacro::from_str_function_t __gccrs_pm_callback_from_str_fn = nullptr;
+ProcMacro::from_str_function_t __gccrs_proc_macro_from_str_fn = nullptr;
diff --git a/libgrust/libproc_macro/registration.h b/libgrust/libproc_macro/registration.h
index bba69b1..5cefc37 100644
--- a/libgrust/libproc_macro/registration.h
+++ b/libgrust/libproc_macro/registration.h
@@ -32,6 +32,6 @@ using from_str_function_t = ProcMacro::TokenStream (*) (std::string &, bool &);
} // namespace ProcMacro
-extern "C" ProcMacro::from_str_function_t __gccrs_pm_callback_from_str_fn;
+extern "C" ProcMacro::from_str_function_t __gccrs_proc_macro_from_str_fn;
#endif /* !REGISTRATION_H */
diff --git a/libgrust/libproc_macro/tokenstream.cc b/libgrust/libproc_macro/tokenstream.cc
index 5d9abb6..0f7f1f2 100644
--- a/libgrust/libproc_macro/tokenstream.cc
+++ b/libgrust/libproc_macro/tokenstream.cc
@@ -49,7 +49,7 @@ TokenStream::make_tokenstream (std::uint64_t capacity)
TokenStream
TokenStream::make_tokenstream (std::string &source, bool &has_error)
{
- return __gccrs_pm_callback_from_str_fn (source, has_error);
+ return __gccrs_proc_macro_from_str_fn (source, has_error);
}
void