summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Nikoleris <nikos.nikoleris@arm.com>2017-01-27 15:07:20 -0600
committerNikos Nikoleris <nikos.nikoleris@arm.com>2017-01-27 15:07:20 -0600
commit227bdde922e919771e8702fc422461df4f1d317d (patch)
tree446e5b56d29554d80342e79e475722406a4c3ffb
parente4c57275d38c864798cb04a4644bac90a83572fd (diff)
downloadgem5-227bdde922e919771e8702fc422461df4f1d317d.tar.xz
proto: Fix warnings for protoc v3
protoc v3 introduces a new syntax for proto files and warns when the syntax is not explicitly stated. protoc relies on the fact that undefined preprocessor symbols are explanded to 0 but since we use -Wundef they end up generating warnings. Change-Id: If07abeb54e932469c8f2c4d38634a97fdae40f77 Reviewed-by: Andreas Hansson <andreas.hansson@arm.com> Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Signed-off-by: Jason Lowe-Power <jason@lowepower.com>
-rw-r--r--src/proto/SConscript7
-rw-r--r--src/proto/inst.proto3
-rw-r--r--src/proto/inst_dep_record.proto4
-rw-r--r--src/proto/packet.proto4
4 files changed, 14 insertions, 4 deletions
diff --git a/src/proto/SConscript b/src/proto/SConscript
index ef6bc2aca..665d16493 100644
--- a/src/proto/SConscript
+++ b/src/proto/SConscript
@@ -1,6 +1,6 @@
# -*- mode:python -*-
-# Copyright (c) 2012 ARM Limited
+# Copyright (c) 2012,2017 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -45,3 +45,8 @@ if env['HAVE_PROTOBUF']:
ProtoBuf('packet.proto')
ProtoBuf('inst.proto')
Source('protoio.cc')
+
+ # protoc relies on the fact that undefined preprocessor symbols are
+ # explanded to 0 but since we use -Wundef they end up generating
+ # warnings.
+ env.Append(CCFLAGS='-DPROTOBUF_INLINE_NOT_IN_HEADERS=0')
diff --git a/src/proto/inst.proto b/src/proto/inst.proto
index 3e8dcde8b..5ef266455 100644
--- a/src/proto/inst.proto
+++ b/src/proto/inst.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 ARM Limited
+// Copyright (c) 2014,2017 ARM Limited
// All rights reserved
//
// The license below extends only to copyright in the software and shall
@@ -35,6 +35,7 @@
//
// Authors: Ali Saidi
+syntax = "proto2";
// Put all the generated messages in a namespace
package ProtoMessage;
diff --git a/src/proto/inst_dep_record.proto b/src/proto/inst_dep_record.proto
index f89e51d81..808837e12 100644
--- a/src/proto/inst_dep_record.proto
+++ b/src/proto/inst_dep_record.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 ARM Limited
+// Copyright (c) 2013,2017 ARM Limited
// All rights reserved
//
// The license below extends only to copyright in the software and shall
@@ -35,6 +35,8 @@
//
// Authors: Radhika Jagtap
+syntax = "proto2";
+
// Put all the generated messages in a namespace
package ProtoMessage;
diff --git a/src/proto/packet.proto b/src/proto/packet.proto
index c07206742..53f69e533 100644
--- a/src/proto/packet.proto
+++ b/src/proto/packet.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2013 ARM Limited
+// Copyright (c) 2012-2013,2017 ARM Limited
// All rights reserved
//
// The license below extends only to copyright in the software and shall
@@ -35,6 +35,8 @@
//
// Authors: Andreas Hansson
+syntax = "proto2";
+
// Put all the generated messages in a namespace
package ProtoMessage;