Merge branch 'master' of git+ssh://openadk.org/git/openadk

79 files changed, 31 insertions, 141 deletions

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 413744638..f436d9ef7 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -17,7 +17,6 @@ PKG_MULTI:=		1
 PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	!cris
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 
 PKG_SUBPKGS:=		ASTERISK ASTERISK_PGSQL ASTERISK_VOICEMAIL ASTERISK_SOUNDS
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 3abf670cd..19b945f41 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -15,7 +15,6 @@ PKGSD_LIBBFD:=		Binary File Descriptor library
 PKGSC_LIBBFD:=		libs
 
 PKG_HOST_DEPENDS:=      !cygwin
-PKG_ARCH_DEPENDS:=	!avr32
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index e86eac36a..ec9024d81 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -15,8 +15,6 @@ PKG_URL:=		http://www.bluez.org/
 PKG_SITES:=		http://mirror.anl.gov/pub/linux/bluetooth/
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BLUEZ,bluez,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/boost/Makefile b/package/boost/Makefile
index 4dbb67ae9..d5f4325fc 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -13,7 +13,7 @@ PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 DISTFILES:=		boost_1_55_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_1_55_0
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 30894cab5..8b26cbfdb 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -30,9 +30,6 @@ $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 ifeq (,$(filter arm,$(TARGET_ARCH)))
 TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
 endif
-ifeq (,$(filter cris,$(TARGET_ARCH)))
-TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
-endif
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-fc=yes \
 			--enable-tee=yes \
diff --git a/package/ccid/Makefile b/package/ccid/Makefile
index 55c81fa12..ec48810ea 100644
--- a/package/ccid/Makefile
+++ b/package/ccid/Makefile
@@ -13,8 +13,6 @@ PKG_BUILDDEP:=		pcsc-lite
 PKG_URL:=		http://pcsclite.alioth.debian.org/ccid.html
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index e63c84e7a..2f133cdef 100644
--- a/package/classpath/Makefile
+++ b/package/classpath/Makefile
@@ -15,7 +15,7 @@ PKG_URL:=		http://www.gnu.org/software/classpath/home.html
 PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
 
 PKG_HOST_DEPENDS:=	linux
-PKG_ARCH_DEPENDS:=	!cris !arm
+PKG_ARCH_DEPENDS:=	!arm
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/conntrack-tools/Makefile b/package/conntrack-tools/Makefile
index 9032d3f06..22390a0a7 100644
--- a/package/conntrack-tools/Makefile
+++ b/package/conntrack-tools/Makefile
@@ -15,7 +15,6 @@ PKG_URL:=		http://conntrack-tools.netfilter.org/
 PKG_SITES:=		http://www.netfilter.org/projects/conntrack-tools/files/
 
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
-PKG_ARCH_DEPENDS:=	!avr32
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index bf71f5a43..1e0eaca25 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -17,8 +17,6 @@ PKG_URL:=		http://cryptsetup.googlecode.com/
 PKG_SITES:=		http://cryptsetup.googlecode.com/files/
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!cris
-
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 03a6bc4d3..5bfc15998 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -16,7 +16,7 @@ PKG_NEED_CXX:=		1
 PKG_CXX:=		CXXTOOLS
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!arm !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!arm !m68k
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index ab62c232f..711bf0edb 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -23,12 +23,8 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DANSGUARDIAN,dansguardian,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y)
-ifeq ($(ADK_LINUX_AVR32),y)
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
-else
 LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s
 endif
-endif
 
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index a7309e882..c5968a420 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -15,7 +15,6 @@ PKG_URL:=		http://www.digitemp.com/software/linux/
 PKG_SITES:=		http://www.digitemp.com/software/linux/
 
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
-PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 4e1665196..59f2ea6ba 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -12,8 +12,6 @@ PKG_SECTION:=		firewall
 PKG_URL:=		http://ebtables.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ebtables/}
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 DISTFILES:=		${PKG_NAME}-v${PKG_VERSION}-4.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}-v${PKG_VERSION}-4
 
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index d8211aedb..d82f9d643 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -15,7 +15,7 @@ PKG_SITES:=		http://www.ffmpeg.org/releases/
 PKH_LIBNAME:=		libffmpeg
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!avr32 !cris !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 PKG_SUBPKGS:=		LIBFFMPEG FFSERVER FFPROBE FFMPEG
 #PKGSD_FFPLAY:=		ffmpeg based video player
diff --git a/package/fluxbox/Makefile b/package/fluxbox/Makefile
index ea8ee6338..eb0663b99 100644
--- a/package/fluxbox/Makefile
+++ b/package/fluxbox/Makefile
@@ -14,8 +14,6 @@ PKG_BUILDDEP:=		libXpm libXft
 PKG_URL:=		http://www.fluxbox.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 PKG_FLAVOURS_FLUXBOX:=	WITH_IMLIB2
 PKGFD_WITH_IMLIB2:=	enable imlib2 support
 PKGFS_WITH_IMLIB2:=	imlib2
diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile
index d9a58ce87..5b727c004 100644
--- a/package/forked-daapd/Makefile
+++ b/package/forked-daapd/Makefile
@@ -18,7 +18,7 @@ PKG_SITES:=		http://alioth.debian.org/~jblache/forked-daapd/
 
 PKG_CFLINE_FORKED_DAAPD:=	select ADK_KERNEL_INOTIFY_USER@
 PKG_CFLINE_FORKED_DAAPD+=	depends on ADK_BROKEN@
