[meego-commits] 5945: Changes to Trunk/valgrind
Anas Nashif
nashif at linux.intel.com
Thu Jul 22 20:01:03 UTC 2010
Hi,
I have made the following changes to valgrind in project Trunk. Please review and accept ASAP.
Thank You,
Anas Nashif
[This message was auto-generated]
---
Request #5945:
submit: Trunk:Testing/valgrind(r3) -> Trunk/valgrind
Message:
Move to Trunk
State: new 2010-07-22T07:54:34 nashif
Comment: None
changes files:
--------------
--- valgrind.changes
+++ valgrind.changes
@@ -0,0 +1,3 @@
+* Thu Jul 22 2010 Yu <yu.a.wang at intel.com> - 3.5.0
+- Correct valgrind to work with glibc-2.12
+
old:
----
valgrind-3.5.0-glibc-2.11.patch
new:
----
valgrind-3.5.0-glibc-2.12.patch
valgrind-3.5.0-stat_h.patch
spec files:
-----------
--- valgrind.spec
+++ valgrind.spec
@@ -18,7 +18,8 @@
Patch13: valgrind-3.5.0-amd64-adcsbb.patch
Patch14: valgrind-3.5.0-syscalls.patch
Patch15: valgrind-3.5.0-preadv.patch
-Patch16: valgrind-3.5.0-glibc-2.11.patch
+Patch16: valgrind-3.5.0-glibc-2.12.patch
+Patch17: valgrind-3.5.0-stat_h.patch
License: GPLv2
URL: http://www.valgrind.org/
Group: Development/Debuggers
@@ -88,6 +89,7 @@
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
%build
%ifarch x86_64 ppc64
other changes:
--------------
++++++ valgrind-3.5.0-glibc-2.11.patch -> valgrind-3.5.0-glibc-2.12.patch
--- valgrind-3.5.0-glibc-2.11.patch
+++ valgrind-3.5.0-glibc-2.12.patch
@@ -4,15 +4,15 @@
],
GLIBC_VERSION="2.10")
-+AC_EGREP_CPP([GLIBC_211], [
++AC_EGREP_CPP([GLIBC_212], [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
-+ GLIBC_211
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
++ GLIBC_212
+ #endif
+#endif
+],
-+GLIBC_VERSION="2.11")
++GLIBC_VERSION="2.12")
+
AC_EGREP_CPP([AIX5_LIBC], [
#include <standards.h>
@@ -21,9 +21,9 @@
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
-+ 2.11)
-+ AC_MSG_RESULT(2.11 family)
-+ AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.x])
++ 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}"
@@ -36,7 +36,7 @@
*)
AC_MSG_RESULT(unsupported version)
- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10])
-+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11])
++ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.12])
AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
AC_MSG_ERROR([or Darwin libc])
;;
@@ -46,8 +46,8 @@
/* Define to 1 if you're using glibc 2.10.x */
#undef GLIBC_2_10
-+/* 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
@@ -60,15 +60,15 @@
+#include <features.h>
+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
-+ GLIBC_211
++ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
++ GLIBC_212
+ #endif
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+ $EGREP "GLIBC_211" >/dev/null 2>&1; then
-+ GLIBC_VERSION="2.11"
++ $EGREP "GLIBC_212" >/dev/null 2>&1; then
++ GLIBC_VERSION="2.12"
+fi
+rm -f conftest*
+
@@ -87,12 +87,12 @@
DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
;;
-+ 2.11)
-+ echo "$as_me:$LINENO: result: 2.11 family" >&5
-+echo "${ECHO_T}2.11 family" >&6
++ 2.12)
++ echo "$as_me:$LINENO: result: 2.12 family" >&5
++echo "${ECHO_T}2.12 family" >&6
+
+cat >>confdefs.h <<\_ACEOF
-+#define GLIBC_2_11 1
++#define GLIBC_2_12 1
+_ACEOF
+
+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
@@ -108,8 +108,8 @@
echo "${ECHO_T}unsupported version" >&6
- { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.10" >&5
-echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.10" >&2;}
-+ { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.11" >&5
-+echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.11" >&2;}
++ { { echo "$as_me:$LINENO: error: Valgrind requires glibc version 2.2 - 2.12" >&5
++echo "$as_me: error: Valgrind requires glibc version 2.2 - 2.12" >&2;}
{ (exit 1); exit 1; }; }
{ { echo "$as_me:$LINENO: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&5
echo "$as_me: error: or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" >&2;}
++++++ valgrind-3.5.0-stat_h.patch (new)
--- valgrind-3.5.0-stat_h.patch
+++ valgrind-3.5.0-stat_h.patch
+--- valgrind-3.5.0/include/vki/vki-x86-linux.h 2010-07-22 13:36:42.000000000 +0800
++++ valgrind/include/vki/vki-x86-linux.h 2010-07-22 15:24:31.619487040 +0800
+@@ -346,6 +346,9 @@
+ unsigned short st_gid;
+ unsigned long st_rdev;
+ unsigned long st_size;
++#undef st_atime
++#undef st_mtime
++#undef st_ctime
+ unsigned long st_blksize;
+ unsigned long st_blocks;
+ unsigned long st_atime;
More information about the MeeGo-commits
mailing list