Enable multilib support when building with musl-gcc

Submitted by James Larrowe on Jan. 30, 2019, 9:38 p.m.

Details

Message ID 20190130213815.19267-1-larrowe.semaj11@gmail.com
State New
Series "Enable multilib support when building with musl-gcc"
Headers show

Commit Message

James Larrowe Jan. 30, 2019, 9:38 p.m.
Somewhat incomplete; enables using 32-bit musl-gcc
on a 64-bit system

Signed-off-by: James Larrowe <larrowe.semaj11@gmail.com>
---
 tools/musl-gcc.specs.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/tools/musl-gcc.specs.sh b/tools/musl-gcc.specs.sh
index 30492574..a73e6656 100644
--- a/tools/musl-gcc.specs.sh
+++ b/tools/musl-gcc.specs.sh
@@ -23,7 +23,9 @@  libgcc.a%s %:if-exists(libgcc_eh.a%s)
 crtendS.o%s $libdir/crtn.o
 
 *link:
--dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static} %{rdynamic:-export-dynamic}
+-dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static} \
+ %{rdynamic:-export-dynamic} %{m64:-melf_x86_64} %{mx32:-melf32_x86_64} \
+ %{m32:-melf_i386}
 
 *esp_link:
 

Comments

James Larrowe Feb. 21, 2019, 2:22 p.m.
Ping. Is there anything wrong with this? It works for me.

On Wed, Jan 30, 2019 at 4:38 PM James Larrowe <larrowe.semaj11@gmail.com>
wrote:

> Somewhat incomplete; enables using 32-bit musl-gcc
> on a 64-bit system
>
> Signed-off-by: James Larrowe <larrowe.semaj11@gmail.com>
> ---
>  tools/musl-gcc.specs.sh | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/musl-gcc.specs.sh b/tools/musl-gcc.specs.sh
> index 30492574..a73e6656 100644
> --- a/tools/musl-gcc.specs.sh
> +++ b/tools/musl-gcc.specs.sh
> @@ -23,7 +23,9 @@ libgcc.a%s %:if-exists(libgcc_eh.a%s)
>  crtendS.o%s $libdir/crtn.o
>
>  *link:
> --dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static}
> %{rdynamic:-export-dynamic}
> +-dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static} \
> + %{rdynamic:-export-dynamic} %{m64:-melf_x86_64} %{mx32:-melf32_x86_64} \
> + %{m32:-melf_i386}
>
>  *esp_link:
>
> --
> 2.20.1
>
>
Szabolcs Nagy Feb. 21, 2019, 2:44 p.m.
* James Larrowe <larrowe.semaj11@gmail.com> [2019-02-21 09:22:26 -0500]:
> Ping. Is there anything wrong with this? It works for me.

it breaks all targets that musl supports except x86_64

a multilib toolchain does not have separate include paths
for different abis so even on x86_64, -m32 or -mx32
would use the wrong headers.

> On Wed, Jan 30, 2019 at 4:38 PM James Larrowe <larrowe.semaj11@gmail.com>
> wrote:
> 
> > Somewhat incomplete; enables using 32-bit musl-gcc
> > on a 64-bit system
> >
> > Signed-off-by: James Larrowe <larrowe.semaj11@gmail.com>
> > ---
> >  tools/musl-gcc.specs.sh | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/musl-gcc.specs.sh b/tools/musl-gcc.specs.sh
> > index 30492574..a73e6656 100644
> > --- a/tools/musl-gcc.specs.sh
> > +++ b/tools/musl-gcc.specs.sh
> > @@ -23,7 +23,9 @@ libgcc.a%s %:if-exists(libgcc_eh.a%s)
> >  crtendS.o%s $libdir/crtn.o
> >
> >  *link:
> > --dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static}
> > %{rdynamic:-export-dynamic}
> > +-dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static} \
> > + %{rdynamic:-export-dynamic} %{m64:-melf_x86_64} %{mx32:-melf32_x86_64} \
> > + %{m32:-melf_i386}
> >
> >  *esp_link:
> >
> > --
> > 2.20.1
> >
> >
James Larrowe Feb. 21, 2019, 2:50 p.m.
It was actually intended to fix building musl with "gcc -m32". If you run
"CC='gcc -m32' ./configure && make && sudo make install" and try to run
`musl-gcc`, it doesn't work and causes some "Incompatible architcture"
errors. If there's any way I can make this better, please let me know and
I'll resend the patch.

On Thu, Feb 21, 2019 at 9:44 AM Szabolcs Nagy <nsz@port70.net> wrote:

