Initial consolidation of opt ports for CRUX 3.0

3 files changed, 23 insertions, 124 deletions

diff --git a/valgrind/.footprint b/valgrind/.footprint
index 08b5d650d..f013c4749 100644
--- a/valgrind/.footprint
+++ b/valgrind/.footprint
@@ -120,23 +120,23 @@ drwxr-xr-x	root/root	usr/lib/valgrind/
 -rw-r--r--	root/root	usr/lib/valgrind/arm-vfpv3.xml
 -rw-r--r--	root/root	usr/lib/valgrind/arm-with-vfpv3-valgrind.xml
 -rw-r--r--	root/root	usr/lib/valgrind/arm-with-vfpv3.xml
--rwxr-xr-x	root/root	usr/lib/valgrind/cachegrind-x86-linux
--rwxr-xr-x	root/root	usr/lib/valgrind/callgrind-x86-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/cachegrind-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/callgrind-amd64-linux
 -rw-r--r--	root/root	usr/lib/valgrind/default.supp
--rwxr-xr-x	root/root	usr/lib/valgrind/drd-x86-linux
--rwxr-xr-x	root/root	usr/lib/valgrind/exp-bbv-x86-linux
--rwxr-xr-x	root/root	usr/lib/valgrind/exp-dhat-x86-linux
--rwxr-xr-x	root/root	usr/lib/valgrind/exp-sgcheck-x86-linux
--rwxr-xr-x	root/root	usr/lib/valgrind/helgrind-x86-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/drd-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/exp-bbv-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/exp-dhat-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/exp-sgcheck-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/helgrind-amd64-linux
 -rw-r--r--	root/root	usr/lib/valgrind/i386-coresse-valgrind.xml
 -rw-r--r--	root/root	usr/lib/valgrind/i386-linux-valgrind.xml
--rwxr-xr-x	root/root	usr/lib/valgrind/lackey-x86-linux
--rw-r--r--	root/root	usr/lib/valgrind/libcoregrind-x86-linux.a
--rw-r--r--	root/root	usr/lib/valgrind/libreplacemalloc_toolpreload-x86-linux.a
--rw-r--r--	root/root	usr/lib/valgrind/libvex-x86-linux.a
--rwxr-xr-x	root/root	usr/lib/valgrind/massif-x86-linux
--rwxr-xr-x	root/root	usr/lib/valgrind/memcheck-x86-linux
--rwxr-xr-x	root/root	usr/lib/valgrind/none-x86-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/lackey-amd64-linux
+-rw-r--r--	root/root	usr/lib/valgrind/libcoregrind-amd64-linux.a
+-rw-r--r--	root/root	usr/lib/valgrind/libreplacemalloc_toolpreload-amd64-linux.a
+-rw-r--r--	root/root	usr/lib/valgrind/libvex-amd64-linux.a
+-rwxr-xr-x	root/root	usr/lib/valgrind/massif-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/memcheck-amd64-linux
+-rwxr-xr-x	root/root	usr/lib/valgrind/none-amd64-linux
 -rw-r--r--	root/root	usr/lib/valgrind/power-altivec-valgrind-s1.xml
 -rw-r--r--	root/root	usr/lib/valgrind/power-altivec-valgrind-s2.xml
 -rw-r--r--	root/root	usr/lib/valgrind/power-altivec.xml
@@ -157,13 +157,13 @@ drwxr-xr-x	root/root	usr/lib/valgrind/
 -rw-r--r--	root/root	usr/lib/valgrind/powerpc-altivec32l.xml
 -rw-r--r--	root/root	usr/lib/valgrind/powerpc-altivec64l-valgrind.xml
 -rw-r--r--	root/root	usr/lib/valgrind/powerpc-altivec64l.xml
--rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_core-x86-linux.so
--rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_drd-x86-linux.so
--rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_exp-dhat-x86-linux.so
--rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_exp-sgcheck-x86-linux.so
--rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_helgrind-x86-linux.so
--rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_massif-x86-linux.so
--rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_memcheck-x86-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_core-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_drd-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_exp-dhat-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_exp-sgcheck-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_massif-amd64-linux.so
+-rwxr-xr-x	root/root	usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/callgrind_annotate.1.gz
diff --git a/valgrind/Pkgfile b/valgrind/Pkgfile
index 4a8c1f144..363b5d227 100644
--- a/valgrind/Pkgfile
+++ b/valgrind/Pkgfile
@@ -1,7 +1,7 @@
 # Description: A debugging and profiling system for Linux programs
 # URL: http://valgrind.org
-# Maintainer:  Thomas Penteker, tek at serverop dot de
-# Packager: Tilman Sauerbeck, tilman at crux dot nu
+# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
+# Arch Maintainer: 
 
 name=valgrind
 version=3.7.0
diff --git a/valgrind/valgrind.diff b/valgrind/valgrind.diff
deleted file mode 100644
index eb2859656..000000000
--- a/valgrind/valgrind.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.5.0-glibc-2.12.patch?revision=1.1
-http://cvs.fedoraproject.org/viewvc/rpms/valgrind/devel/valgrind-3.5.0-glibc-2.12.patch?view=log
-
-http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.5.0-stat_h.patch?revision=1.1
-http://cvs.fedoraproject.org/viewvc/rpms/valgrind/devel/valgrind-3.5.0-stat_h.patch?view=log
-
---- configure.in
-+++ configure.in
-@@ -666,6 +666,16 @@ AC_EGREP_CPP([GLIBC_211], [
- ],
- GLIBC_VERSION="2.11")
- 
-+AC_EGREP_CPP([GLIBC_212], [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
-+  GLIBC_212
-+ #endif
-+#endif
-+],
-+GLIBC_VERSION="2.12")
-+
- AC_EGREP_CPP([AIX5_LIBC], [
- #include <standards.h>
- #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
-@@ -759,6 +769,13 @@ case "${GLIBC_VERSION}" in
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.12)
-+	AC_MSG_RESULT(2.12 family)
-+	AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.x])
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-      aix5)
- 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
- 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
---- config.h.in
-+++ config.h.in
-@@ -18,6 +18,9 @@
- /* Define to 1 if you're using glibc 2.11.x */
- #undef GLIBC_2_11
- 
-+/* Define to 1 if you're using glibc 2.12.x */
-+#undef GLIBC_2_12
-+
- /* Define to 1 if you're using glibc 2.2.x */
- #undef GLIBC_2_2
- 
-
---- include/vki/vki-amd64-linux.h
-+++ include/vki/vki-amd64-linux.h
-@@ -310,6 +310,9 @@ struct vki_stat {
- 	long		st_blksize;
- 	long		st_blocks;	/* Number 512-byte blocks allocated. */
- 
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
- 	unsigned long	st_atime;
- 	unsigned long 	st_atime_nsec; 
- 	unsigned long	st_mtime;
---- include/vki/vki-x86-linux.h
-+++ include/vki/vki-x86-linux.h
-@@ -348,6 +348,9 @@ struct vki_stat {
- 	unsigned long  st_size;
- 	unsigned long  st_blksize;
- 	unsigned long  st_blocks;
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
- 	unsigned long  st_atime;
- 	unsigned long  st_atime_nsec;
- 	unsigned long  st_mtime;
---- include/vki/vki-ppc32-linux.h
-+++ include/vki/vki-ppc32-linux.h
-@@ -392,6 +392,9 @@ struct vki_stat {
-    long			st_size;
-    unsigned long	st_blksize;
-    unsigned long	st_blocks;
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
-    unsigned long	st_atime;
-    unsigned long	st_atime_nsec;
-    unsigned long	st_mtime;
---- include/vki/vki-ppc64-linux.h
-+++ include/vki/vki-ppc64-linux.h
-@@ -428,6 +428,9 @@ struct vki_stat {
-   long            st_size;
-   unsigned long   st_blksize;
-   unsigned long   st_blocks;
-+#undef st_atime
-+#undef st_mtime
-+#undef st_ctime
-   unsigned long   st_atime;
-   unsigned long   st_atime_nsec;
-   unsigned long   st_mtime;
-