View | Details | Raw Unified | Return to bug 244234
Collapse All | Expand All

(-)devel/valgrind/files/patch-VEX_auxprogs_genoffsets.c (+11 lines)
Line 0 Link Here
1
--- VEX/auxprogs/genoffsets.c	2016-01-13 19:20:20 UTC
2
+++ VEX/auxprogs/genoffsets.c
3
@@ -59,7 +59,7 @@
4
 #define VG_STRINGIFZ(__str)  #__str
5
 #define VG_STRINGIFY(__str)  VG_STRINGIFZ(__str)
6
 
7
-#define my_offsetof(__type,__field) (&((__type*)0)->__field)
8
+#define my_offsetof(__type,__field) offsetof(__type,__field)
9
 
10
 /* This forces gcc to evaluate the my_offsetof call at compile time,
11
    and then emits it in the assembly, along with the nonsense string
(-)devel/valgrind/files/patch-configure.ac (-15 / +13 lines)
Lines 1-23 Link Here
1
--- configure.ac.orig	2016-01-13 19:20:20 UTC
1
--- configure.ac.orig	2016-01-13 19:20:20 UTC
2
+++ configure.ac
2
+++ configure.ac
3
@@ -145,7 +145,19 @@
3
@@ -136,16 +136,10 @@
4
      notclang-5.*)
4
 AM_CONDITIONAL(COMPILER_IS_CLANG, test $is_clang = clang)
5
 
6
 case "${is_clang}-${gcc_version}" in
7
-     notclang-3.*)
8
+     notclang-[[3-9]].*|notclang-[[1-9]][[0-9]]*)
5
 	AC_MSG_RESULT([ok (${gcc_version})])
9
 	AC_MSG_RESULT([ok (${gcc_version})])
6
 	;;
10
 	;;
11
-     notclang-4.*)
12
-	AC_MSG_RESULT([ok (${gcc_version})])
13
-	;;
14
-     notclang-5.*)
15
-	AC_MSG_RESULT([ok (${gcc_version})])
16
-	;;
7
-     clang-2.9|clang-3.*|clang-4.*)
17
-     clang-2.9|clang-3.*|clang-4.*)
8
+     notclang-6.*)
18
+     clang-2.9|clang-[[3-9]].*|clang-[[1-9]][[0-9]]*)
9
+	AC_MSG_RESULT([ok (${gcc_version})])
10
+	;;
11
+     notclang-7.*)
12
+	AC_MSG_RESULT([ok (${gcc_version})])
13
+	;;
14
+     notclang-8.*)
15
+	AC_MSG_RESULT([ok (${gcc_version})])
16
+	;;
17
+     notclang-9.*)
18
+	AC_MSG_RESULT([ok (${gcc_version})])
19
+	;;
20
+     clang-2.9|clang-[[3-9]].*)
21
 	AC_MSG_RESULT([ok (clang-${gcc_version})])
19
 	AC_MSG_RESULT([ok (clang-${gcc_version})])
22
 	;;
20
 	;;
23
      *)
21
      *)

Return to bug 244234