-PKG_ARCH_DEPENDS:=	!ppc !avr32
+PKG_ARCH_DEPENDS:=	!ppc
 # gperf problem
 PKG_HOST_DEPENDS:=	!freebsd
 
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index f0e17503a..976497cba 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -11,8 +11,6 @@ PKG_OPTS:=		noremove
 PKG_DEPENDS:=		libmpc libgmp mpfr libgcc
 PKG_BUILDDEP:=		libmpc gmp mpfr
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 PKG_SUBPKGS:=		GCC GXX
 PKGSD_GXX:=		GNU C++ compiler
 
diff --git a/package/gcc/patches/4.7.3/musl-cris.patch b/package/gcc/patches/4.7.3/musl-cris.patch
deleted file mode 100644
index 4889263a1..000000000
--- a/package/gcc/patches/4.7.3/musl-cris.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur gcc-4.7.3.orig/gcc/config/cris/linux.h gcc-4.7.3/gcc/config/cris/linux.h
---- gcc-4.7.3.orig/gcc/config/cris/linux.h	2011-04-11 20:46:05.000000000 +0200
-+++ gcc-4.7.3/gcc/config/cris/linux.h	2013-10-11 10:01:51.000000000 +0200
-@@ -104,6 +104,7 @@
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-cris.1"
- 
- #undef CRIS_LINK_SUBTARGET_SPEC
- #define CRIS_LINK_SUBTARGET_SPEC \
diff --git a/package/gconf/Makefile b/package/gconf/Makefile
index dfed4551a..38a14e6c0 100644
--- a/package/gconf/Makefile
+++ b/package/gconf/Makefile
@@ -17,7 +17,7 @@ PKG_SITES:=		ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
 PKG_LIBNAME:=		gconf
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!arm !cris
+PKG_ARCH_DEPENDS:=	!arm
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 61d564be7..8128e8bd5 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -11,7 +11,7 @@ PKG_DEPENDS:=		libthread-db libncurses libexpat libgcc zlib
 PKG_BUILDDEP:=		ncurses readline libiconv-tiny expat zlib
 PKG_NOPARALLEL:=	1
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 71de5e559..d77558eb6 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -9,7 +9,7 @@ PKG_DESCR:=		GNU debugger (small server)
 PKG_SECTION:=		debug
 PKG_DEPENDS:=		libthread-db
 
-PKG_ARCH_DEPENDS:=	!avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 PKG_LIBC_DEPENDS:=	uclibc eglibc glibc
 PKG_SUBPKGS:=		GDBSERVER
 
diff --git a/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c b/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c
deleted file mode 100644
index e500d6642..000000000
--- a/package/gdbserver/patches/patch-gdb_gdbserver_linux-cris-low_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdb-7.1.orig/gdb/gdbserver/linux-cris-low.c
-+++ gdb-7.1/gdb/gdbserver/linux-cris-low.c
-@@ -62,7 +62,7 @@
- extern int debug_threads;
- 
- static CORE_ADDR
--cris_get_pc (struct regcache *regcache, void)
-+cris_get_pc (struct regcache *regcache)
- {
-   unsigned long pc;
-   collect_register_by_name (regcache, "pc", &pc);
diff --git a/package/huawei/Makefile b/package/huawei/Makefile
index 4dedad02f..d85bc130d 100644
--- a/package/huawei/Makefile
+++ b/package/huawei/Makefile
@@ -11,8 +11,6 @@ PKG_SECTION:=		utils
 PKG_DEPENDS:=		libusb libusb-compat
 PKG_BUILDDEP:=		libusb libusb-compat
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 NO_DISTFILES:=		1
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 3fc3b03f5..d867dd210 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -15,8 +15,6 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=iperf/}
 PKG_NEED_CXX:=		1
 PKG_CXX:=		IPERF
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 741f3ab06..34fea7f21 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		firewall
 PKG_URL:=		http://ipset.netfilter.org/
 PKG_SITES:=		http://ipset.netfilter.org/
 
-PKG_ARCH_DEPENDS:=	!arm !avr32
+PKG_ARCH_DEPENDS:=	!arm
 PKG_CFLINE_IPSET:=	depends on !ADK_TOOLCHAIN_ONLY
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 6cca7f5d8..6d21b6311 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libffi zlib
 PKG_URL:=		http://jamvm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !m68k
+PKG_ARCH_DEPENDS:=	!m68k
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 7f6332a3f..3ea6904d2 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDEP:=		zlib
 PKG_URL:=		http://kernel.org/pub/linux/utils/kernel/kexec/
 PKG_SITES:=		http://kernel.org/pub/linux/utils/kernel/kexec/
 
-PKG_ARCH_DEPENDS:=	!cris !avr32 !mips !m68k
+PKG_ARCH_DEPENDS:=	!mips !m68k
 PKG_CFLINE_KEXEC_TOOLS:=	select ADK_KERNEL_KEXEC
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 5f303bd71..28f277f8d 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -7,12 +7,9 @@ include ${TOPDIR}/toolchain/gcc/Makefile.inc
 PKG_NAME:=		libgcc
 PKG_DESCR:=		GCC library
 PKG_SECTION:=		libs
-#PKG_DFLT_LIBGCC:=	y if !ADK_TOOLCHAIN_ONLY
 
 NO_DISTFILES:=		1
 
-PKG_ARCH_DEPENDS:=	!avr32
-
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGCC,libgcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 45c1edfc4..5c6cc2b2f 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -16,15 +16,11 @@ endif
 endif
 en