* [Buildroot] [PATCH v2] valgrind: fix musl compile
@ 2016-02-09 20:53 Peter Seiderer
2016-02-09 21:43 ` Arnout Vandecappelle
0 siblings, 1 reply; 5+ messages in thread
From: Peter Seiderer @ 2016-02-09 20:53 UTC (permalink / raw)
To: buildroot
Add musl libc detection (based on suggestions by Romain Naour and
Arnout Vandecappelle) and add some tweaks for musl support (based
on OpenWRT patch [1]).
Fixes ([2]):
checking the glibc version... unsupported version
configure: error: Valgrind requires glibc version 2.2 or later
Patch suggested upstream (see [3]).
[1] https://dev.openwrt.org/browser/trunk/package/devel/valgrind/patches/200-musl_fix.patch?rev=46302
[2] http://autobuild.buildroot.org/results/7b0/7b048ba58918f0a08498c61327fcf35a85a84837
[3] https://bugs.kde.org/show_bug.cgi?id=359202
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
- add proper musl libc detection (suggested by Romain Naour and
Arnout Vandecappelle)
---
package/valgrind/0004-Fixes-for-musl-libc.patch | 98 +++++++++++++++++++++++++
package/valgrind/valgrind.mk | 3 +
2 files changed, 101 insertions(+)
create mode 100644 package/valgrind/0004-Fixes-for-musl-libc.patch
diff --git a/package/valgrind/0004-Fixes-for-musl-libc.patch b/package/valgrind/0004-Fixes-for-musl-libc.patch
new file mode 100644
index 0000000..54c2b93
--- /dev/null
+++ b/package/valgrind/0004-Fixes-for-musl-libc.patch
@@ -0,0 +1,98 @@
+From d096693009d951e9e235a880db906b0dfcdd5733 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Sat, 31 Oct 2015 19:45:04 +0100
+Subject: [PATCH] Fixes for musl libc.
+
+- add musl libc detection (prevents configure error)
+- adjust preload and symbol names (based on the OpenWrt
+ patch, see [1])
+
+[1] https://dev.openwrt.org/browser/trunk/package/devel/valgrind/patches/200-musl_fix.patch?rev=46302
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ configure.ac | 14 +++++++++++++-
+ coregrind/vg_preloaded.c | 2 +-
+ include/pub_tool_redir.h | 9 ++++++++-
+ 3 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8ab7f9b..e9d71cd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1009,6 +1009,13 @@ if test x$VGCONF_PLATFORM_PRI_CAPS = xX86_SOLARIS \
+ GLIBC_VERSION="solaris"
+ fi
+
++# GLIBC_VERSION is empty if a musl libc is used, so use the toolchain tuple
++# in this case.
++if test x$GLIBC_VERSION = x; then
++ if $CC -dumpmachine | grep -q musl; then
++ GLIBC_VERSION=musl
++ fi
++fi
+
+ AC_MSG_CHECKING([the glibc version])
+
+@@ -1064,10 +1071,15 @@ case "${GLIBC_VERSION}" in
+ # DEFAULT_SUPP set in host_os switch-case above.
+ # No other suppression file is used.
+ ;;
++ musl)
++ AC_MSG_RESULT(Musl)
++ AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc])
++ # no DEFAULT_SUPP file yet for musl libc.
++ ;;
+ 2.0|2.1|*)
+ AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
+- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
++ AC_MSG_ERROR([musl libc, Darwin libc, Bionic libc or Solaris libc])
+ ;;
+ esac
+
+diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
+index 2ea7a7a..e49c832 100644
+--- a/coregrind/vg_preloaded.c
++++ b/coregrind/vg_preloaded.c
+@@ -56,7 +56,7 @@
+ void VG_NOTIFY_ON_LOAD(freeres)( void );
+ void VG_NOTIFY_ON_LOAD(freeres)( void )
+ {
+-# if !defined(__UCLIBC__) \
++# if !defined(__UCLIBC__) && defined(__GLIBC__) \
+ && !defined(VGPV_arm_linux_android) \
+ && !defined(VGPV_x86_linux_android) \
+ && !defined(VGPV_mips32_linux_android) \
+diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
+index bac00d7..b8cd97e 100644
+--- a/include/pub_tool_redir.h
++++ b/include/pub_tool_redir.h
+@@ -242,8 +242,11 @@
+ /* --- Soname of the standard C library. --- */
+
+ #if defined(VGO_linux) || defined(VGO_solaris)
++# if defined(__GLIBC__) || defined(__UCLIBC__)
+ # define VG_Z_LIBC_SONAME libcZdsoZa // libc.so*
+-
++#else
++# define VG_Z_LIBC_SONAME libcZdZa // libc.*
++#endif
+ #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
+ # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
+
+@@ -274,7 +277,11 @@
+ /* --- Soname of the pthreads library. --- */
+
+ #if defined(VGO_linux)
++# if defined(__GLIBC__) || defined(__UCLIBC__)
+ # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
++#else
++# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
++#endif
+ #elif defined(VGO_darwin)
+ # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
+ #elif defined(VGO_solaris)
+--
+2.1.4
+
diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
index 5849b49..46ba13e 100644
--- a/package/valgrind/valgrind.mk
+++ b/package/valgrind/valgrind.mk
@@ -12,6 +12,9 @@ VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
VALGRIND_CONF_OPTS = --disable-ubsan
VALGRIND_INSTALL_STAGING = YES
+# patch 0004-Fixes-for-musl-libc.patch touching configure.ac
+VALGRIND_AUTORECONF = YES
+
ifeq ($(BR2_GCC_ENABLE_TLS),y)
VALGRIND_CONF_OPTS += --enable-tls
else
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v2] valgrind: fix musl compile
2016-02-09 20:53 [Buildroot] [PATCH v2] valgrind: fix musl compile Peter Seiderer
@ 2016-02-09 21:43 ` Arnout Vandecappelle
2016-02-09 22:16 ` Peter Seiderer
0 siblings, 1 reply; 5+ messages in thread
From: Arnout Vandecappelle @ 2016-02-09 21:43 UTC (permalink / raw)
To: buildroot
On 09-02-16 21:53, Peter Seiderer wrote:
> Add musl libc detection (based on suggestions by Romain Naour and
> Arnout Vandecappelle) and add some tweaks for musl support (based
> on OpenWRT patch [1]).
>
> Fixes ([2]):
> checking the glibc version... unsupported version
> configure: error: Valgrind requires glibc version 2.2 or later
>
> Patch suggested upstream (see [3]).
>
> [1] https://dev.openwrt.org/browser/trunk/package/devel/valgrind/patches/200-musl_fix.patch?rev=46302
> [2] http://autobuild.buildroot.org/results/7b0/7b048ba58918f0a08498c61327fcf35a85a84837
> [3] https://bugs.kde.org/show_bug.cgi?id=359202
>
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
> Changes v1 -> v2:
> - add proper musl libc detection (suggested by Romain Naour and
> Arnout Vandecappelle)
[snip]
> ++ musl)
> ++ AC_MSG_RESULT(Musl)
> ++ AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc])
> ++ # no DEFAULT_SUPP file yet for musl libc.
> ++ ;;
> + 2.0|2.1|*)
> + AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
> + AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
> +- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
> ++ AC_MSG_ERROR([musl libc, Darwin libc, Bionic libc or Solaris libc])
Actuallly, uClibc was already supported as well :-)
> + ;;
> + esac
> +
> +diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
> +index 2ea7a7a..e49c832 100644
> +--- a/coregrind/vg_preloaded.c
> ++++ b/coregrind/vg_preloaded.c
> +@@ -56,7 +56,7 @@
> + void VG_NOTIFY_ON_LOAD(freeres)( void );
> + void VG_NOTIFY_ON_LOAD(freeres)( void )
> + {
> +-# if !defined(__UCLIBC__) \
> ++# if !defined(__UCLIBC__) && defined(__GLIBC__) \
Adding defined(__GLIBC__) effectively excludes android (bionic), doesn't it?
> + && !defined(VGPV_arm_linux_android) \
> + && !defined(VGPV_x86_linux_android) \
> + && !defined(VGPV_mips32_linux_android) \
> +diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
> +index bac00d7..b8cd97e 100644
> +--- a/include/pub_tool_redir.h
> ++++ b/include/pub_tool_redir.h
> +@@ -242,8 +242,11 @@
> + /* --- Soname of the standard C library. --- */
> +
> + #if defined(VGO_linux) || defined(VGO_solaris)
> ++# if defined(__GLIBC__) || defined(__UCLIBC__)
AFAICS, on solaris neither of these is defined, so that's probably not good
either. I guess it's better to revert the condition and check on musl instead.
> + # define VG_Z_LIBC_SONAME libcZdsoZa // libc.so*
> +-
> ++#else
> ++# define VG_Z_LIBC_SONAME libcZdZa // libc.*
> ++#endif
> + #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
> + # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
> +
> +@@ -274,7 +277,11 @@
> + /* --- Soname of the pthreads library. --- */
> +
> + #if defined(VGO_linux)
> ++# if defined(__GLIBC__) || defined(__UCLIBC__)
Same here.
Regards,
Arnout
> + # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
> ++#else
> ++# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
> ++#endif
> + #elif defined(VGO_darwin)
> + # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
> + #elif defined(VGO_solaris)
> +--
> +2.1.4
> +
> diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
> index 5849b49..46ba13e 100644
> --- a/package/valgrind/valgrind.mk
> +++ b/package/valgrind/valgrind.mk
> @@ -12,6 +12,9 @@ VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
> VALGRIND_CONF_OPTS = --disable-ubsan
> VALGRIND_INSTALL_STAGING = YES
>
> +# patch 0004-Fixes-for-musl-libc.patch touching configure.ac
> +VALGRIND_AUTORECONF = YES
> +
> ifeq ($(BR2_GCC_ENABLE_TLS),y)
> VALGRIND_CONF_OPTS += --enable-tls
> else
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v2] valgrind: fix musl compile
2016-02-09 21:43 ` Arnout Vandecappelle
@ 2016-02-09 22:16 ` Peter Seiderer
2016-02-09 22:31 ` Peter Seiderer
0 siblings, 1 reply; 5+ messages in thread
From: Peter Seiderer @ 2016-02-09 22:16 UTC (permalink / raw)
To: buildroot
Hello Arnout,
On Tue, 9 Feb 2016 22:43:46 +0100, Arnout Vandecappelle <arnout@mind.be> wrote:
> On 09-02-16 21:53, Peter Seiderer wrote:
> > Add musl libc detection (based on suggestions by Romain Naour and
> > Arnout Vandecappelle) and add some tweaks for musl support (based
> > on OpenWRT patch [1]).
> >
> > Fixes ([2]):
> > checking the glibc version... unsupported version
> > configure: error: Valgrind requires glibc version 2.2 or later
> >
> > Patch suggested upstream (see [3]).
> >
> > [1] https://dev.openwrt.org/browser/trunk/package/devel/valgrind/patches/200-musl_fix.patch?rev=46302
> > [2] http://autobuild.buildroot.org/results/7b0/7b048ba58918f0a08498c61327fcf35a85a84837
> > [3] https://bugs.kde.org/show_bug.cgi?id=359202
> >
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > ---
> > Changes v1 -> v2:
> > - add proper musl libc detection (suggested by Romain Naour and
> > Arnout Vandecappelle)
> [snip]
> > ++ musl)
> > ++ AC_MSG_RESULT(Musl)
> > ++ AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc])
> > ++ # no DEFAULT_SUPP file yet for musl libc.
> > ++ ;;
> > + 2.0|2.1|*)
> > + AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
> > + AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
> > +- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
> > ++ AC_MSG_ERROR([musl libc, Darwin libc, Bionic libc or Solaris libc])
>
> Actuallly, uClibc was already supported as well :-)
O.k, will add uclibc as well...
>
> > + ;;
> > + esac
> > +
> > +diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
> > +index 2ea7a7a..e49c832 100644
> > +--- a/coregrind/vg_preloaded.c
> > ++++ b/coregrind/vg_preloaded.c
> > +@@ -56,7 +56,7 @@
> > + void VG_NOTIFY_ON_LOAD(freeres)( void );
> > + void VG_NOTIFY_ON_LOAD(freeres)( void )
> > + {
> > +-# if !defined(__UCLIBC__) \
> > ++# if !defined(__UCLIBC__) && defined(__GLIBC__) \
>
> Adding defined(__GLIBC__) effectively excludes android (bionic), doesn't it?
>
> > + && !defined(VGPV_arm_linux_android) \
> > + && !defined(VGPV_x86_linux_android) \
> > + && !defined(VGPV_mips32_linux_android) \
> > +diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
> > +index bac00d7..b8cd97e 100644
> > +--- a/include/pub_tool_redir.h
> > ++++ b/include/pub_tool_redir.h
> > +@@ -242,8 +242,11 @@
> > + /* --- Soname of the standard C library. --- */
> > +
> > + #if defined(VGO_linux) || defined(VGO_solaris)
> > ++# if defined(__GLIBC__) || defined(__UCLIBC__)
>
> AFAICS, on solaris neither of these is defined, so that's probably not good
> either. I guess it's better to revert the condition and check on musl instead.
O.k, will do...
>
> > + # define VG_Z_LIBC_SONAME libcZdsoZa // libc.so*
> > +-
> > ++#else
> > ++# define VG_Z_LIBC_SONAME libcZdZa // libc.*
> > ++#endif
> > + #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
> > + # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
> > +
> > +@@ -274,7 +277,11 @@
> > + /* --- Soname of the pthreads library. --- */
> > +
> > + #if defined(VGO_linux)
> > ++# if defined(__GLIBC__) || defined(__UCLIBC__)
>
> Same here.
>
O.k, will do...
>
>
> Regards,
> Arnout
>
>
> > + # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
> > ++#else
> > ++# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
> > ++#endif
> > + #elif defined(VGO_darwin)
> > + # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
> > + #elif defined(VGO_solaris)
> > +--
> > +2.1.4
> > +
> > diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
> > index 5849b49..46ba13e 100644
> > --- a/package/valgrind/valgrind.mk
> > +++ b/package/valgrind/valgrind.mk
> > @@ -12,6 +12,9 @@ VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
> > VALGRIND_CONF_OPTS = --disable-ubsan
> > VALGRIND_INSTALL_STAGING = YES
> >
> > +# patch 0004-Fixes-for-musl-libc.patch touching configure.ac
> > +VALGRIND_AUTORECONF = YES
> > +
> > ifeq ($(BR2_GCC_ENABLE_TLS),y)
> > VALGRIND_CONF_OPTS += --enable-tls
> > else
> >
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v2] valgrind: fix musl compile
2016-02-09 22:16 ` Peter Seiderer
@ 2016-02-09 22:31 ` Peter Seiderer
2016-02-09 22:43 ` Arnout Vandecappelle
0 siblings, 1 reply; 5+ messages in thread
From: Peter Seiderer @ 2016-02-09 22:31 UTC (permalink / raw)
To: buildroot
Hello Arnout,
(one more e-mail, hit the send button too early)
On Tue, 9 Feb 2016 23:16:30 +0100, Peter Seiderer <ps.report@gmx.net> wrote:
> Hello Arnout,
>
> On Tue, 9 Feb 2016 22:43:46 +0100, Arnout Vandecappelle <arnout@mind.be> wrote:
>
> > On 09-02-16 21:53, Peter Seiderer wrote:
> > > Add musl libc detection (based on suggestions by Romain Naour and
> > > Arnout Vandecappelle) and add some tweaks for musl support (based
> > > on OpenWRT patch [1]).
> > >
> > > Fixes ([2]):
> > > checking the glibc version... unsupported version
> > > configure: error: Valgrind requires glibc version 2.2 or later
> > >
> > > Patch suggested upstream (see [3]).
> > >
> > > [1] https://dev.openwrt.org/browser/trunk/package/devel/valgrind/patches/200-musl_fix.patch?rev=46302
> > > [2] http://autobuild.buildroot.org/results/7b0/7b048ba58918f0a08498c61327fcf35a85a84837
> > > [3] https://bugs.kde.org/show_bug.cgi?id=359202
> > >
> > > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > > ---
> > > Changes v1 -> v2:
> > > - add proper musl libc detection (suggested by Romain Naour and
> > > Arnout Vandecappelle)
> > [snip]
> > > ++ musl)
> > > ++ AC_MSG_RESULT(Musl)
> > > ++ AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc])
> > > ++ # no DEFAULT_SUPP file yet for musl libc.
> > > ++ ;;
> > > + 2.0|2.1|*)
> > > + AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
> > > + AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,])
> > > +- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc])
> > > ++ AC_MSG_ERROR([musl libc, Darwin libc, Bionic libc or Solaris libc])
> >
> > Actuallly, uClibc was already supported as well :-)
>
> O.k, will add uclibc as well...
>
> >
> > > + ;;
> > > + esac
> > > +
> > > +diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
> > > +index 2ea7a7a..e49c832 100644
> > > +--- a/coregrind/vg_preloaded.c
> > > ++++ b/coregrind/vg_preloaded.c
> > > +@@ -56,7 +56,7 @@
> > > + void VG_NOTIFY_ON_LOAD(freeres)( void );
> > > + void VG_NOTIFY_ON_LOAD(freeres)( void )
> > > + {
> > > +-# if !defined(__UCLIBC__) \
> > > ++# if !defined(__UCLIBC__) && defined(__GLIBC__) \
> >
> > Adding defined(__GLIBC__) effectively excludes android (bionic), doesn't it?
Not sure about this one, I think it is o.k. for the buildroot case:
- old behavior was __UCLIBC__ or __GLIBC__ is defined (!__UCLIBC__
means __GLIBC__ is defined)
- new behavior is __UCLIBC__ or __GLIBC__ or MUSL_LIBC is defined,
so from !__UCLIBC__ follows __GLIBC__ or MUSL_LIBC, so the need
to check explicit for __GLIBC__ ...
Do I miss something? Not sure about the right solution for upstream...
Thanks for review...
Regards,
Peter
> >
> > > + && !defined(VGPV_arm_linux_android) \
> > > + && !defined(VGPV_x86_linux_android) \
> > > + && !defined(VGPV_mips32_linux_android) \
> > > +diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h
> > > +index bac00d7..b8cd97e 100644
> > > +--- a/include/pub_tool_redir.h
> > > ++++ b/include/pub_tool_redir.h
> > > +@@ -242,8 +242,11 @@
> > > + /* --- Soname of the standard C library. --- */
> > > +
> > > + #if defined(VGO_linux) || defined(VGO_solaris)
> > > ++# if defined(__GLIBC__) || defined(__UCLIBC__)
> >
> > AFAICS, on solaris neither of these is defined, so that's probably not good
> > either. I guess it's better to revert the condition and check on musl instead.
>
> O.k, will do...
>
> >
> > > + # define VG_Z_LIBC_SONAME libcZdsoZa // libc.so*
> > > +-
> > > ++#else
> > > ++# define VG_Z_LIBC_SONAME libcZdZa // libc.*
> > > ++#endif
> > > + #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6)
> > > + # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib
> > > +
> > > +@@ -274,7 +277,11 @@
> > > + /* --- Soname of the pthreads library. --- */
> > > +
> > > + #if defined(VGO_linux)
> > > ++# if defined(__GLIBC__) || defined(__UCLIBC__)
> >
> > Same here.
> >
>
> O.k, will do...
> >
> >
> > Regards,
> > Arnout
> >
> >
> > > + # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0
> > > ++#else
> > > ++# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.*
> > > ++#endif
> > > + #elif defined(VGO_darwin)
> > > + # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib
> > > + #elif defined(VGO_solaris)
> > > +--
> > > +2.1.4
> > > +
> > > diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk
> > > index 5849b49..46ba13e 100644
> > > --- a/package/valgrind/valgrind.mk
> > > +++ b/package/valgrind/valgrind.mk
> > > @@ -12,6 +12,9 @@ VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
> > > VALGRIND_CONF_OPTS = --disable-ubsan
> > > VALGRIND_INSTALL_STAGING = YES
> > >
> > > +# patch 0004-Fixes-for-musl-libc.patch touching configure.ac
> > > +VALGRIND_AUTORECONF = YES
> > > +
> > > ifeq ($(BR2_GCC_ENABLE_TLS),y)
> > > VALGRIND_CONF_OPTS += --enable-tls
> > > else
> > >
> >
> >
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread* [Buildroot] [PATCH v2] valgrind: fix musl compile
2016-02-09 22:31 ` Peter Seiderer
@ 2016-02-09 22:43 ` Arnout Vandecappelle
0 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2016-02-09 22:43 UTC (permalink / raw)
To: buildroot
On 09-02-16 23:31, Peter Seiderer wrote:
> Hello Arnout,
>
> (one more e-mail, hit the send button too early)
>
> On Tue, 9 Feb 2016 23:16:30 +0100, Peter Seiderer <ps.report@gmx.net> wrote:
>
>> Hello Arnout,
>>
>> On Tue, 9 Feb 2016 22:43:46 +0100, Arnout Vandecappelle <arnout@mind.be> wrote:
>>
>>> On 09-02-16 21:53, Peter Seiderer wrote:
[snip]
>>>> +diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
>>>> +index 2ea7a7a..e49c832 100644
>>>> +--- a/coregrind/vg_preloaded.c
>>>> ++++ b/coregrind/vg_preloaded.c
>>>> +@@ -56,7 +56,7 @@
>>>> + void VG_NOTIFY_ON_LOAD(freeres)( void );
>>>> + void VG_NOTIFY_ON_LOAD(freeres)( void )
>>>> + {
>>>> +-# if !defined(__UCLIBC__) \
>>>> ++# if !defined(__UCLIBC__) && defined(__GLIBC__) \
>>>
>>> Adding defined(__GLIBC__) effectively excludes android (bionic), doesn't it?
>
> Not sure about this one, I think it is o.k. for the buildroot case:
> - old behavior was __UCLIBC__ or __GLIBC__ is defined (!__UCLIBC__
> means __GLIBC__ is defined)
> - new behavior is __UCLIBC__ or __GLIBC__ or MUSL_LIBC is defined,
> so from !__UCLIBC__ follows __GLIBC__ or MUSL_LIBC, so the need
> to check explicit for __GLIBC__ ...
>
> Do I miss something? Not sure about the right solution for upstream...
I did indeed mean for upstream. And also for buildroot in the longer term,
because at some point we _will_ start supporting a fourth libc.
Regards,
Arnout
[snip]
--
Arnout Vandecappelle arnout dot vandecappelle at essensium dot com
Senior Embedded Software Architect . . . . . . +32-478-010353 (mobile)
Essensium, Mind division . . . . . . . . . . . . . . http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium . . . . . BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-02-09 22:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-09 20:53 [Buildroot] [PATCH v2] valgrind: fix musl compile Peter Seiderer
2016-02-09 21:43 ` Arnout Vandecappelle
2016-02-09 22:16 ` Peter Seiderer
2016-02-09 22:31 ` Peter Seiderer
2016-02-09 22:43 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.