From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>,
Masahiro Yamada <masahiroy@kernel.org>
Cc: Gary Guo <gary@garyguo.net>, Richard Weinberger <richard@nod.at>,
Adam Bratschi-Kaye <ark.email@gmail.com>,
Alex Gaynor <alex.gaynor@gmail.com>,
Ayaan Zaidi <zaidi.ayaan@gmail.com>,
Boqun Feng <boqun.feng@gmail.com>,
Boris-Chengbiao Zhou <bobo1239@web.de>,
Douglas Su <d0u9.su@outlook.com>, Finn Behrens <me@kloenk.de>,
Fox Chen <foxhlchen@gmail.com>,
Geoffrey Thomas <geofft@ldpreload.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Sumera Priyadarsini <sylphrenadin@gmail.com>,
Sven Van Asbroeck <thesven73@gmail.com>,
Wedson Almeida Filho <wedsonaf@google.com>,
Yuki Okushi <jtitor@2k36.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the rust tree
Date: Wed, 29 Sep 2021 09:37:58 +1000 [thread overview]
Message-ID: <20210929093758.7af9e589@canb.auug.org.au> (raw)
In-Reply-To: <20210928155247.5220932c@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 4033 bytes --]
Hi All,
On Tue, 28 Sep 2021 15:52:47 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 28 Sep 2021 05:18:49 +0100 Gary Guo <gary@garyguo.net> wrote:
> >
> > On Tue, 28 Sep 2021 14:09:32 +1000
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > > Hi all,
> > >
> > > After merging the rust tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > scripts/kconfig/confdata.c: In function 'rustc_cfg_print_symbol':
> > > scripts/kconfig/confdata.c:669:9: warning: implicit declaration of
> > > function 'sym_escape_string_value'; did you mean
> > > 'sym_set_string_value'? [-Wimplicit-function-declaration] 669 | str
> > > = sym_escape_string_value(value); | ^~~~~~~~~~~~~~~~~~~~~~~ |
> > > sym_set_string_value scripts/kconfig/confdata.c:669:7:
> > > warning: assignment to 'const char *' from 'int' makes pointer from
> > > integer without a cast [-Wint-conversion] 669 | str =
> > > sym_escape_string_value(value); | ^ /usr/bin/ld:
> > > scripts/kconfig/confdata.o: in function `rustc_cfg_print_symbol':
> > > confdata.c:(.text+0x738): undefined reference to
> > > `sym_escape_string_value'
> > >
> > > Caused by commit
> > >
> > > dc08d49444e9 ("Kbuild: add Rust support")
> > >
> > > interacting with commit
> > >
> > > 420a2bdbead2 ("kconfig: Refactor sym_escape_string_value")
> > >
> > > from the kbuild tree.
> > >
> > > I applied the following patch, but it doesn't seem quite right.
> >
> > That's indeed incorrect, if we have `CONFIG_FOO=bar` then sym here is
> > `FOO` and value is `bar`. I think to resolve the conflict, 420a2bdbead2
> > would have to be reverted.
>
> OK, I have done that for today. (I needed to revert
> 16f3610168218ed5e2eafa6978bb7f10c175c7a9 as well).
Today, I have applied the following patch to the kbuild tree.
Masahiro, would you consider adding this to the kbuild tree itself? Or
is there a betters solution for what the rust tree wants to do?
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 29 Sep 2021 09:30:02 +1000
Subject: [PATCH] kconfig: restore sym_escape_string_value()
This function will be used by the rust tree.
Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Gary Guo <gary@garyguo.net>
Cc: Richard Weinberger <richard@nod.at>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
scripts/kconfig/lkc_proto.h | 1 +
scripts/kconfig/symbol.c | 11 +++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index 7ce4b666bba8..62e0ed773f41 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -18,6 +18,7 @@ extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
struct symbol * sym_lookup(const char *name, int flags);
struct symbol * sym_find(const char *name);
+char *sym_escape_string_value(const char *in);
char *sym_escape_string(struct symbol *sym);
struct symbol ** sym_re_search(const char *pattern);
const char * sym_type_name(enum symbol_type type);
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 2dc251b0930e..ca115569d497 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -872,15 +872,13 @@ struct symbol *sym_find(const char *name)
}
/* The returned pointer must be freed on the caller side */
-char *sym_escape_string(struct symbol *sym)
+char *sym_escape_string_value(const char *in)
{
- const char *in, *p;
+ const char *p;
size_t reslen;
char *res;
size_t l;
- in = sym_get_string_value(sym);
-
reslen = strlen(in) + strlen("\"\"") + 1;
p = in;
@@ -917,6 +915,11 @@ char *sym_escape_string(struct symbol *sym)
return res;
}
+char *sym_escape_string(struct symbol *sym)
+{
+ return sym_escape_string_value(sym_get_string_value(sym));
+}
+
struct sym_match {
struct symbol *sym;
off_t so, eo;
--
2.33.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-09-28 23:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 4:09 linux-next: build failure after merge of the rust tree Stephen Rothwell
2021-09-28 4:18 ` Gary Guo
2021-09-28 5:52 ` Stephen Rothwell
2021-09-28 23:37 ` Stephen Rothwell [this message]
2021-09-29 17:13 ` Masahiro Yamada
2021-09-29 17:25 ` Miguel Ojeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210929093758.7af9e589@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alex.gaynor@gmail.com \
--cc=ark.email@gmail.com \
--cc=bobo1239@web.de \
--cc=boqun.feng@gmail.com \
--cc=d0u9.su@outlook.com \
--cc=foxhlchen@gmail.com \
--cc=gary@garyguo.net \
--cc=geofft@ldpreload.com \
--cc=jtitor@2k36.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=me@kloenk.de \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=mpe@ellerman.id.au \
--cc=richard@nod.at \
--cc=sylphrenadin@gmail.com \
--cc=thesven73@gmail.com \
--cc=wedsonaf@google.com \
--cc=zaidi.ayaan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).