From 9810fc67ed9d1380adfc1b60a6946f023ce60a5e Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@google.com>
Date: Mon, 1 May 2017 22:05:00 -0700
Subject: scons: Use the generalized switching headers on the GPU ISA.

Now that the switching header implementation has been generalized, there's
no need to have two nearly identical implementations for the two different
groups of headers.

Change-Id: Ie7c24fcddbc672ac5ca2d69bfc35696f42c55580
Reviewed-on: https://gem5-review.googlesource.com/2984
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Curtis Dunham <curtis.dunham@arm.com>
Reviewed-by: Tony Gutierrez <anthony.gutierrez@amd.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
---
 src/arch/SConscript | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/arch')

diff --git a/src/arch/SConscript b/src/arch/SConscript
index 891a5a29a..ea940560d 100644
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -67,13 +67,13 @@ env.SwitchingHeaders(
     env.subst('${TARGET_ISA}'))
 
 if env['BUILD_GPU']:
-    gpu_isa_switch_hdrs = Split('''
+    env.SwitchingHeaders(
+        Split('''
             gpu_decoder.hh
             gpu_isa.hh
             gpu_types.hh
-            ''')
-
-    make_gpu_switching_dir('arch', gpu_isa_switch_hdrs, env)
+            '''),
+        env.subst('${TARGET_GPU_ISA}'))
 
 #################################################################
 #
-- 
cgit v1.2.3