aboutsummaryrefslogtreecommitdiff
path: root/gcc/rust/Make-lang.in
diff options
context:
space:
mode:
authorPierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>2023-08-28 17:08:40 +0200
committerArthur Cohen <arthur.cohen@embecosm.com>2024-01-16 19:04:31 +0100
commitfd73cf8c31611dd8ddbf7835ce246e56771618ef (patch)
tree038cfa15ed3b7589ecf1c563ecc00b5d4a836923 /gcc/rust/Make-lang.in
parentb7809f89fb89aa0bef43790c9140cfd4aa8da02f (diff)
downloadgcc-fd73cf8c31611dd8ddbf7835ce246e56771618ef.zip
gcc-fd73cf8c31611dd8ddbf7835ce246e56771618ef.tar.gz
gcc-fd73cf8c31611dd8ddbf7835ce246e56771618ef.tar.bz2
gccrs: Rename libproc_macro to libproc_macro_internal
The name was a bit misleading since libproc_macro is a rust library that should we should be able to link against some rust code. This cpp library was the layer below the libproc_macro library, the "real" gcc libproc_macro act as a translation layer for the internal library. gcc/rust/ChangeLog: * expand/rust-macro-expand.h: Change include directive with the new name. * expand/rust-proc-macro.h (RUST_PROC_MACRO_H): Likewise. * util/rust-hir-map.h: Likewise. * util/rust-token-converter.h: Likewise. * util/rust-token-converter.cc: Remove useless include directive. * Make-lang.in: Rename library. libgrust/ChangeLog: * Makefile.am: Change library name. * Makefile.in: Likewise. * configure.ac: Likewise. * configure: Regenerate. * libproc_macro/Makefile.am: Moved to... * libproc_macro_internal/Makefile.am: ...here. * libproc_macro/Makefile.in: Moved to... * libproc_macro_internal/Makefile.in: ...here. * libproc_macro/bridge.h: Moved to... * libproc_macro_internal/bridge.h: ...here. * libproc_macro/ffistring.cc: Moved to... * libproc_macro_internal/ffistring.cc: ...here. * libproc_macro/ffistring.h: Moved to... * libproc_macro_internal/ffistring.h: ...here. * libproc_macro/group.cc: Moved to... * libproc_macro_internal/group.cc: ...here. * libproc_macro/group.h: Moved to... * libproc_macro_internal/group.h: ...here. * libproc_macro/ident.cc: Moved to... * libproc_macro_internal/ident.cc: ...here. * libproc_macro/ident.h: Moved to... * libproc_macro_internal/ident.h: ...here. * libproc_macro/literal.cc: Moved to... * libproc_macro_internal/literal.cc: ...here. * libproc_macro/literal.h: Moved to... * libproc_macro_internal/literal.h: ...here. * libproc_macro/proc_macro.cc: Moved to... * libproc_macro_internal/proc_macro.cc: ...here. * libproc_macro/proc_macro.h: Moved to... * libproc_macro_internal/proc_macro.h: ...here. * libproc_macro/punct.cc: Moved to... * libproc_macro_internal/punct.cc: ...here. * libproc_macro/punct.h: Moved to... * libproc_macro_internal/punct.h: ...here. * libproc_macro/registration.h: Moved to... * libproc_macro_internal/registration.h: ...here. * libproc_macro/rust/bridge.rs: Moved to... * libproc_macro_internal/rust/bridge.rs: ...here. * libproc_macro/rust/bridge/ffistring.rs: Moved to... * libproc_macro_internal/rust/bridge/ffistring.rs: ...here. * libproc_macro/rust/bridge/group.rs: Moved to... * libproc_macro_internal/rust/bridge/group.rs: ...here. * libproc_macro/rust/bridge/ident.rs: Moved to... * libproc_macro_internal/rust/bridge/ident.rs: ...here. * libproc_macro/rust/bridge/literal.rs: Moved to... * libproc_macro_internal/rust/bridge/literal.rs: ...here. * libproc_macro/rust/bridge/punct.rs: Moved to... * libproc_macro_internal/rust/bridge/punct.rs: ...here. * libproc_macro/rust/bridge/span.rs: Moved to... * libproc_macro_internal/rust/bridge/span.rs: ...here. * libproc_macro/rust/bridge/token_stream.rs: Moved to... * libproc_macro_internal/rust/bridge/token_stream.rs: ...here. * libproc_macro/rust/group.rs: Moved to... * libproc_macro_internal/rust/group.rs: ...here. * libproc_macro/rust/ident.rs: Moved to... * libproc_macro_internal/rust/ident.rs: ...here. * libproc_macro/rust/lib.rs: Moved to... * libproc_macro_internal/rust/lib.rs: ...here. * libproc_macro/rust/literal.rs: Moved to... * libproc_macro_internal/rust/literal.rs: ...here. * libproc_macro/rust/punct.rs: Moved to... * libproc_macro_internal/rust/punct.rs: ...here. * libproc_macro/rust/span.rs: Moved to... * libproc_macro_internal/rust/span.rs: ...here. * libproc_macro/rust/token_stream.rs: Moved to... * libproc_macro_internal/rust/token_stream.rs: ...here. * libproc_macro/span.cc: Moved to... * libproc_macro_internal/span.cc: ...here. * libproc_macro/span.h: Moved to... * libproc_macro_internal/span.h: ...here. * libproc_macro/tokenstream.cc: Moved to... * libproc_macro_internal/tokenstream.cc: ...here. * libproc_macro/tokenstream.h: Moved to... * libproc_macro_internal/tokenstream.h: ...here. * libproc_macro/tokentree.cc: Moved to... * libproc_macro_internal/tokentree.cc: ...here. * libproc_macro/tokentree.h: Moved to... * libproc_macro_internal/tokentree.h: ...here. Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'gcc/rust/Make-lang.in')
-rw-r--r--gcc/rust/Make-lang.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in
index ad41a56..25ead23 100644
--- a/gcc/rust/Make-lang.in
+++ b/gcc/rust/Make-lang.in
@@ -195,14 +195,14 @@ RUST_ALL_OBJS = $(GRS_OBJS) $(RUST_TARGET_OBJS)
rust_OBJS = $(RUST_ALL_OBJS) rust/rustspec.o
-RUST_LDFLAGS = $(LDFLAGS) -L./../libgrust/libproc_macro
-RUST_LIBDEPS = $(LIBDEPS) ../libgrust/libproc_macro/libproc_macro.a
+RUST_LDFLAGS = $(LDFLAGS) -L./../libgrust/libproc_macro_internal
+RUST_LIBDEPS = $(LIBDEPS) ../libgrust/libproc_macro_internal/libproc_macro_internal.a
# The compiler itself is called crab1
crab1$(exeext): $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(RUST_LIBDEPS) $(rust.prev)
@$(call LINK_PROGRESS,$(INDEX.rust),start)
+$(LLINKER) $(ALL_LINKERFLAGS) $(RUST_LDFLAGS) -o $@ \
- $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) ../libgrust/libproc_macro/libproc_macro.a $(BACKENDLIBS)
+ $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) ../libgrust/libproc_macro_internal/libproc_macro_internal.a $(BACKENDLIBS)
@$(call LINK_PROGRESS,$(INDEX.rust),end)
# Build hooks.