summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-24 20:11:16 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-24 20:11:16 +0200
commitf3e84309257b915cb8820917a8dd5578f02fe974 (patch)
treef3549b877c058c562bf01fc30a8acf23626f2e31
parent83a08921a2f21d95822ca2a8da37f1e2f85ea717 (diff)
patches and update for gcc 4.4.0 allmodconfig
* update gcc to 4.4.0 * update gnutls and ruby * fix c++ issues for some packages
-rw-r--r--mk/vars.mk2
-rw-r--r--package/Config.in2
-rw-r--r--package/Depends.mk6
-rw-r--r--package/gnutls/Config.in18
-rw-r--r--package/gnutls/Makefile21
-rw-r--r--package/iperf/Config.in17
-rw-r--r--package/iperf/Makefile7
-rw-r--r--package/iptraf/Makefile2
-rw-r--r--package/iptraf/patches/patch-src_landesc_c33
-rw-r--r--package/iptraf/patches/patch-src_log_c20
-rw-r--r--package/iptraf/patches/patch-src_othptab_c23
-rw-r--r--package/iptraf/patches/patch-src_packet_c11
-rw-r--r--package/iptraf/patches/patch-src_tcptable_c37
-rw-r--r--package/iptraf/patches/patch-src_tcptable_h22
-rw-r--r--package/iw/Makefile5
-rw-r--r--package/libnids/patches/no_asm_for_i386.patch12
-rw-r--r--package/mrd6/Config.in18
-rw-r--r--package/mrd6/Makefile12
-rw-r--r--package/mrd6/patches/patch-src_Makefile23
-rw-r--r--package/ruby/Makefile17
-rw-r--r--package/ruby/patches/100-makefile-in.patch11
-rw-r--r--package/ruby/patches/patch-lib_fileutils_rb12
-rw-r--r--target/linux/config/Config.in.netdevice8
-rw-r--r--target/linux/patches/mips-gcc-44.patch215
-rw-r--r--target/qemu-mips/device.mk2
-rw-r--r--target/qemu-mips/kernel.config61
-rw-r--r--toolchain/gcc/Makefile.inc4
-rw-r--r--toolchain/gcc/patches/arm-softfloat-libgcc.patch29
28 files changed, 520 insertions, 130 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index 93f40be23..4fc11b22b 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -104,7 +104,7 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \
*.tar.bz2 | *.tbz | *.tbz2) \
bzip2 -dc $$file | tar -xf - ;; \
*.zip) \
- unzip -d ${WRKDIR} $$file ;; \
+ unzip -qd ${WRKDIR} $$file ;; \
*) \
echo "Cannot extract '$$file'" >&2; \
false ;; \
diff --git a/package/Config.in b/package/Config.in
index 2f2dad1ec..450ecaf00 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -340,7 +340,7 @@ source "package/aircrack-ng/Config.in"
source "package/chillispot/Config.in"
source "package/hostapd/Config.in"
source "package/iw/Config.in"
-source "package/kismet/Config.in"
+#source "package/kismet/Config.in"
source "package/nocatsplash/Config.in"
source "package/olsrd/Config.in"
source "package/snort-wireless/Config.in"
diff --git a/package/Depends.mk b/package/Depends.mk
index 70650cccc..6d30f7320 100644
--- a/package/Depends.mk
+++ b/package/Depends.mk
@@ -100,12 +100,14 @@ libshout-compile: libvorbis-compile
libtorrent-compile: openssl-compile libsigc++-compile
libvorbis-compile: libogg-compile
libfontenc-compile: xproto-compile zlib-compile
+libICE-compile: xtrans-compile
libSM-compile: libICE-compile
libXt-compile: libSM-compile
libXmu-compile: libXt-compile
+libXext-compile: libX11-compile
libXaw-compile: libXext-compile libXmu-compile libXpm-compile
libX11-compile: xproto-compile xextproto-compile xtrans-compile libXdmcp-compile \
- libXau-compile libXaw-compile xcmiscproto-compile bigreqsproto-compile kbproto-compile \
+ libXau-compile xcmiscproto-compile bigreqsproto-compile kbproto-compile \
inputproto-compile
libXfont-compile: freetype-compile fontcacheproto-compile fontsproto-compile libfontenc-compile
libxml2-compile: zlib-compile
@@ -132,7 +134,7 @@ endif
mt-daapd-compile: libgdbm-compile libid3tag-compile
mtr-compile: ncurses-compile
mutt-compile: ncurses-compile openssl-compile
-mysql-compile: ncurses-compile zlib-compile
+mysql-compile: ncurses-compile zlib-compile readline-compile
nano-compile: ncurses-compile
neon-compile: libpthread-compile libxml2-compile openssl-compile zlib-compile
net-snmp-compile: libelf-compile
diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in
index cfc6ed4f0..ffe1125b0 100644
--- a/package/gnutls/Config.in
+++ b/package/gnutls/Config.in
@@ -82,6 +82,24 @@ config ADK_PACKAGE_LIBGNUTLSXX
This packages contains the GnuTLS C++ shared library.
+choice
+prompt "C++ library to use"
+depends on ADK_PACKAGE_LIBGNUTLSXX
+default ADK_COMPILE_GNUTLS_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_GNUTLS_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
+
+config ADK_COMPILE_GNUTLS_WITH_STDCXX
+ bool "Standard C++ library"
+ select ADK_PACKAGE_LIBSTDCXX
+ help
+
+config ADK_COMPILE_GNUTLS_WITH_UCLIBCXX
+ bool "Embedded uClibc++ library"
+ select ADK_PACKAGE_UCLIBCXX
+ help
+
+endchoice
+
config ADK_PACKAGE_GNUTLS_UTILS
prompt "gnutls-utils...................... The GNU TLS utilities"
tristate
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 1a46a3b3a..6e04ee823 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -6,9 +6,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= gnutls
-PKG_VERSION:= 2.6.2
+PKG_VERSION:= 2.6.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= f42e7342cf9c12755577d207fffa9713
+PKG_MD5SUM:= ca2489e29f9dc313a79b9747bb1090e5
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
MASTER_SITES:= ${MASTER_SITE_GNU:=gnutls/}
@@ -18,7 +18,15 @@ $(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${A
$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,LIBGNUTLSXX,libgnutlsxx,${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPENDS}))
+
+ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y)
+TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
+TLDFLAGS+= -nodefaultlibs -luClibc++
+PKG_DEPENDS:= uclibc++
+else
+PKG_DEPENDS:= libstdcxx
+endif
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-libopencdk-prefix \
@@ -26,6 +34,13 @@ CONFIGURE_ARGS+= --without-libopencdk-prefix \
BUILD_STYLE= auto
INSTALL_STYLE= auto
+ifeq (${ADK_COMPILE_GNUTLS_WITH_UCLIBCXX},y)
+# add workaround because libtool tries to link libstdc++
+post-configure:
+ ${SED} 's#postdeps="-lstdc.*#postdeps="-lm"#' \
+ ${WRKBUILD}/libtool
+endif
+
post-install:
${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib
${CP} ${WRKINST}/usr/lib/libgnutls.so.* ${IDIR_LIBGNUTLS}/usr/lib
diff --git a/package/iperf/Config.in b/package/iperf/Config.in
index c498a5b16..bdfee6913 100644
--- a/package/iperf/Config.in
+++ b/package/iperf/Config.in
@@ -11,3 +11,20 @@ config ADK_PACKAGE_IPERF
http://dast.nlanr.net/Projects/Iperf/
+choice
+prompt "C++ library to use"
+depends on ADK_PACKAGE_IPERF
+default ADK_COMPILE_IPERF_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_IPERF_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
+
+config ADK_COMPILE_IPERF_WITH_STDCXX
+ bool "Standard C++ library"
+ select ADK_PACKAGE_LIBSTDCXX
+ help
+
+config ADK_COMPILE_IPERF_WITH_UCLIBCXX
+ bool "Embedded uClibc++ library"
+ select ADK_PACKAGE_UCLIBCXX
+ help
+
+endchoice
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 358e54724..411614d41 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -16,14 +16,15 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \
- LIBS="-lc -lm -lgcc_s -lpthread"
BUILD_STYLE= auto
INSTALL_STYLE= auto
-ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
+
+ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y)
TCXXFLAGS+= -fno-builtin -fno-rtti -nostdinc++
TLDFLAGS+= -nodefaultlibs
CONFIGURE_ENV+= LIBS="-luClibc++ -lc -lm -lgcc_s -lpthread"
+else
+CONFIGURE_ENV+= LIBS="-lc -lm -lgcc_s -lpthread"
endif
post-install:
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile
index 3ee0796a8..10d90f097 100644
--- a/package/iptraf/Makefile
+++ b/package/iptraf/Makefile
@@ -21,7 +21,7 @@ do-build:
${TARGET_CONFIGURE_OPTS} \
CFLAGS="${TARGET_CFLAGS}" \
DEBUG="" \
- INCLUDEDIR="-I../support -I${STAGING_DIR}/usr/include -I${STAGING_DIR}/include" \
+ INCLUDEDIR="-I../support -I${STAGING_DIR}/usr/include" \
LDOPTS="-L${STAGING_DIR}/usr/lib -L${STAGING_DIR}/lib" \
PLATFORM="-DPLATFORM=\\\"Linux/${ARCH}\\\"" \
TARGET="/usr/bin" \
diff --git a/package/iptraf/patches/patch-src_landesc_c b/package/iptraf/patches/patch-src_landesc_c
index 8cbdd6be0..3af440685 100644
--- a/package/iptraf/patches/patch-src_landesc_c
+++ b/package/iptraf/patches/patch-src_landesc_c
@@ -1,7 +1,12 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- iptraf-3.0.0.orig/src/landesc.c 2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/landesc.c 2008-10-09 17:34:11.000000000 +0200
-@@ -83,8 +83,6 @@ void loaddesclist(struct desclist *list,
++++ iptraf-3.0.0/src/landesc.c 2009-05-21 23:01:53.000000000 +0200
+@@ -79,12 +79,10 @@ void loaddesclist(struct desclist *list,
+ char etherline[140];
+ int i, j; /* counters used when parsing /etc/ethers */
+
+- bzero(list, sizeof(struct desclist));
++ memset(list, 0, sizeof(struct desclist));
if (linktype == LINK_ETHERNET)
fd = fopen(ETHFILE, "r");
@@ -10,6 +15,30 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
if (fd == NULL) {
return;
+@@ -95,8 +93,8 @@ void loaddesclist(struct desclist *list,
+ printnomem();
+ return;
+ }
+- bzero(ptmp, sizeof(struct desclistent));
+- bzero(descline, 140);
++ memset(ptmp, 0, sizeof(struct desclistent));
++ memset(descline, 0, 140);
+ fgets(descline, 140, fd);
+
+ if (strcmp(descline, "") == 0) {
+@@ -145,9 +143,9 @@ void loaddesclist(struct desclist *list,
+ printnomem();
+ return;
+ }
+- bzero(ptmp, sizeof(struct desclistent));
+- bzero(descline, 140);
+- bzero(etherline, 140);
++ memset(ptmp, 0, sizeof(struct desclistent));
++ memset(descline, 0, 140);
++ memset(etherline, 0, 140);
+ fgets(etherline, 140, fd);
+
+ /*
@@ -205,8 +203,6 @@ void savedesclist(struct desclist *list,
if (linktype == LINK_ETHERNET)
diff --git a/package/iptraf/patches/patch-src_log_c b/package/iptraf/patches/patch-src_log_c
index 59786fcee..87e454f07 100644
--- a/package/iptraf/patches/patch-src_log_c
+++ b/package/iptraf/patches/patch-src_log_c
@@ -1,6 +1,24 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- iptraf-3.0.0.orig/src/log.c 2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/log.c 2008-10-09 17:34:11.000000000 +0200
++++ iptraf-3.0.0/src/log.c 2009-05-21 23:02:34.000000000 +0200
+@@ -125,7 +125,7 @@ void opentlog(FILE ** fd, char *logfilen
+
+ void genatime(time_t now, char *atime)
+ {
+- bzero(atime, TIME_TARGET_MAX);
++ memset(atime, 0, TIME_TARGET_MAX);
+ strncpy(atime, ctime(&now), 26);
+ atime[strlen(atime) - 1] = '\0';
+ }
+@@ -204,7 +204,7 @@ void writeothplog(int logging, FILE * fd
+ char scratchpad[MSGSTRING_MAX];
+
+ if (logging) {
+- bzero(msgbuffer, MSGSTRING_MAX);
++ memset(msgbuffer, 0, MSGSTRING_MAX);
+
+ strcpy(msgbuffer, protname);
+ strcat(msgbuffer, "; ");
@@ -491,8 +491,6 @@ void writeethlog(struct ethtabent *list,
ptmp->un.desc.ascaddr);
else if (ptmp->un.desc.linktype == LINK_PLIP)
diff --git a/package/iptraf/patches/patch-src_othptab_c b/package/iptraf/patches/patch-src_othptab_c
index 5474c21c1..e6b0a9829 100644
--- a/package/iptraf/patches/patch-src_othptab_c
+++ b/package/iptraf/patches/patch-src_othptab_c
@@ -1,14 +1,31 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- iptraf-3.0.0.orig/src/othptab.c 2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/othptab.c 2008-10-09 17:34:11.000000000 +0200
-@@ -19,7 +19,6 @@ details.
++++ iptraf-3.0.0/src/othptab.c 2009-05-21 23:02:50.000000000 +0200
+@@ -17,13 +17,12 @@ details.
+ ***/
+
#include <asm/types.h>
++#include "options.h"
++#include "tcptable.h"
#include <linux/if_ether.h>
#include <linux/if_tr.h>
-#include <linux/if_fddi.h>
#include <winops.h>
#include "arphdr.h"
- #include "options.h"
+-#include "options.h"
+-#include "tcptable.h"
+ #include "othptab.h"
+ #include "deskman.h"
+ #include "attrs.h"
+@@ -128,7 +127,7 @@ struct othptabent *add_othp_entry(struct
+ *nomem = 1;
+ return NULL;
+ }
+- bzero(new_entry, sizeof(struct othptabent));
++ memset(new_entry, 0, sizeof(struct othptabent));
+
+ new_entry->is_ip = is_ip;
+ new_entry->fragment = fragment;
@@ -139,11 +138,6 @@ struct othptabent *add_othp_entry(struct
new_entry->smacaddr);
convmacaddr(((struct ethhdr *) packet)->h_dest,
diff --git a/package/iptraf/patches/patch-src_packet_c b/package/iptraf/patches/patch-src_packet_c
index c5669deca..1bc9b5964 100644
--- a/package/iptraf/patches/patch-src_packet_c
+++ b/package/iptraf/patches/patch-src_packet_c
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- iptraf-3.0.0.orig/src/packet.c 2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/packet.c 2008-10-09 17:34:11.000000000 +0200
++++ iptraf-3.0.0/src/packet.c 2009-05-21 23:03:57.000000000 +0200
@@ -35,7 +35,6 @@ details.
#include <sys/ioctl.h>
#include <linux/if_packet.h>
@@ -48,3 +48,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
case LINK_TR:
/*
* Token Ring patch supplied by Tomas Dvorak
+@@ -337,7 +318,7 @@ int processpacket(char *tpacket, char **
+ * Prepare ISDN reference descriptor and table.
+ */
+
+- bzero(&isdntable, sizeof(struct isdntab));
++ memset(&isdntable, 0, sizeof(struct isdntab));
+ isdn_iface_check(&isdnfd, ifname);
+
+ /*
diff --git a/package/iptraf/patches/patch-src_tcptable_c b/package/iptraf/patches/patch-src_tcptable_c
index 83ba44ff3..6ac96e6d1 100644
--- a/package/iptraf/patches/patch-src_tcptable_c
+++ b/package/iptraf/patches/patch-src_tcptable_c
@@ -1,7 +1,40 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- iptraf-3.0.0.orig/src/tcptable.c 2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/tcptable.c 2008-10-09 17:34:11.000000000 +0200
-@@ -600,8 +600,6 @@ void updateentry(struct tcptable *table,
++++ iptraf-3.0.0/src/tcptable.c 2009-05-21 23:07:02.000000000 +0200
+@@ -17,6 +17,7 @@ details.
+
+ ***/
+
++#include <stdlib.h>
+ #include <winops.h>
+ #include "options.h"
+ #include "tcptable.h"
+@@ -143,7 +144,7 @@ int add_tcp_hash_entry(struct tcptable *
+ entry->daddr.s_addr, entry->dport, entry->ifname);
+
+ ptmp = malloc(sizeof(struct tcp_hashentry));
+- bzero(ptmp, sizeof(struct tcp_hashentry));
++ memset(ptmp, 0, sizeof(struct tcp_hashentry));
+
+ if (ptmp == NULL)
+ return 1;
+@@ -337,8 +338,8 @@ struct tcptableent *addentry(struct tcpt
+ * Zero out MAC address fields
+ */
+
+- bzero(new_entry->smacaddr, 15);
+- bzero(new_entry->oth_connection->smacaddr, 15);
++ memset(new_entry->smacaddr, 0, 15);
++ memset(new_entry->oth_connection->smacaddr, 0, 15);
+
+ /*
+ * Set raw port numbers
+@@ -596,12 +597,10 @@ void updateentry(struct tcptable *table,
+ tableentry->spanbr += bcount;
+
+ if (opts->mac) {
+- bzero(newmacaddr, 15);
++ memset(newmacaddr, 0, 15);
if ((linkproto == LINK_ETHERNET) || (linkproto == LINK_PLIP)) {
convmacaddr(((struct ethhdr *) packet)->h_source, newmacaddr);
diff --git a/package/iptraf/patches/patch-src_tcptable_h b/package/iptraf/patches/patch-src_tcptable_h
index fa3d66618..a20d69969 100644
--- a/package/iptraf/patches/patch-src_tcptable_h
+++ b/package/iptraf/patches/patch-src_tcptable_h
@@ -1,8 +1,24 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- iptraf-3.0.0.orig/src/tcptable.h 2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/tcptable.h 2008-10-09 17:34:11.000000000 +0200
-@@ -22,7 +22,6 @@
- #include <asm/types.h>
++++ iptraf-3.0.0/src/tcptable.h 2009-05-21 22:49:05.000000000 +0200
+@@ -6,7 +6,6 @@
+
+ ***/
+
+-#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -14,15 +13,12 @@
+ #include <panel.h>
+ #include <netdb.h>
+ #include <time.h>
+-#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <net/if_arp.h>
+-#include <asm/types.h>
#include <linux/if_packet.h>
#include <linux/if_ether.h>
-#include <linux/if_fddi.h>
diff --git a/package/iw/Makefile b/package/iw/Makefile
index 997abebfc..1aaa7d156 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -6,9 +6,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= iw
-PKG_VERSION:= 0.9.13
+PKG_VERSION:= 0.9.14
PKG_RELEASE:= 1
-PKG_MD5SUM:= cf9121abb4ffe6dce1691e2ec97d5b2b
+PKG_MD5SUM:= b5059cfe86bc7664511b79c159635a8f
MASTER_SITES:= http://wireless.kernel.org/download/iw/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -17,6 +17,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,IW,iw,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+XAKE_FLAGS:= V=1
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/libnids/patches/no_asm_for_i386.patch b/package/libnids/patches/no_asm_for_i386.patch
deleted file mode 100644
index ff6fde7b1..000000000
--- a/package/libnids/patches/no_asm_for_i386.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libnids-1.18-orig/src/checksum.c libnids-1.18/src/checksum.c
---- libnids-1.18-orig/src/checksum.c 2003-09-20 22:40:44.000000000 +0200
-+++ libnids-1.18/src/checksum.c 2005-08-09 23:55:00.000000000 +0200
-@@ -4,7 +4,7 @@
- #include <netinet/tcp.h>
- #include <netinet/udp.h>
-
--#if ( __i386__ || __i386 )
-+#if 0
- // all asm procedures are copied from Linux 2.0.36 and 2.2.10 kernels
-
- /*
diff --git a/package/mrd6/Config.in b/package/mrd6/Config.in
index 62a3e3585..5a5a948d7 100644
--- a/package/mrd6/Config.in
+++ b/package/mrd6/Config.in
@@ -13,3 +13,21 @@ config ADK_PACKAGE_MRD6
and provides MLDv2 (as well as MLDv1), PIM-SM and MBGP support.
http://artemis.av.it.pt/mrd6/
+
+choice
+prompt "C++ library to use"
+depends on ADK_PACKAGE_MRD6
+default ADK_COMPILE_MRD6_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_MRD6_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
+
+config ADK_COMPILE_MRD6_WITH_STDCXX
+ bool "Standard C++ library"
+ select ADK_PACKAGE_LIBSTDCXX
+ help
+
+config ADK_COMPILE_MRD6_WITH_UCLIBCXX
+ bool "Embedded uClibc++ library"
+ select ADK_PACKAGE_UCLIBCXX
+ help
+
+endchoice
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index 009f36516..53ee70a73 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -9,13 +9,21 @@ PKG_NAME:= mrd6
PKG_VERSION:= 0.9.6
PKG_RELEASE:= 1
PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b
-MASTER_SITES:= http://fivebits.net/files/mrd6/
+MASTER_SITES:= http://www.openadk.org/distfiles/
WRKBUILD= ${WRKSRC}/src
include ${TOPDIR}/mk/package.mk
-$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
+TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
+TLDFLAGS+= -nodefaultlibs -luClibc++ -shared
+PKG_DEPENDS:= uclibc++
+else
+PKG_DEPENDS:= libstdcxx
+endif
+
+$(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${ARCH},${PKG_DEPENDS}))
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
diff --git a/package/mrd6/patches/patch-src_Makefile b/package/mrd6/patches/patch-src_Makefile
index 521673933..abe83bf1b 100644
--- a/package/mrd6/patches/patch-src_Makefile
+++ b/package/mrd6/patches/patch-src_Makefile
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- mrd6-0.9.6.orig/src/Makefile 2007-06-25 01:58:28.000000000 +0200
-+++ mrd6-0.9.6/src/Makefile 2008-10-21 11:27:38.000000000 +0200
++++ mrd6-0.9.6/src/Makefile 2009-05-22 00:43:30.000000000 +0200
@@ -26,7 +26,7 @@ ifeq ($(SUPPORT_MODULES),yes)
MODULES ?= BGP
LDCMD = -rdynamic
@@ -19,7 +19,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
ifeq ($(OPTIMIZE),yes)
ifeq ($(SPACE_OPTIMIZE),yes)
-@@ -101,11 +101,8 @@ ifeq ($(OPTIMIZE),yes)
+@@ -101,22 +101,13 @@ ifeq ($(OPTIMIZE),yes)
CXXFLAGS += -O3
endif
else
@@ -31,7 +31,18 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
endif
endif
-@@ -151,7 +148,7 @@ $(foreach test,$(TESTS),$(eval $(call un
+ LDFLAGS += -lm
+
+-ifeq ($(STATIC_STDCXX),no)
+- LDFLAGS += -lstdc++
+-else
+- LDFLAGS += `$(CXX) -print-file-name=libstdc++.a`
+-endif
+-
+ TEST_OBJECTS = $(addprefix $(OBJ_DIR)/,$(TEST_SOURCES:.cpp=.o))
+ MRD_OBJECTS = $(addprefix $(OBJ_DIR)/,$(MRD_SOURCES:.cpp=.o))
+
+@@ -151,7 +142,7 @@ $(foreach test,$(TESTS),$(eval $(call un
$(TARGET): $(MRD_OBJECTS)
@echo "Linking $(TARGET)"
@@ -40,7 +51,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
install: $(TARGET) $(EXTERNAL_MODULES)
install -D $(TARGET) $(DEST_PREFIX)/sbin/$(TARGET)
-@@ -162,12 +159,12 @@ ifneq (,$(EXTERNAL_MODULES))
+@@ -162,12 +153,12 @@ ifneq (,$(EXTERNAL_MODULES))
endif
$(MRD_VERSION_CPP): $(SOURCES) Makefile Makefile.options
@@ -55,7 +66,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
echo "Generating modules.cpp"; \
scripts/generate-modules-cpp.pl $(STATIC_MODULES) > $(MODULES_CPP)
-@@ -181,7 +178,7 @@ $(OPTIONS):
+@@ -181,7 +172,7 @@ $(OPTIONS):
$(DEPS_DIR)/%.d: %.cpp $(OPTIONS)
@echo "Deps $<"
@@ -64,7 +75,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
$(CXX) -MM -MT $@ -MT $(addprefix $(OBJ_DIR)/,$(<:.cpp=.o)) \
$(CXXFLAGS) $< > $@
-@@ -195,7 +192,7 @@ endif
+@@ -195,7 +186,7 @@ endif
$(OBJ_DIR)/%.o: %.cpp $(OPTIONS)
@echo "C++ $<"
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index f3dcde488..69756e8e5 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -3,36 +3,35 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-# == Doc
-# * http://wiki.rubygarden.org/Ruby/page/show/RubyOnUCLinux
-
include ${TOPDIR}/rules.mk
PKG_NAME:= ruby
-PKG_VERSION:= 1.8.7
+PKG_VERSION:= 1.9.1-p129
PKG_RELEASE:= 1
-PKG_MD5SUM:= de906850f9a012c12ffc6e9f56fb1b66
-MASTER_SITES:= http://ftp.ruby-lang.org/pub/ruby/stable/
+PKG_MD5SUM:= c71f413514ee6341c627be2957023a5c
+MASTER_SITES:= ftp://ftp.ruby-lang.org/pub/ruby/1.9/
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,RUBY,ruby,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+MAKE_FILE:= GNUmakefile
+XAKE_FLAGS+= optflags='' debugflags=''
CONFIGURE_STYLE:= gnu
+CONFIGURE_ARGS+= --enable-wide-getaddrinfo
CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
+INSTALL_TARGET:= install-nodoc
# Enable some ruby extension / options
post-configure:
- echo "option nodynamic" >> ${WRKBUILD}/ext/Setup
+ #echo "option nodynamic" >> ${WRKBUILD}/ext/Setup
echo "socket" >> ${WRKBUILD}/ext/Setup
-# Remove the /usr/lib/libruby.so and keep the static (~1M) ?
post-install:
rm -rf ${WRKINST}/usr/lib/site_ruby
find ${WRKINST}/usr -name "*.h" -delete
cp -a ${WRKINST}/usr ${IDIR_RUBY}
include ${TOPDIR}/mk/pkg-bottom.mk
-
diff --git a/package/ruby/patches/100-makefile-in.patch b/package/ruby/patches/100-makefile-in.patch
deleted file mode 100644
index ecfb49ed8..000000000
--- a/package/ruby/patches/100-makefile-in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ruby-1.8.6.orig/Makefile.in 2007-02-13 00:01:19.000000000 +0100
-+++ ruby-1.8.6/Makefile.in 2007-05-21 22:12:54.000000000 +0200
-@@ -131,7 +131,7 @@ fake.rb: Makefile
- if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
- class File; \
- remove_const :ALT_SEPARATOR; \
-- ALT_SEPARATOR = "\\"; \
-+ ALT_SEPARATOR = "\\\\"; \
- end; \
- end; \
- ' > $@
diff --git a/package/ruby/patches/patch-lib_fileutils_rb b/package/ruby/patches/patch-lib_fileutils_rb
deleted file mode 100644
index 767a389d9..000000000
--- a/package/ruby/patches/patch-lib_fileutils_rb
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- ruby-1.8.6.orig/lib/fileutils.rb 2007-03-04 16:03:11.000000000 +0100
-+++ ruby-1.8.6/lib/fileutils.rb 2007-05-21 22:14:04.000000000 +0200
-@@ -1026,7 +1026,7 @@ module FileUtils
- list.each do |path|
- created = nocreate
- begin
-- File.utime(t, t, path)
-+ #File.utime(t, t, path)
- rescue Errno::ENOENT
- raise if created
- File.open(path, 'a') {
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 49e772238..dad10f2d8 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -1,6 +1,10 @@
menu "Network devices support"
depends on !ADK_LINUX_CRIS_FOXBOARD
+config ADK_KERNEL_NETDEVICES
+ boolean
+ default n
+
config ADK_KERNEL_NET_ETHERNET
boolean
default n
@@ -21,6 +25,7 @@ menu "Ethernet card support"
config ADK_KPACKAGE_KMOD_NE2K_PCI
prompt "kmod-net-ne2k-pci............. NE2000 PCI driver"
+ select ADK_KERNEL_NETDEVICES
select ADK_KERNEL_NET_ETHERNET
select ADK_KERNEL_NET_PCI
select ADK_KERNEL_MII
@@ -31,7 +36,7 @@ config ADK_KPACKAGE_KMOD_NE2K_PCI
config ADK_KPACKAGE_KMOD_E100
prompt "kmod-net-e100................. Intel(R) PRO/100+ driver"
- select ADK_KERNEL_NET_ETHERNET
+ select ADK_KERNEL_NETDEVICES
select ADK_KERNEL_NET_PCI
select ADK_KERNEL_MII
tristate
@@ -41,6 +46,7 @@ config ADK_KPACKAGE_KMOD_E100
config ADK_KPACKAGE_KMOD_E1000
prompt "kmod-net-e1000................ Intel(R) PRO/1000 Gigabit Ethernet driver"
+ select ADK_KERNEL_NETDEVICES
select ADK_KERNEL_NET_ETHERNET
select ADK_KERNEL_NETDEV_1000
tristate
diff --git a/target/linux/patches/mips-gcc-44.patch b/target/linux/patches/mips-gcc-44.patch
new file mode 100644
index 000000000..ccee68b9b
--- /dev/null
+++ b/target/linux/patches/mips-gcc-44.patch
@@ -0,0 +1,215 @@
+diff -Nur linux-2.6.29.4.orig/arch/mips/include/asm/compiler.h linux-2.6.29.4/arch/mips/include/asm/compiler.h
+--- linux-2.6.29.4.orig/arch/mips/include/asm/compiler.h 2009-05-19 01:52:34.000000000 +0200
++++ linux-2.6.29.4/arch/mips/include/asm/compiler.h 2009-05-24 19:32:14.000000000 +0200
+@@ -16,4 +16,11 @@
+ #define GCC_REG_ACCUM "accum"
+ #endif
+
++#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
++#define GCC_NO_H_CONSTRAINT
++#ifdef CONFIG_64BIT
++typedef unsigned int uint128_t __attribute__((mode(TI)));
++#endif
++#endif
++
+ #endif /* _ASM_COMPILER_H */
+diff -Nur linux-2.6.29.4.orig/arch/mips/include/asm/delay.h linux-2.6.29.4/arch/mips/include/asm/delay.h
+--- linux-2.6.29.4.orig/arch/mips/include/asm/delay.h 2009-05-19 01:52:34.000000000 +0200
++++ linux-2.6.29.4/arch/mips/include/asm/delay.h 2009-05-24 19:32:14.000000000 +0200
+@@ -62,8 +62,9 @@
+
+ static inline void __udelay(unsigned long usecs, unsigned long lpj)
+ {
++#ifndef GCC_NO_H_CONSTRAINT
+ unsigned long hi, lo;
+-
++#endif
+ /*
+ * The rates of 128 is rounded wrongly by the catchall case
+ * for 64-bit. Excessive precission? Probably ...
+@@ -77,6 +78,17 @@
+ 0x80000000ULL) >> 32);
+ #endif
+
++#ifdef GCC_NO_H_CONSTRAINT
++#ifdef CONFIG_64BIT
++ usecs = ((uint128_t)usecs * lpj) >> 64;
++#else
++#define SZHALF (sizeof(long)*4)
++#define LOWERHALF ((0x1ul<<SZHALF) - 1)
++ usecs = (usecs >> SZHALF) * (lpj >> SZHALF) + ( ((usecs & LOWERHALF) * (lpj >> SZHALF) + (usecs >> SZHALF) * (lpj & LOWERHALF)) >> SZHALF );
++#undef SZHALF
++#undef LOWERHALF
++#endif
++#else
+ if (sizeof(long) == 4)
+ __asm__("multu\t%2, %3"
+ : "=h" (usecs), "=l" (lo)
+@@ -92,7 +104,7 @@
+ : "=r" (usecs), "=h" (hi), "=l" (lo)
+ : "r" (usecs), "r" (lpj)
+ : GCC_REG_ACCUM);
+-
++#endif
+ __delay(usecs);
+ }
+
+diff -Nur linux-2.6.29.4.orig/arch/mips/include/asm/div64.h linux-2.6.29.4/arch/mips/include/asm/div64.h
+--- linux-2.6.29.4.orig/arch/mips/include/asm/div64.h 2009-05-19 01:52:34.000000000 +0200
++++ linux-2.6.29.4/arch/mips/include/asm/div64.h 2009-05-22 13:38:14.000000000 +0200
+@@ -6,105 +6,63 @@
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+-#ifndef _ASM_DIV64_H
+-#define _ASM_DIV64_H
++#ifndef __ASM_DIV64_H
++#define __ASM_DIV64_H
+
+-#include <linux/types.h>
++#include <asm-generic/div64.h>
+
+-#if (_MIPS_SZLONG == 32)
++#if BITS_PER_LONG == 64
+
+-#include <asm/compiler.h>
++#include <linux/types.h>
+
+ /*
+ * No traps on overflows for any of these...
+ */
+
+-#define do_div64_32(res, high, low, base) ({ \
+- unsigned long __quot32, __mod32; \
+- unsigned long __cf, __tmp, __tmp2, __i; \
+- \
+- __asm__(".set push\n\t" \
+- ".set noat\n\t" \
+- ".set noreorder\n\t" \
+- "move %2, $0\n\t" \
+- "move %3, $0\n\t" \
+- "b 1f\n\t" \
+- " li %4, 0x21\n" \
+- "0:\n\t" \
+- "sll $1, %0, 0x1\n\t" \
+- "srl %3, %0, 0x1f\n\t" \
+- "or %0, $1, %5\n\t" \
+- "sll %1, %1, 0x1\n\t" \
+- "sll %2, %2, 0x1\n" \
+- "1:\n\t" \
+- "bnez %3, 2f\n\t" \
+- " sltu %5, %0, %z6\n\t" \
+- "bnez %5, 3f\n" \
+- "2:\n\t" \
+- " addiu %4, %4, -1\n\t" \
+- "subu %0, %0, %z6\n\t" \
+- "addiu %2, %2, 1\n" \
+- "3:\n\t" \
+- "bnez %4, 0b\n\t" \
+- " srl %5, %1, 0x1f\n\t" \
+- ".set pop" \
+- : "=&r" (__mod32), "=&r" (__tmp), \
+- "=&r" (__quot32), "=&r" (__cf), \
+- "=&r" (__i), "=&r" (__tmp2) \
+- : "Jr" (base), "0" (high), "1" (low)); \
+- \
+- (res) = __quot32; \
+- __mod32; })
+-
+-#define do_div(n, base) ({ \
+- unsigned long long __quot; \
+- unsigned long __mod; \
+- unsigned long long __div; \
+- unsigned long __upper, __low, __high, __base; \
+- \
+- __div = (n); \
+- __base = (base); \
+- \
+- __high = __div >> 32; \
+- __low = __div; \
+- __upper = __high; \
+- \
+- if (__high) \
+- __asm__("divu $0, %z2, %z3" \
+- : "=h" (__upper), "=l" (__high) \
+- : "Jr" (__high), "Jr" (__base) \
+- : GCC_REG_ACCUM); \
+- \
+- __mod = do_div64_32(__low, __upper, __low, __base); \
+- \
+- __quot = __high; \
+- __quot = __quot << 32 | __low; \
+- (n) = __quot; \
+- __mod; })
+-
+-#endif /* (_MIPS_SZLONG == 32) */
+-
+-#if (_MIPS_SZLONG == 64)
+-
+-/*
+- * Hey, we're already 64-bit, no
+- * need to play games..
+- */
+-#define do_div(n, base) ({ \
+- unsigned long __quot; \
+- unsigned int __mod; \
+- unsigned long __div; \
+- unsigned int __base; \
+- \
+- __div = (n); \
+- __base = (base); \
+- \
+- __mod = __div % __base; \
+- __quot = __div / __base; \
+- \
+- (n) = __quot; \
+- __mod; })
++#define __div64_32(n, base) \
++({ \
++ unsigned long __cf, __tmp, __tmp2, __i; \
++ unsigned long __quot32, __mod32; \
++ unsigned long __high, __low; \
++ unsigned long long __n; \
++ \
++ __high = *__n >> 32; \
++ __low = __n; \
++ __asm__( \
++ " .set push \n" \
++ " .set noat \n" \
++ " .set noreorder \n" \
++ " move %2, $0 \n" \
++ " move %3, $0 \n" \
++ " b 1f \n" \
++ " li %4, 0x21 \n" \
++ "0: \n" \
++ " sll $1, %0, 0x1 \n" \
++ " srl %3, %0, 0x1f \n" \
++ " or %0, $1, %5 \n" \
++ " sll %1, %1, 0x1 \n" \
++ " sll %2, %2, 0x1 \n" \
++ "1: \n" \
++ " bnez %3, 2f \n" \
++ " sltu %5, %0, %z6 \n" \
++ " bnez %5, 3f \n" \
++ "2: \n" \
++ " addiu %4, %4, -1 \n" \
++ " subu %0, %0, %z6 \n" \
++ " addiu %2, %2, 1 \n" \
++ "3: \n" \
++ " bnez %4, 0b\n\t" \
++ " srl %5, %1, 0x1f\n\t" \
++ " .set pop" \
++ : "=&r" (__mod32), "=&r" (__tmp), \
++ "=&r" (__quot32), "=&r" (__cf), \
++ "=&r" (__i), "=&r" (__tmp2) \
++ : "Jr" (base), "0" (__high), "1" (__low)); \
++ \
++ (__n) = __quot32; \
++ __mod32; \
++})
+
+-#endif /* (_MIPS_SZLONG == 64) */
++#endif /* BITS_PER_LONG == 64 */
+
+-#endif /* _ASM_DIV64_H */
++#endif /* __ASM_DIV64_H */
diff --git a/target/qemu-mips/device.mk b/target/qemu-mips/device.mk
index df956ae5e..9f912f207 100644
--- a/target/qemu-mips/device.mk
+++ b/target/qemu-mips/device.mk
@@ -1,6 +1,6 @@
ARCH:= mips
CPU_ARCH:= mipsel
-KERNEL_VERSION:= 2.6.29.1
+KERNEL_VERSION:= 2.6.29.4
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= 4ada43caecb08fe2af71b416b6f586d8
TARGET_OPTIMIZATION:= -Os -pipe
diff --git a/target/qemu-mips/kernel.config b/target/qemu-mips/kernel.config
index e2f59e81c..8a78fd922 100644
--- a/target/qemu-mips/kernel.config
+++ b/target/qemu-mips/kernel.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.28
-# Fri Jan 9 22:42:20 2009
+# Linux kernel version: 2.6.29.4
+# Fri May 22 13:23:36 2009
#
CONFIG_MIPS=y
@@ -19,7 +19,7 @@ CONFIG_ZONE_DMA=y
# CONFIG_LEMOTE_FULONG is not set
CONFIG_MIPS_MALTA=y
# CONFIG_MIPS_SIM is not set
-# CONFIG_MACH_EMMA is not set
+# CONFIG_NEC_MARKEINS is not set
# CONFIG_MACH_VR41XX is not set
# CONFIG_NXP_STB220 is not set
# CONFIG_NXP_STB225 is not set
@@ -44,6 +44,8 @@ CONFIG_MIPS_MALTA=y
# CONFIG_MACH_TX49XX is not set
# CONFIG_MIKROTIK_RB532 is not set
# CONFIG_WR_PPMC is not set
+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
@@ -54,11 +56,13 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_GENERIC_TIME=y
CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
CONFIG_BOOT_RAW=y
+CONFIG_CEVT_R4K_LIB=y
CONFIG_CEVT_R4K=y
+CONFIG_CSRC_R4K_LIB=y
CONFIG_CSRC_R4K=y
CONFIG_DMA_NONCOHERENT=y
CONFIG_DMA_NEED_PCI_MAP_STATE=y
@@ -106,6 +110,7 @@ CONFIG_CPU_MIPS32_R1=y
# CONFIG_CPU_RM7000 is not set
# CONFIG_CPU_RM9000 is not set
# CONFIG_CPU_SB1 is not set
+# CONFIG_CPU_CAVIUM_OCTEON is not set
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
CONFIG_SYS_HAS_CPU_MIPS32_R2=y
CONFIG_SYS_HAS_CPU_MIPS64_R1=y
@@ -152,7 +157,6 @@ CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
@@ -173,7 +177,6 @@ CONFIG_HZ=100
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
-# CONFIG_PREEMPT_RCU is not set
# CONFIG_KEXEC is not set
# CONFIG_SECCOMP is not set
CONFIG_LOCKDEP_SUPPORT=y
@@ -196,10 +199,19 @@ CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_CLASSIC_RCU=y
+# CONFIG_TREE_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set
# CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set
@@ -207,6 +219,7 @@ CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
CONFIG_EMBEDDED=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
@@ -216,10 +229,8 @@ CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_PCSPKR_PLATFORM=y
-# CONFIG_COMPAT_BRK is not set
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
-CONFIG_ANON_INODES=y
CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
CONFIG_TIMERFD=y
@@ -228,16 +239,15 @@ CONFIG_SHMEM=y
CONFIG_AIO=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
+# CONFIG_COMPAT_BRK is not set
CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
-# CONFIG_MARKERS is not set
CONFIG_HAVE_OPROFILE=y
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
-# CONFIG_TINY_SHMEM is not set
CONFIG_BASE_SMALL=0
CONFIG_MODULES=y
# CONFIG_MODULE_FORCE_LOAD is not set
@@ -245,11 +255,9 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODULE_FORCE_UNLOAD is not set
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
CONFIG_BLOCK=y
# CONFIG_LBD is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -265,7 +273,6 @@ CONFIG_IOSCHED_NOOP=y
# CONFIG_DEFAULT_CFQ is not set
CONFIG_DEFAULT_NOOP=y
CONFIG_DEFAULT_IOSCHED="noop"
-CONFIG_CLASSIC_RCU=y
# CONFIG_PROBE_INITRD_HEADER is not set
# CONFIG_FREEZER is not set
@@ -277,6 +284,7 @@ CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
# CONFIG_ARCH_SUPPORTS_MSI is not set
# CONFIG_PCI_LEGACY is not set
+# CONFIG_PCI_STUB is not set
CONFIG_MMU=y
CONFIG_I8253=y
# CONFIG_PCCARD is not set
@@ -301,6 +309,7 @@ CONFIG_NET=y
#
# Networking options
#
+CONFIG_COMPAT_NET_DEV_OPS=y
CONFIG_PACKET=y
# CONFIG_PACKET_MMAP is not set
CONFIG_UNIX=y
@@ -354,6 +363,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
#
# Network testing
@@ -367,6 +377,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_PHONET is not set
CONFIG_FIB_RULES=y
# CONFIG_WIRELESS is not set
+# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
@@ -412,7 +423,6 @@ CONFIG_IDE_GD_ATA=y
# CONFIG_IDE_GD_ATAPI is not set
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
# CONFIG_IDE_TASK_IOCTL is not set
# CONFIG_IDE_PROC_FS is not set
@@ -443,6 +453,7 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_JMICRON is not set
# CONFIG_BLK_DEV_SC1200 is not set
CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_IT8172 is not set
# CONFIG_BLK_DEV_IT8213 is not set
# CONFIG_BLK_DEV_IT821X is not set
# CONFIG_BLK_DEV_NS87415 is not set
@@ -587,6 +598,7 @@ CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM is not set
@@ -739,6 +751,10 @@ CONFIG_USB_ARCH_HAS_EHCI=y
# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
#
# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
# CONFIG_UWB is not set
# CONFIG_MMC is not set
# CONFIG_MEMSTICK is not set
@@ -765,6 +781,7 @@ CONFIG_EXT2_FS=y
CONFIG_FILE_LOCKING=y
# CONFIG_XFS_FS is not set
# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
CONFIG_DNOTIFY=y
CONFIG_INOTIFY=y
CONFIG_INOTIFY_USER=y
@@ -798,10 +815,7 @@ CONFIG_TMPFS=y
# CONFIG_TMPFS_POSIX_ACL is not set
# CONFIG_HUGETLB_PAGE is not set
# CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
+CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_HFS_FS is not set
@@ -810,6 +824,7 @@ CONFIG_TMPFS=y
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_OMFS_FS is not set
@@ -858,7 +873,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_PRINTK_TIME=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=0
+CONFIG_FRAME_WARN=1024
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
@@ -886,9 +901,15 @@ CONFIG_CMDLINE="init=/init console=ttyS0,115200 console=tty0"
# CONFIG_CRYPTO is not set
#
+# OCF Configuration
+#
+# CONFIG_OCF_OCF is not set
+
+#
# Library routines
#
CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
# CONFIG_CRC_CCITT is not set
# CONFIG_CRC16 is not set
# CONFIG_CRC_T10DIF is not set
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 6d8be0f9d..22046794e 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -4,8 +4,8 @@
# material, please see the LICENCE file in the top-level directory.
PKG_NAME:= gcc
-PKG_VERSION:= 4.3.3
+PKG_VERSION:= 4.4.0
PKG_RELEASE:= 1
-PKG_MD5SUM:= cc3c5565fdb9ab87a05ddb106ba0bd1f
+PKG_MD5SUM:= cf5d787bee57f38168b74d65a7c0e6fd
MASTER_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/toolchain/gcc/patches/arm-softfloat-libgcc.patch b/toolchain/gcc/patches/arm-softfloat-libgcc.patch
deleted file mode 100644
index 1639c39a8..000000000
--- a/toolchain/gcc/patches/arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: gcc-4.3.0/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.3.0/gcc/config/arm/t-linux (revision 129896)
-+++ gcc-4.3.0/gcc/config/arm/t-linux (working copy)
-@@ -3,7 +3,10 @@
- TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
-
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
-+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+ _fixsfsi _fixunssfsi _floatdidf _floatundidf _floatdisf _floatundisf
-
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
-Index: gcc-4.3.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.3.0/gcc/config/arm/linux-elf.h (revision 129896)
-+++ gcc-4.3.0/gcc/config/arm/linux-elf.h (working copy)
-@@ -48,7 +62,7 @@
- %{shared:-lc} \
- %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
-
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-