summaryrefslogtreecommitdiff
path: root/valgrind/valgrind.diff
blob: eb285965692671d20bcf81707a8f657879f650af (plain)
    1 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
    2 http://cvs.fedoraproject.org/viewvc/rpms/valgrind/devel/valgrind-3.5.0-glibc-2.12.patch?view=log
    3 
    4 http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-util/valgrind/files/valgrind-3.5.0-stat_h.patch?revision=1.1
    5 http://cvs.fedoraproject.org/viewvc/rpms/valgrind/devel/valgrind-3.5.0-stat_h.patch?view=log
    6 
    7 --- configure.in
    8 +++ configure.in
    9 @@ -666,6 +666,16 @@ AC_EGREP_CPP([GLIBC_211], [
   10  ],
   11  GLIBC_VERSION="2.11")
   12  
   13 +AC_EGREP_CPP([GLIBC_212], [
   14 +#include <features.h>
   15 +#ifdef __GNU_LIBRARY__
   16 + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 12)
   17 +  GLIBC_212
   18 + #endif
   19 +#endif
   20 +],
   21 +GLIBC_VERSION="2.12")
   22 +
   23  AC_EGREP_CPP([AIX5_LIBC], [
   24  #include <standards.h>
   25  #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
   26 @@ -759,6 +769,13 @@ case "${GLIBC_VERSION}" in
   27  	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
   28  	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
   29  	;;
   30 +     2.12)
   31 +	AC_MSG_RESULT(2.12 family)
   32 +	AC_DEFINE([GLIBC_2_12], 1, [Define to 1 if you're using glibc 2.12.x])
   33 +	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
   34 +	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
   35 +	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
   36 +	;;
   37       aix5)
   38  	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
   39  	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
   40 --- config.h.in
   41 +++ config.h.in
   42 @@ -18,6 +18,9 @@
   43  /* Define to 1 if you're using glibc 2.11.x */
   44  #undef GLIBC_2_11
   45  
   46 +/* Define to 1 if you're using glibc 2.12.x */
   47 +#undef GLIBC_2_12
   48 +
   49  /* Define to 1 if you're using glibc 2.2.x */
   50  #undef GLIBC_2_2
   51  
   52 
   53 --- include/vki/vki-amd64-linux.h
   54 +++ include/vki/vki-amd64-linux.h
   55 @@ -310,6 +310,9 @@ struct vki_stat {
   56  	long		st_blksize;
   57  	long		st_blocks;	/* Number 512-byte blocks allocated. */
   58  
   59 +#undef st_atime
   60 +#undef st_mtime
   61 +#undef st_ctime
   62  	unsigned long	st_atime;
   63  	unsigned long 	st_atime_nsec; 
   64  	unsigned long	st_mtime;
   65 --- include/vki/vki-x86-linux.h
   66 +++ include/vki/vki-x86-linux.h
   67 @@ -348,6 +348,9 @@ struct vki_stat {
   68  	unsigned long  st_size;
   69  	unsigned long  st_blksize;
   70  	unsigned long  st_blocks;
   71 +#undef st_atime
   72 +#undef st_mtime
   73 +#undef st_ctime
   74  	unsigned long  st_atime;
   75  	unsigned long  st_atime_nsec;
   76  	unsigned long  st_mtime;
   77 --- include/vki/vki-ppc32-linux.h
   78 +++ include/vki/vki-ppc32-linux.h
   79 @@ -392,6 +392,9 @@ struct vki_stat {
   80     long			st_size;
   81     unsigned long	st_blksize;
   82     unsigned long	st_blocks;
   83 +#undef st_atime
   84 +#undef st_mtime
   85 +#undef st_ctime
   86     unsigned long	st_atime;
   87     unsigned long	st_atime_nsec;
   88     unsigned long	st_mtime;
   89 --- include/vki/vki-ppc64-linux.h
   90 +++ include/vki/vki-ppc64-linux.h
   91 @@ -428,6 +428,9 @@ struct vki_stat {
   92    long            st_size;
   93    unsigned long   st_blksize;
   94    unsigned long   st_blocks;
   95 +#undef st_atime
   96 +#undef st_mtime
   97 +#undef st_ctime
   98    unsigned long   st_atime;
   99    unsigned long   st_atime_nsec;
  100    unsigned long   st_mtime;

Generated by cgit