From 334fd4199b94bddd3b17eaa93668e9f04f004ee0 Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Sat, 28 Apr 2012 22:24:12 +0000 Subject: purge support for glibc - use eglibc instead! for reference: http://www.mail-archive.com/openwrt-devel@lists.openwrt.org/msg13425.html SVN-Revision: 31503 --- toolchain/glibc-ports/Makefile | 52 ---------------------- .../glibc-ports/patches/2.4/100-mips-fork.patch | 7 --- .../patches/2.6.1/101-arm_asm_page_h.patch | 13 ------ .../glibc-ports/patches/2.6.1/102-arm_nptl.patch | 13 ------ .../401-mips_bootstrap_gcc_header_install.patch | 11 ----- .../patches/2.6.1/603-powerpc-softfloat.patch | 21 --------- .../patches/2.7/101-arm_asm_page_h.patch | 13 ------ .../glibc-ports/patches/2.7/102-arm_nptl.patch | 13 ------ .../patches/2.7/103-arm_nptl_cargs6.patch | 15 ------- .../patches/2.7/104-arm_nptl_lowlevellock.patch | 13 ------ .../401-mips_bootstrap_gcc_header_install.patch | 11 ----- 11 files changed, 182 deletions(-) delete mode 100644 toolchain/glibc-ports/Makefile delete mode 100644 toolchain/glibc-ports/patches/2.4/100-mips-fork.patch delete mode 100644 toolchain/glibc-ports/patches/2.6.1/101-arm_asm_page_h.patch delete mode 100644 toolchain/glibc-ports/patches/2.6.1/102-arm_nptl.patch delete mode 100644 toolchain/glibc-ports/patches/2.6.1/401-mips_bootstrap_gcc_header_install.patch delete mode 100644 toolchain/glibc-ports/patches/2.6.1/603-powerpc-softfloat.patch delete mode 100644 toolchain/glibc-ports/patches/2.7/101-arm_asm_page_h.patch delete mode 100644 toolchain/glibc-ports/patches/2.7/102-arm_nptl.patch delete mode 100644 toolchain/glibc-ports/patches/2.7/103-arm_nptl_cargs6.patch delete mode 100644 toolchain/glibc-ports/patches/2.7/104-arm_nptl_lowlevellock.patch delete mode 100644 toolchain/glibc-ports/patches/2.7/401-mips_bootstrap_gcc_header_install.patch (limited to 'toolchain/glibc-ports') diff --git a/toolchain/glibc-ports/Makefile b/toolchain/glibc-ports/Makefile deleted file mode 100644 index c95709c..0000000 --- a/toolchain/glibc-ports/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2006-2009 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=glibc-ports -PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION)) - -ifeq ($(PKG_VERSION),2.3.6) - PKG_MD5SUM:=40dce745d34ff80401da2fdfe58f6d53 -endif -ifeq ($(PKG_VERSION),2.6.1) - PKG_MD5SUM:=53d88ca624642dd267752ccce77b19d0 -endif -ifeq ($(PKG_VERSION),2.7) - PKG_MD5SUM:=eaeb8527b8fa286c2d887157214f9998 -endif - -PKG_SOURCE_URL:=@GNU/glibc/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 - -PATCH_DIR:=./patches/$(PKG_VERSION) - -include $(INCLUDE_DIR)/toolchain-build.mk - -HOST_STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.glibc-ports_built -HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc-ports_installed - -define Host/Prepare -$(call Host/Prepare/Default) - ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) -endef - -define Host/Configure -endef - -define Host/Compile -endef - -define Host/Install -endef - -define Host/Clean - rm -rf \ - $(HOST_BUILD_DIR) \ - $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) -endef - -$(eval $(call HostBuild)) diff --git a/toolchain/glibc-ports/patches/2.4/100-mips-fork.patch b/toolchain/glibc-ports/patches/2.4/100-mips-fork.patch deleted file mode 100644 index 8d53f41..0000000 --- a/toolchain/glibc-ports/patches/2.4/100-mips-fork.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --exclude=.svn -pNur glibc-ports-2.4/sysdeps/unix/sysv/linux/mips/nptl/fork.c glibc-ports-2.4/sysdeps/unix/sysv/linux/mips/nptl/fork.c ---- glibc-ports-2.4/sysdeps/unix/sysv/linux/mips/nptl/fork.c 2009-02-09 15:13:14.996030533 +0100 -+++ glibc-ports-2.4/sysdeps/unix/sysv/linux/mips/nptl/fork.c 2009-02-09 15:13:34.402489340 +0100 -@@ -1 +1,2 @@ --#include "../i386/fork.c" -+#include -+ diff --git a/toolchain/glibc-ports/patches/2.6.1/101-arm_asm_page_h.patch b/toolchain/glibc-ports/patches/2.6.1/101-arm_asm_page_h.patch deleted file mode 100644 index 9279ccb..0000000 --- a/toolchain/glibc-ports/patches/2.6.1/101-arm_asm_page_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00014.html - -diff -durN glibc-ports-2.6.1.orig/sysdeps/unix/sysv/linux/arm/ioperm.c glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/ioperm.c ---- glibc-ports-2.6.1.orig/sysdeps/unix/sysv/linux/arm/ioperm.c 2005-06-10 13:12:09.000000000 +0200 -+++ glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/ioperm.c 2008-05-18 16:19:45.000000000 +0200 -@@ -45,7 +45,6 @@ - #include - - #include --#include - #include - - #define PATH_ARM_SYSTYPE "/etc/arm_systype" diff --git a/toolchain/glibc-ports/patches/2.6.1/102-arm_nptl.patch b/toolchain/glibc-ports/patches/2.6.1/102-arm_nptl.patch deleted file mode 100644 index 1207e79..0000000 --- a/toolchain/glibc-ports/patches/2.6.1/102-arm_nptl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -durN glibc-ports-2.6.1.orig/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h ---- glibc-ports-2.6.1.orig/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2005-11-16 20:22:59.000000000 +0100 -+++ glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-09-06 13:53:16.000000000 +0200 -@@ -132,3 +132,9 @@ - # define NO_CANCELLATION 1 - - #endif -+ -+#ifndef __ASSEMBLER__ -+# define RTLD_SINGLE_THREAD_P \ -+ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ -+ header.multiple_threads) == 0, 1) -+#endif diff --git a/toolchain/glibc-ports/patches/2.6.1/401-mips_bootstrap_gcc_header_install.patch b/toolchain/glibc-ports/patches/2.6.1/401-mips_bootstrap_gcc_header_install.patch deleted file mode 100644 index 0908974..0000000 --- a/toolchain/glibc-ports/patches/2.6.1/401-mips_bootstrap_gcc_header_install.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN glibc-ports-2.7-orig/sysdeps/mips/mips32/Makefile glibc-ports-2.7/sysdeps/mips/mips32/Makefile ---- glibc-ports-2.7-orig/ports/sysdeps/mips/mips32/Makefile 2003-03-29 09:15:28.000000000 +0100 -+++ glibc-ports-2.7/sysdeps/mips/mips32/Makefile 2008-10-01 17:04:40.475005748 +0200 -@@ -1,3 +1,7 @@ -+ifeq ($(filter -DBOOTSTRAP_GCC,$(CFLAGS)),) - ifeq ($(filter -mabi=32,$(CC)),) - CC += -mabi=32 - endif -+else -+CC += -D"_MIPS_SZPTR=32" -+endif diff --git a/toolchain/glibc-ports/patches/2.6.1/603-powerpc-softfloat.patch b/toolchain/glibc-ports/patches/2.6.1/603-powerpc-softfloat.patch deleted file mode 100644 index 3213c9a..0000000 --- a/toolchain/glibc-ports/patches/2.6.1/603-powerpc-softfloat.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: http://sourceware.org/ml/crossgcc/2008-10/msg00044.html -From: http://sources.redhat.com/ml/libc-ports/2007-06/msg00005.html - -2007-06-07 Steven Munroe - - * sysdeps/powerpc/nofpu/Makefile: Remove fe_nomask from libm-support. - -diff -urN glibc-ports-2.6.1.orig/sysdeps/powerpc/nofpu/Makefile glibc-ports-2.6.1/sysdeps/powerpc/nofpu/Makefile ---- glibc-ports-2.6.1.orig/sysdeps/powerpc/nofpu/Makefile 2006-11-22 09:13:11.000000000 -0600 -+++ glibc-ports-2.6.1/sysdeps/powerpc/nofpu/Makefile 2007-06-07 09:53:05.708240976 -0500 -@@ -6,7 +6,7 @@ - endif - - ifeq ($(subdir),math) --libm-support += fenv_const fe_nomask -+libm-support += fenv_const - CPPFLAGS += -I../soft-fp/ - # The follow CFLAGS are a work around for GCC Bugzilla Bug 29253 - # "expand_abs wrong default code for floating point" - - diff --git a/toolchain/glibc-ports/patches/2.7/101-arm_asm_page_h.patch b/toolchain/glibc-ports/patches/2.7/101-arm_asm_page_h.patch deleted file mode 100644 index 9279ccb..0000000 --- a/toolchain/glibc-ports/patches/2.7/101-arm_asm_page_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00014.html - -diff -durN glibc-ports-2.6.1.orig/sysdeps/unix/sysv/linux/arm/ioperm.c glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/ioperm.c ---- glibc-ports-2.6.1.orig/sysdeps/unix/sysv/linux/arm/ioperm.c 2005-06-10 13:12:09.000000000 +0200 -+++ glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/ioperm.c 2008-05-18 16:19:45.000000000 +0200 -@@ -45,7 +45,6 @@ - #include - - #include --#include - #include - - #define PATH_ARM_SYSTYPE "/etc/arm_systype" diff --git a/toolchain/glibc-ports/patches/2.7/102-arm_nptl.patch b/toolchain/glibc-ports/patches/2.7/102-arm_nptl.patch deleted file mode 100644 index 65836b6..0000000 --- a/toolchain/glibc-ports/patches/2.7/102-arm_nptl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -durN glibc-ports-2.6.1.orig/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h ---- glibc-ports-2.6.1.orig/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2005-11-16 20:22:59.000000000 +0100 -+++ glibc-ports-2.6.1/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-09-06 13:53:16.000000000 +0200 -@@ -126,3 +126,9 @@ - # define NO_CANCELLATION 1 - - #endif -+ -+#ifndef __ASSEMBLER__ -+# define RTLD_SINGLE_THREAD_P \ -+ __builtin_expect (THREAD_GETMEM (THREAD_SELF, \ -+ header.multiple_threads) == 0, 1) -+#endif diff --git a/toolchain/glibc-ports/patches/2.7/103-arm_nptl_cargs6.patch b/toolchain/glibc-ports/patches/2.7/103-arm_nptl_cargs6.patch deleted file mode 100644 index 8f36313..0000000 --- a/toolchain/glibc-ports/patches/2.7/103-arm_nptl_cargs6.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://sourceware.org/ml/libc-ports/2008-02/msg00005.html - -diff -durN glibc-ports-2.7.orig/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h ---- glibc-ports-2.7.orig/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2007-06-06 19:27:04.000000000 +0200 -+++ glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 2008-05-18 16:57:21.000000000 +0200 -@@ -73,6 +73,9 @@ - # define DOCARGS_5 DOCARGS_4 - # define UNDOCARGS_5 UNDOCARGS_4 - -+# define DOCARGS_6 DOCARGS_5 -+# define UNDOCARGS_6 UNDOCARGS_5 -+ - # ifdef IS_IN_libpthread - # define CENABLE bl PLTJMP(__pthread_enable_asynccancel) - # define CDISABLE bl PLTJMP(__pthread_disable_asynccancel) diff --git a/toolchain/glibc-ports/patches/2.7/104-arm_nptl_lowlevellock.patch b/toolchain/glibc-ports/patches/2.7/104-arm_nptl_lowlevellock.patch deleted file mode 100644 index 047f786..0000000 --- a/toolchain/glibc-ports/patches/2.7/104-arm_nptl_lowlevellock.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://www.nabble.com/arm-linux-compilation-failure-and-possible-fix-td19229074.html - -diff -durN glibc-ports-2.7.orig/sysdeps/unix/sysv/linux/arm/ioperm.c glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/ioperm.c ---- glibc-ports-2.7.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig 2008-10-04 20:46:13.000000000 +0200 -+++ glibc-ports-2.7/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h 2008-10-04 20:45:40.000000000 +0200 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #define FUTEX_WAIT 0 - #define FUTEX_WAKE 1 diff --git a/toolchain/glibc-ports/patches/2.7/401-mips_bootstrap_gcc_header_install.patch b/toolchain/glibc-ports/patches/2.7/401-mips_bootstrap_gcc_header_install.patch deleted file mode 100644 index 66f42e9..0000000 --- a/toolchain/glibc-ports/patches/2.7/401-mips_bootstrap_gcc_header_install.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN glibc-ports-2.7-orig/sysdeps/mips/mips32/Makefile glibc-ports-2.7/sysdeps/mips/mips32/Makefile ---- glibc-ports-2.7-orig/sysdeps/mips/mips32/Makefile 2003-03-29 09:15:28.000000000 +0100 -+++ glibc-ports-2.7/sysdeps/mips/mips32/Makefile 2008-10-01 17:04:40.475005748 +0200 -@@ -1,3 +1,7 @@ -+ifeq ($(filter -DBOOTSTRAP_GCC,$(CFLAGS)),) - ifeq ($(filter -mabi=32,$(CC)),) - CC += -mabi=32 - endif -+else -+CC += -D"_MIPS_SZPTR=32" -+endif -- cgit v1.1