From 714696cfac2e9b6c3a010275dfb9ee8b7f250fd7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 21 Aug 2014 22:11:35 +0200 Subject: fix m68k issues in uClibc git version --- ...ert-sparc-use-HIDDEN_JUMPTARGET-for-errno.patch | 4 +-- ...c-disable-cancellable-system-as-it-fails-.patch | 10 ++++---- .../0003-remove-unused-subdirs-variable.patch | 6 ++--- .../0004-sparc-testsuite-compile-fix.patch | 6 ++--- ...05-sync-WRITE_BUFFER_SIZE-with-glibc-test.patch | 6 ++--- .../0.9.34-git/0006-do-not-depend-on-compile.patch | 6 ++--- .../0007-disable-test-for-non-MMU-systems.patch | 30 ++++++++++++++++++++++ ...0008-disable-test-for-systems-without-FPU.patch | 30 ++++++++++++++++++++++ .../uclibc/patches/0.9.34-git/0009-fix-typo.patch | 28 ++++++++++++++++++++ 9 files changed, 107 insertions(+), 19 deletions(-) create mode 100644 toolchain/uclibc/patches/0.9.34-git/0007-disable-test-for-non-MMU-systems.patch create mode 100644 toolchain/uclibc/patches/0.9.34-git/0008-disable-test-for-systems-without-FPU.patch create mode 100644 toolchain/uclibc/patches/0.9.34-git/0009-fix-typo.patch (limited to 'toolchain/uclibc') diff --git a/toolchain/uclibc/patches/0.9.34-git/0001-Revert-sparc-use-HIDDEN_JUMPTARGET-for-errno.patch b/toolchain/uclibc/patches/0.9.34-git/0001-Revert-sparc-use-HIDDEN_JUMPTARGET-for-errno.patch index 6a918215e..097fa11ce 100644 --- a/toolchain/uclibc/patches/0.9.34-git/0001-Revert-sparc-use-HIDDEN_JUMPTARGET-for-errno.patch +++ b/toolchain/uclibc/patches/0.9.34-git/0001-Revert-sparc-use-HIDDEN_JUMPTARGET-for-errno.patch @@ -1,7 +1,7 @@ From 984be720d4ee1fc717d4de5e67a776419003c1c6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 20 Aug 2014 03:44:53 +0200 -Subject: [PATCH 1/6] Revert "sparc: use HIDDEN_JUMPTARGET for errno" +Subject: [PATCH 1/9] Revert "sparc: use HIDDEN_JUMPTARGET for errno" This reverts commit f51fb26dbcceee9e48d10facc830bd4a549f6cc2. @@ -14,7 +14,7 @@ Removing the HIDDEN_JUMPTARGET fixes the issue, while using gcc 4.8.3/binutils 2 The definition of __errno_location was changed recently here: http://git.uclibc.org/uClibc/commit/?id=8f550715c2b211036fc273add3cb5219397ed312 -Signed-off-by: Waldemar Brodkorb +Signed-off-by: Waldemar Brodkorb --- libc/sysdeps/linux/sparc/fork.S | 2 +- libc/sysdeps/linux/sparc/pipe.S | 2 +- diff --git a/toolchain/uclibc/patches/0.9.34-git/0002-Revert-sparc-disable-cancellable-system-as-it-fails-.patch b/toolchain/uclibc/patches/0.9.34-git/0002-Revert-sparc-disable-cancellable-system-as-it-fails-.patch index 13de28075..0198c37dc 100644 --- a/toolchain/uclibc/patches/0.9.34-git/0002-Revert-sparc-disable-cancellable-system-as-it-fails-.patch +++ b/toolchain/uclibc/patches/0.9.34-git/0002-Revert-sparc-disable-cancellable-system-as-it-fails-.patch @@ -1,17 +1,17 @@ -From f152a782555667b9f763c896064e54168bb4ff1f Mon Sep 17 00:00:00 2001 +From 3422668d945229f9f707aafe24491b5d3e8d7636 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 20 Aug 2014 04:02:49 +0200 -Subject: [PATCH 2/6] Revert "sparc: disable cancellable system, as it fails in +Subject: [PATCH 2/9] Revert "sparc: disable cancellable system, as it fails in strange ways right now" This reverts commit 1db4f8f8389f6a935ecd83aff7fcce5d1cf2c0f3. -It is unclear how this is breaking sparc. -With this changed added you get following linking error: +It is unclear in which way this is breaking sparc systems. +With this change added you get following linking error: libpthread/nptl/libpthread_so.a(pt-system.oS): In function `__libc_system': libc/stdlib/system.c:64: undefined reference to `__wait4_nocancel' -Signed-off-by: Waldemar Brodkorb +Signed-off-by: Waldemar Brodkorb --- libc/stdlib/system.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/toolchain/uclibc/patches/0.9.34-git/0003-remove-unused-subdirs-variable.patch b/toolchain/uclibc/patches/0.9.34-git/0003-remove-unused-subdirs-variable.patch index fc6c1f0eb..1526bcf0d 100644 --- a/toolchain/uclibc/patches/0.9.34-git/0003-remove-unused-subdirs-variable.patch +++ b/toolchain/uclibc/patches/0.9.34-git/0003-remove-unused-subdirs-variable.patch @@ -1,12 +1,12 @@ -From adf9777c0859e6a59bdcdb92031b0e9d7fcb70c8 Mon Sep 17 00:00:00 2001 +From f24c9f0a1ae6367c9bd512e49b17e9705b4e1561 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 20 Aug 2014 04:31:35 +0200 -Subject: [PATCH 3/6] remove unused subdirs variable +Subject: [PATCH 3/9] remove unused subdirs variable For sparc TARGET_SUBARCH is never used. And there is a typo in the path. -Signed-off-by: Waldemar Brodkorb +Signed-off-by: Waldemar Brodkorb --- libpthread/nptl/sysdeps/sparc/Makefile.arch | 3 --- 1 file changed, 3 deletions(-) diff --git a/toolchain/uclibc/patches/0.9.34-git/0004-sparc-testsuite-compile-fix.patch b/toolchain/uclibc/patches/0.9.34-git/0004-sparc-testsuite-compile-fix.patch index c7d57d3f2..9d4cc3732 100644 --- a/toolchain/uclibc/patches/0.9.34-git/0004-sparc-testsuite-compile-fix.patch +++ b/toolchain/uclibc/patches/0.9.34-git/0004-sparc-testsuite-compile-fix.patch @@ -1,7 +1,7 @@ -From a7695a072fbe3a5449f3ecb493f15f9cf10e18ca Mon Sep 17 00:00:00 2001 +From 939bd5baadb18f56235c3bf9a2fa08e30e8d336a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 20 Aug 2014 04:39:04 +0200 -Subject: [PATCH 4/6] sparc testsuite compile fix +Subject: [PATCH 4/9] sparc testsuite compile fix tst-spin1.c compile breaks with: test/nptl/tst-spin1.c:34: undefined reference to `pthread_spin_lock' @@ -9,7 +9,7 @@ test/nptl/tst-spin1.c:34: undefined reference to `pthread_spin_lock' pthread_spin_lock and pthread_spin_trylock is missing while building sparc. add the meta c files here. -Signed-off-by: Waldemar Brodkorb +Signed-off-by: Waldemar Brodkorb --- libpthread/nptl/sysdeps/sparc/pthread_spin_lock.c | 5 +++++ libpthread/nptl/sysdeps/sparc/pthread_spin_trylock.c | 5 +++++ diff --git a/toolchain/uclibc/patches/0.9.34-git/0005-sync-WRITE_BUFFER_SIZE-with-glibc-test.patch b/toolchain/uclibc/patches/0.9.34-git/0005-sync-WRITE_BUFFER_SIZE-with-glibc-test.patch index 5a9d1b130..eb6bca350 100644 --- a/toolchain/uclibc/patches/0.9.34-git/0005-sync-WRITE_BUFFER_SIZE-with-glibc-test.patch +++ b/toolchain/uclibc/patches/0.9.34-git/0005-sync-WRITE_BUFFER_SIZE-with-glibc-test.patch @@ -1,7 +1,7 @@ -From 8a70d40078cbfd5263d3e417ad6912783fdd5aa8 Mon Sep 17 00:00:00 2001 +From 642cf06b4c07658b78fb6029648edc14fcd0075a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 20 Aug 2014 20:29:08 +0200 -Subject: [PATCH 5/6] sync WRITE_BUFFER_SIZE with glibc test +Subject: [PATCH 5/9] sync WRITE_BUFFER_SIZE with glibc test Test on Linux 3.16.1 in Qemu ARM fails with: TEST_EXEC nptl/ tst-cancel4 @@ -11,7 +11,7 @@ The output of failed test is: minimum write buffer size too large ../Test.mak:89: recipe for target 'tst-cancel4.exe' failed -Signed-off-by: Waldemar Brodkorb +Signed-off-by: Waldemar Brodkorb --- test/nptl/tst-cancel4.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/toolchain/uclibc/patches/0.9.34-git/0006-do-not-depend-on-compile.patch b/toolchain/uclibc/patches/0.9.34-git/0006-do-not-depend-on-compile.patch index 4abda2a61..5c338f845 100644 --- a/toolchain/uclibc/patches/0.9.34-git/0006-do-not-depend-on-compile.patch +++ b/toolchain/uclibc/patches/0.9.34-git/0006-do-not-depend-on-compile.patch @@ -1,13 +1,13 @@ -From 57bf7df9baa14152357e67ef0db23b817d083dbf Mon Sep 17 00:00:00 2001 +From 19d6be8095e87682b04a9fb69ee8f6fd37e16a50 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 20 Aug 2014 20:32:38 +0200 -Subject: [PATCH 6/6] do not depend on compile +Subject: [PATCH 6/9] do not depend on compile When you cross-compile the testsuite and then try to run on a system without gcc/binutils it would be nice if no compiling or linking is tried. -Signed-off-by: Waldemar Brodkorb +Signed-off-by: Waldemar Brodkorb --- test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/uclibc/patches/0.9.34-git/0007-disable-test-for-non-MMU-systems.patch b/toolchain/uclibc/patches/0.9.34-git/0007-disable-test-for-non-MMU-systems.patch new file mode 100644 index 000000000..b21cffbd3 --- /dev/null +++ b/toolchain/uclibc/patches/0.9.34-git/0007-disable-test-for-non-MMU-systems.patch @@ -0,0 +1,30 @@ +From 325f778f3bbb1b13c436e7754dd22097d31c04d2 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Thu, 21 Aug 2014 22:02:26 +0200 +Subject: [PATCH 7/9] disable test for non-MMU systems + +This test fails for non-MMU systems, because it uses fork() + +Signed-off-by: Waldemar Brodkorb +--- + test/Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/test/Makefile b/test/Makefile +index 787c530..d51bb62 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -42,6 +42,10 @@ endif + ifeq ($(HAS_NO_THREADS),y) + DIRS := $(filter-out pthread,$(DIRS)) + endif ++# librt test needs fork() ++ifneq ($(ARCH_USE_MMU),y) ++ DIRS := $(filter-out librt,$(DIRS)) ++endif + + test check all: run + +-- +1.8.5.2 (Apple Git-48) + diff --git a/toolchain/uclibc/patches/0.9.34-git/0008-disable-test-for-systems-without-FPU.patch b/toolchain/uclibc/patches/0.9.34-git/0008-disable-test-for-systems-without-FPU.patch new file mode 100644 index 000000000..bf29909ef --- /dev/null +++ b/toolchain/uclibc/patches/0.9.34-git/0008-disable-test-for-systems-without-FPU.patch @@ -0,0 +1,30 @@ +From 012dfda4b27ad92edb6a9ea14e5ce4c5567d1c91 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Thu, 21 Aug 2014 22:04:59 +0200 +Subject: [PATCH 8/9] disable test for systems without FPU + +This test fails for systems without fpu. +For example m68k build for non-mmu/non-fpu systems fail. + +Signed-off-by: Waldemar Brodkorb +--- + test/math/Makefile.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/test/math/Makefile.in b/test/math/Makefile.in +index d241baa..147d579 100644 +--- a/test/math/Makefile.in ++++ b/test/math/Makefile.in +@@ -13,6 +13,9 @@ endif + ifeq ($(DO_C99_MATH),) + TESTS_DISABLED += test-float test-ifloat test-double test-idouble rint signgam ilogb + endif ++ifeq ($(UCLIBC_HAS_FPU),) ++TESTS_DISABLED += test-fpucw ++endif + + DODIFF_rint := 1 + DODIFF_signgam := 1 +-- +1.8.5.2 (Apple Git-48) + diff --git a/toolchain/uclibc/patches/0.9.34-git/0009-fix-typo.patch b/toolchain/uclibc/patches/0.9.34-git/0009-fix-typo.patch new file mode 100644 index 000000000..bf6a51850 --- /dev/null +++ b/toolchain/uclibc/patches/0.9.34-git/0009-fix-typo.patch @@ -0,0 +1,28 @@ +From 0b6a99fbbb11287ca5c3ce71ef13689e72d2b79e Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Thu, 21 Aug 2014 22:08:43 +0200 +Subject: [PATCH 9/9] fix typo + +otherwise you get compile warnings, when building for m68k. + +Signed-off-by: Waldemar Brodkorb +--- + libc/sysdeps/linux/m68k/bits/huge_vall.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libc/sysdeps/linux/m68k/bits/huge_vall.h b/libc/sysdeps/linux/m68k/bits/huge_vall.h +index c44b64d..674b46d 100644 +--- a/libc/sysdeps/linux/m68k/bits/huge_vall.h ++++ b/libc/sysdeps/linux/m68k/bits/huge_vall.h +@@ -26,7 +26,7 @@ + # define HUGE_VALL (__builtin_huge_vall ()) + #elif __GNUC_PREREQ(2,96) + # define HUGE_VALL (__extension__ 0x1.0p32767L) +-#elif defined__GNUC__ ++#elif defined __GNUC__ + + # define HUGE_VALL \ + (__extension__ \ +-- +1.8.5.2 (Apple Git-48) + -- cgit v1.2.3