> * James Larrowe <larrowe.semaj11@gmail.com> [2019-02-21 09:22:26 -0500]:
> > Ping. Is there anything wrong with this? It works for me.
>
> it breaks all targets that musl supports except x86_64
>
> a multilib toolchain does not have separate include paths
> for different abis so even on x86_64, -m32 or -mx32
> would use the wrong headers.
>
> > On Wed, Jan 30, 2019 at 4:38 PM James Larrowe <larrowe.semaj11@gmail.com
> >
> > wrote:
> >
> > > Somewhat incomplete; enables using 32-bit musl-gcc
> > > on a 64-bit system
> > >
> > > Signed-off-by: James Larrowe <larrowe.semaj11@gmail.com>
> > > ---
> > >  tools/musl-gcc.specs.sh | 4 +++-
> > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/tools/musl-gcc.specs.sh b/tools/musl-gcc.specs.sh
> > > index 30492574..a73e6656 100644
> > > --- a/tools/musl-gcc.specs.sh
> > > +++ b/tools/musl-gcc.specs.sh
> > > @@ -23,7 +23,9 @@ libgcc.a%s %:if-exists(libgcc_eh.a%s)
> > >  crtendS.o%s $libdir/crtn.o
> > >
> > >  *link:
> > > --dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static}
> > > %{rdynamic:-export-dynamic}
> > > +-dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static} \
> > > + %{rdynamic:-export-dynamic} %{m64:-melf_x86_64}
> %{mx32:-melf32_x86_64} \
> > > + %{m32:-melf_i386}
> > >
> > >  *esp_link:
> > >
> > > --
> > > 2.20.1
> > >
> > >
>
Rich Felker Feb. 21, 2019, 3:26 p.m.
On Thu, Feb 21, 2019 at 09:50:04AM -0500, James Larrowe wrote:
> It was actually intended to fix building musl with "gcc -m32". If you run
> "CC='gcc -m32' ./configure && make && sudo make install" and try to run
> `musl-gcc`, it doesn't work and causes some "Incompatible architcture"
> errors. If there's any way I can make this better, please let me know and
> I'll resend the patch.

When generating the musl-gcc wrapper, the -m32 is supposed to get
inserted into it if -m32 was included in $CC. It looks like there's
some reason this doesn't work without some linker flags also being
passed, and the musl-gcc.specs file is overriding a link spec in a way
that loses them. I'm not sure what the right fix it. It might be using
the specfile mechanism to rename/clone an existing spec then including
it at the beginning of the new one, with options at the end to
override, rather than replacing the old one, but I'm not sure if that
works here.

Rich


> On Thu, Feb 21, 2019 at 9:44 AM Szabolcs Nagy <nsz@port70.net> wrote:
> 
> > * James Larrowe <larrowe.semaj11@gmail.com> [2019-02-21 09:22:26 -0500]:
> > > Ping. Is there anything wrong with this? It works for me.
> >
> > it breaks all targets that musl supports except x86_64
> >
> > a multilib toolchain does not have separate include paths
> > for different abis so even on x86_64, -m32 or -mx32
> > would use the wrong headers.
> >
> > > On Wed, Jan 30, 2019 at 4:38 PM James Larrowe <larrowe.semaj11@gmail.com
> > >
> > > wrote:
> > >
> > > > Somewhat incomplete; enables using 32-bit musl-gcc
> > > > on a 64-bit system
> > > >
> > > > Signed-off-by: James Larrowe <larrowe.semaj11@gmail.com>
> > > > ---
> > > >  tools/musl-gcc.specs.sh | 4 +++-
> > > >  1 file changed, 3 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/tools/musl-gcc.specs.sh b/tools/musl-gcc.specs.sh
> > > > index 30492574..a73e6656 100644
> > > > --- a/tools/musl-gcc.specs.sh
> > > > +++ b/tools/musl-gcc.specs.sh
> > > > @@ -23,7 +23,9 @@ libgcc.a%s %:if-exists(libgcc_eh.a%s)
> > > >  crtendS.o%s $libdir/crtn.o
> > > >
> > > >  *link:
> > > > --dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static}
> > > > %{rdynamic:-export-dynamic}
> > > > +-dynamic-linker $ldso -nostdlib %{shared:-shared} %{static:-static} \
> > > > + %{rdynamic:-export-dynamic} %{m64:-melf_x86_64}
> > %{mx32:-melf32_x86_64} \
> > > > + %{m32:-melf_i386}
> > > >
> > > >  *esp_link:
> > > >
> > > > --
> > > > 2.20.1
> > > >
> > > >
> >