diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-01 21:46:36 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-01 21:46:36 +0200 |
| commit | 8f174fcc34b924fa28eb71dc1e34ba1c0d278662 (patch) | |
| tree | fe7f0b268d12b57cb78f77ade380fdf6666e9468 /toolchain | |
| parent | ea41415863c0d1cf7526b176766d6562b6a13a1e (diff) | |
| parent | 7f156ad1610b0673634198f3fb0adf3d6c4f5b4b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 6 | ||||
| -rw-r--r-- | toolchain/uclibc/Makefile | 12 | ||||
| -rw-r--r-- | toolchain/uclibc/patches/0.9.34-git/0007-enable-cancellation-stuff-for-libc_a.patch | 11 |
3 files changed, 16 insertions, 13 deletions
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 0ec028126..3a5e903fd 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -39,12 +39,6 @@ ifeq ($(ADK_TARGET_USE_GNU_HASHSTYLE),y) else $(SED) 's/.*\(LDSO_GNU_HASH_SUPPORT\).*/# \1 is not set/' ${WRKBUILD}/.config endif -ifneq ($(ADK_PACKAGE_GDB),) - $(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config -endif -ifneq ($(ADK_PACKAGE_GDBSERVER),) - $(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config -endif ifeq ($(ADK_TARGET_USE_SSP),y) $(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config diff --git a/toolchain/uclibc/Makefile b/toolchain/uclibc/Makefile index 760bbdebe..759db985e 100644 --- a/toolchain/uclibc/Makefile +++ b/toolchain/uclibc/Makefile @@ -30,6 +30,10 @@ else $(SED) 's/.*\(ARCH_LITTLE_ENDIAN\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(ARCH_WANTS_LITTLE_ENDIAN\).*/# \1 is not set/' ${WRKBUILD}/.config endif +ifeq ($(ADK_TARGET_UCLINUX),y) + $(SED) 's/.*\(UCLIBC_FORMAT_FLAT_SEP_DATA\).*/\1=y/' ${WRKBUILD}/.config + $(SED) 's/.*\(ARCH_USE_MMU\).*/# \1 is not set/' ${WRKBUILD}/.config +endif ifeq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),) $(SED) 's/.*\(HAVE_SHARED\).*/\1=y/' ${WRKBUILD}/.config else @@ -40,12 +44,6 @@ ifeq ($(ADK_TARGET_USE_GNU_HASHSTYLE),y) else $(SED) 's/.*\(LDSO_GNU_HASH_SUPPORT\).*/# \1 is not set/' ${WRKBUILD}/.config endif -ifneq ($(ADK_PACKAGE_GDB),) - $(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config -endif -ifneq ($(ADK_PACKAGE_GDBSERVER),) - $(SED) "s/.*\(PTHREADS_DEBUG_SUPPORT\).*/\1=y/" ${WRKBUILD}/.config -endif ifeq ($(ADK_TARGET_USE_SSP),y) $(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config @@ -154,7 +152,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers $(WRKBUILD)/.fixup: ifeq ($(ADK_UCLIBC_TEST),y) - PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ + PATH='$(HOST_PATH)' $(MAKE) ${UCLIBC_MAKEOPTS} -C $(WRKBUILD) \ TEST_INSTALLED_UCLIBC=1 \ UCLIBC_ONLY=1 \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ diff --git a/toolchain/uclibc/patches/0.9.34-git/0007-enable-cancellation-stuff-for-libc_a.patch b/toolchain/uclibc/patches/0.9.34-git/0007-enable-cancellation-stuff-for-libc_a.patch new file mode 100644 index 000000000..92b532b63 --- /dev/null +++ b/toolchain/uclibc/patches/0.9.34-git/0007-enable-cancellation-stuff-for-libc_a.patch @@ -0,0 +1,11 @@ +--- a/libpthread/linuxthreads/Makefile.in.orig 2014-09-27 23:26:40.000000000 +0200 ++++ b/libpthread/linuxthreads/Makefile.in 2014-09-27 23:27:12.000000000 +0200 +@@ -65,7 +65,7 @@ CFLAGS-OMIT-libc_pthread_init.c := $(CFL + libpthread_libc_CSRC := \ + forward.c libc-cancellation.c libc_pthread_init.c # alloca_cutoff.c + libpthread_libc_OBJ := $(patsubst %.c, $(libpthread_OUT)/%.o,$(libpthread_libc_CSRC)) +-libc-static-y += $(libpthread_OUT)/libc_pthread_init.o ++libc-static-y += $(libpthread_OUT)/libc_pthread_init.o $(libpthread_OUT)/libc-cancellation.o + libc-shared-y += $(libpthread_libc_OBJ:.o=.oS) + + libpthread-static-y += $(patsubst %,$(libpthread_OUT)/%.o,$(libpthread_static_SRC)) |