dash.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] input: Fix compiling against libedit with -fno-common
@ 2020-05-02 18:37 Mike Gilbert
  2020-05-15  6:30 ` Herbert Xu
  0 siblings, 1 reply; 2+ messages in thread
From: Mike Gilbert @ 2020-05-02 18:37 UTC (permalink / raw)
  To: dash; +Cc: Jeroen Roovers, Mike Gilbert

From: Jeroen Roovers <jer@gentoo.org>

With -fno-common, which will be enabled by default in GCC 10, we see
this error:

ld: input.o:(.bss+0x0): multiple definition of `el';
histedit.o:(.bss+0x8): first defined here

To fix this, simply remove the definition as it is not needed.

Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 src/input.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/input.c b/src/input.c
index ae0c4c8..e84eca8 100644
--- a/src/input.c
+++ b/src/input.c
@@ -67,10 +67,6 @@ MKINIT char basebuf[IBUFSIZ];	/* buffer for top level input file */
 struct parsefile *parsefile = &basepf;	/* current input file */
 int whichprompt;		/* 1 == PS1, 2 == PS2 */
 
-#ifndef SMALL
-EditLine *el;			/* cookie for editline package */
-#endif
-
 STATIC void pushfile(void);
 static int preadfd(void);
 static void setinputfd(int fd, int push);
-- 
2.25.1

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] input: Fix compiling against libedit with -fno-common
  2020-05-02 18:37 [PATCH] input: Fix compiling against libedit with -fno-common Mike Gilbert
@ 2020-05-15  6:30 ` Herbert Xu
  0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2020-05-15  6:30 UTC (permalink / raw)
  Cc: dash, jer, floppym

Mike Gilbert <floppym@gentoo.org> wrote:
> From: Jeroen Roovers <jer@gentoo.org>
> 
> With -fno-common, which will be enabled by default in GCC 10, we see
> this error:
> 
> ld: input.o:(.bss+0x0): multiple definition of `el';
> histedit.o:(.bss+0x8): first defined here
> 
> To fix this, simply remove the definition as it is not needed.
> 
> Signed-off-by: Jeroen Roovers <jer@gentoo.org>
> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
> ---
> src/input.c | 4 ----
> 1 file changed, 4 deletions(-)

Patch applied.  Thanks.
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-05-15  6:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-02 18:37 [PATCH] input: Fix compiling against libedit with -fno-common Mike Gilbert
2020-05-15  6:30 ` Herbert Xu

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).