commit 31b6aa1141750c0db5b21becd3ec7194298467c1
author Dan Albert <danalbert@google.com> Tue Feb 24 19:51:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 24 19:51:16 2015 +0000
tree 3196a7f8af6ae74c60a9f702bac90665fbd8355d
parent 43541adc067ca6447a6f1c840c3262b9f558fe3c
parent 39e3915d410f13d5cafdef2598676c0f58477306

am 39e3915d: Merge "Suppress int-to-pointer-cast warnings."

* commit '39e3915d410f13d5cafdef2598676c0f58477306':
  Suppress int-to-pointer-cast warnings.

src/tools/perf/Android.mk

diff --git a/src/tools/perf/Android.mk b/src/tools/perf/Android.mk
index a6cc3f4..e5a0012 100644
--- a/src/tools/perf/Android.mk
+++ b/src/tools/perf/Android.mk
@@ -140,7 +140,6 @@
     -std=gnu99 \
     -Wno-attributes \
     -Wno-implicit-function-declaration \
-    -Wno-int-to-pointer-cast \
     -Wno-maybe-uninitialized \
     -Wno-missing-field-initializers \
     -Wno-pointer-arith \

src/tools/perf/util/parse-events-bison.c

diff --git a/src/tools/perf/util/parse-events-bison.c b/src/tools/perf/util/parse-events-bison.c
index eb918da..44364d6 100644
--- a/src/tools/perf/util/parse-events-bison.c
+++ b/src/tools/perf/util/parse-events-bison.c
@@ -1717,7 +1717,7 @@
 
 	ALLOC_LIST(list);
 	ABORT_ON(parse_events_add_breakpoint(list, &data->idx,
-					     (void *) (yyvsp[(2) - (5)].num), (yyvsp[(4) - (5)].str)));
+					     (void *)(uintptr_t) (yyvsp[(2) - (5)].num), (yyvsp[(4) - (5)].str)));
 	(yyval.head) = list;
 }
     break;
@@ -1732,7 +1732,7 @@
 
 	ALLOC_LIST(list);
 	ABORT_ON(parse_events_add_breakpoint(list, &data->idx,
-					     (void *) (yyvsp[(2) - (3)].num), NULL));
+					     (void *)(uintptr_t) (yyvsp[(2) - (3)].num), NULL));
 	(yyval.head) = list;
 }
     break;