summaryrefslogtreecommitdiff
path: root/src/arch/arm
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:17 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:17 -0500
commitf8d2ed708b94506e52fdbf823845b2abb6a0cc61 (patch)
treeb23ad5060ae6b9ed43e8a82dae39fe22c8e81d3c /src/arch/arm
parent0c574987c8246fa581b5018be9c8d56d5a9e4e19 (diff)
downloadgem5-f8d2ed708b94506e52fdbf823845b2abb6a0cc61.tar.xz
ARM: Get rid of the empty branch.cc.
Diffstat (limited to 'src/arch/arm')
-rw-r--r--src/arch/arm/SConscript1
-rw-r--r--src/arch/arm/insts/branch.cc35
2 files changed, 0 insertions, 36 deletions
diff --git a/src/arch/arm/SConscript b/src/arch/arm/SConscript
index 6b13b4b74..7708bbc04 100644
--- a/src/arch/arm/SConscript
+++ b/src/arch/arm/SConscript
@@ -48,7 +48,6 @@ if env['TARGET_ISA'] == 'arm':
# Scons bug id: 2006 M5 Bug id: 308
Dir('isa/formats')
Source('faults.cc')
- Source('insts/branch.cc')
Source('insts/macromem.cc')
Source('insts/mem.cc')
Source('insts/misc.cc')
diff --git a/src/arch/arm/insts/branch.cc b/src/arch/arm/insts/branch.cc
deleted file mode 100644
index 87a89cc4f..000000000
--- a/src/arch/arm/insts/branch.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (c) 2007-2008 The Florida State University
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Stephen Hines
- */
-
-#include "arch/arm/insts/branch.hh"
-#include "base/loader/symtab.hh"
-
-namespace ArmISA
-{
-}