Hi Max,
following patch was developed by crosstool-ng developer. Okay to commit?
best regards Waldemar
Waldemar, Alexey,
On Wed, Dec 7, 2016 at 6:48 PM, Waldemar Brodkorb wbx@uclibc-ng.org wrote:
following patch was developed by crosstool-ng developer. Okay to commit?
I've got a couple questions:
diff --git a/libpthread/nptl/sysdeps/Makefile.commonarch b/libpthread/nptl/sysdeps/Makefile.commonarch index c206ac9..134eade 100644 --- a/libpthread/nptl/sysdeps/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/Makefile.commonarch @@ -32,10 +32,11 @@ libpthread_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libpthread_ar libpthread_arch_OBJS = $(libpthread_subarch_OBJS) $(libpthread_arch_COBJ) $(libpthread_arch_SOBJ)
libc_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_CSRC)) -libc_arch_SOBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC)) +libc_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC))
I see that there's a copy-paste-type error, but this change is not a part of this fix, right?
diff --git a/libpthread/nptl/sysdeps/xtensa/Makefile.arch b/libpthread/nptl/sysdeps/xtensa/Makefile.arch index 9e63b19..c26e197 100644 --- a/libpthread/nptl/sysdeps/xtensa/Makefile.arch +++ b/libpthread/nptl/sysdeps/xtensa/Makefile.arch @@ -15,12 +15,11 @@ # License along with the GNU C Library; see the file COPYING.LIB. If # not, see http://www.gnu.org/licenses/.
-ASFLAGS-dl-tlsdesc.S = -DNOT_IN_libc=1
Why is it removed? It changes the way dl-tlsdesc.S is built for the ld.so, not for the libc. I'm not sure why it was needed at all if it builds identically both with and without it, but it's also not a part of this fix, right?
On 12/09/2016 01:10 PM, Max Filippov wrote:
Waldemar, Alexey,
On Wed, Dec 7, 2016 at 6:48 PM, Waldemar Brodkorb wbx@uclibc-ng.org wrote:
following patch was developed by crosstool-ng developer. Okay to commit?
I've got a couple questions:
diff --git a/libpthread/nptl/sysdeps/Makefile.commonarch b/libpthread/nptl/sysdeps/Makefile.commonarch index c206ac9..134eade 100644 --- a/libpthread/nptl/sysdeps/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/Makefile.commonarch @@ -32,10 +32,11 @@ libpthread_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libpthread_ar libpthread_arch_OBJS = $(libpthread_subarch_OBJS) $(libpthread_arch_COBJ) $(libpthread_arch_SOBJ)
libc_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_CSRC)) -libc_arch_SOBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC)) +libc_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC))
I see that there's a copy-paste-type error, but this change is not a part of this fix, right?
Yes, I mentioned that it's an unrelated copy-paste fix on IRC.
diff --git a/libpthread/nptl/sysdeps/xtensa/Makefile.arch b/libpthread/nptl/sysdeps/xtensa/Makefile.arch index 9e63b19..c26e197 100644 --- a/libpthread/nptl/sysdeps/xtensa/Makefile.arch +++ b/libpthread/nptl/sysdeps/xtensa/Makefile.arch @@ -15,12 +15,11 @@ # License along with the GNU C Library; see the file COPYING.LIB. If # not, see http://www.gnu.org/licenses/.
-ASFLAGS-dl-tlsdesc.S = -DNOT_IN_libc=1
Why is it removed? It changes the way dl-tlsdesc.S is built for the ld.so, not for the libc. I'm not sure why it was needed at all if it builds identically both with and without it, but it's also not a part of this fix, right?
Yes, now that it is included via a proxy file, libc-dl-tlsdesc.S, this flag indeed only applies to compiling the object for ld.so. I removed it when I first tried to compile it under dl-tlsdesc.S name - but that way, it also ended up in libc.so.0, where it wasn't needed [*].
This line can be restored. I updated the patch in crosstool-ng's PR.
Regards, Alexey.
On Fri, Dec 9, 2016 at 3:52 PM, Alexey Neyman stilor@att.net wrote:
On 12/09/2016 01:10 PM, Max Filippov wrote:
On Wed, Dec 7, 2016 at 6:48 PM, Waldemar Brodkorb wbx@uclibc-ng.org wrote:
following patch was developed by crosstool-ng developer. Okay to commit?
I've got a couple questions:
diff --git a/libpthread/nptl/sysdeps/Makefile.commonarch b/libpthread/nptl/sysdeps/Makefile.commonarch index c206ac9..134eade 100644 --- a/libpthread/nptl/sysdeps/Makefile.commonarch +++ b/libpthread/nptl/sysdeps/Makefile.commonarch @@ -32,10 +32,11 @@ libpthread_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libpthread_ar libpthread_arch_OBJS = $(libpthread_subarch_OBJS) $(libpthread_arch_COBJ) $(libpthread_arch_SOBJ)
libc_arch_COBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_CSRC)) -libc_arch_SOBJ = $(patsubst %.c,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC)) +libc_arch_SOBJ = $(patsubst %.S,$(libpthread_arch_OUT)/%.o,$(libc_arch_SSRC))
I see that there's a copy-paste-type error, but this change is not a part of this fix, right?
Yes, I mentioned that it's an unrelated copy-paste fix on IRC.
diff --git a/libpthread/nptl/sysdeps/xtensa/Makefile.arch b/libpthread/nptl/sysdeps/xtensa/Makefile.arch index 9e63b19..c26e197 100644 --- a/libpthread/nptl/sysdeps/xtensa/Makefile.arch +++ b/libpthread/nptl/sysdeps/xtensa/Makefile.arch @@ -15,12 +15,11 @@ # License along with the GNU C Library; see the file COPYING.LIB. If # not, see http://www.gnu.org/licenses/.
-ASFLAGS-dl-tlsdesc.S = -DNOT_IN_libc=1
Why is it removed? It changes the way dl-tlsdesc.S is built for the ld.so, not for the libc. I'm not sure why it was needed at all if it builds identically both with and without it, but it's also not a part of this fix, right?
Yes, now that it is included via a proxy file, libc-dl-tlsdesc.S, this flag indeed only applies to compiling the object for ld.so. I removed it when I first tried to compile it under dl-tlsdesc.S name - but that way, it also ended up in libc.so.0, where it wasn't needed [*].
This line can be restored. I updated the patch in crosstool-ng's PR.
Acked-by: Max Filippov jcmvbkbc@gmail.com
-
Alexey Neyman -
Max Filippov -
Waldemar Brodkorb