From a8fb48155dcab207b59a3b5cd16c29264d0ba254 Mon Sep 17 00:00:00 2001
From: prashanthacharya <prashanthacharya@in.ibm.com>
Date: Tue, 18 Dec 2012 22:57:14 -0600
Subject: Add gdb support for PRD simulator

simulator needs to be debugged under mcp7 jailed environment, and ddd is not
supported under jailed environment, hence changes has been added to simulator
script to support gdb using simulators -debug option, also an option(-D no_opt)
has been added to simulator makefile to override default compiler optimization
level.

RTC: 60472
Change-Id: I71ee845df23bdd0b5603b923364267b60f571475
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2749
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2868
---
 config.mk                                 | 23 ++++++++++++----------
 src/usr/diag/prdf/framework/rule/makefile | 32 +++++++++++++++----------------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/config.mk b/config.mk
index 19194cc25..7693da874 100644
--- a/config.mk
+++ b/config.mk
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
+#
 # $Source: config.mk $
-# 
+#
 # IBM CONFIDENTIAL
-# 
-# COPYRIGHT International Business Machines Corp. 2010,2012
-# 
+#
+# COPYRIGHT International Business Machines Corp. 2010,2013
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 all:
 	${MAKE} gen_pass
 	${MAKE} code_pass
@@ -87,6 +87,9 @@ endif
 endif
 endif
 
+# Current MCP version
+MCP_VER = mcp6
+
 TRACEPP = ${ROOTPATH}/src/build/trace/tracepp
 CUSTOM_LINKER_EXE = ${ROOTPATH}/src/build/linker/linker
 CUSTOM_LINKER = i686-mcp6-jail ${CUSTOM_LINKER_EXE}
diff --git a/src/usr/diag/prdf/framework/rule/makefile b/src/usr/diag/prdf/framework/rule/makefile
index 4c7f25989..c96123506 100755
--- a/src/usr/diag/prdf/framework/rule/makefile
+++ b/src/usr/diag/prdf/framework/rule/makefile
@@ -1,25 +1,25 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
-# 
-# $Source: src/usr/diag/prdf/framework/rule/makefile $
-# 
+#
+# $Source: framework/rule/makefile $
+#
 # IBM CONFIDENTIAL
-# 
-# COPYRIGHT International Business Machines Corp. 2012
-# 
+#
+# COPYRIGHT International Business Machines Corp. 2012,2013
+#
 # p1
-# 
+#
 # Object Code Only (OCO) source materials
 # Licensed Internal Code Source Materials
 # IBM HostBoot Licensed Internal Code
-# 
+#
 # The source code for this program is not published or otherwise
 # divested of its trade secrets, irrespective of what has been
 # deposited with the U.S. Copyright Office.
-# 
+#
 # Origin: 30
-# 
-# IBM_PROLOG_END_TAG 
+#
+# IBM_PROLOG_END_TAG
 
 ROOTPATH = ../../../../../..
 
@@ -98,20 +98,20 @@ ${PRDR_CMP_FLEX_C_PATH}: ${PRDR_CMP_FLEX}
 USERDEFINES = -D__HOSTBOOT_MODULE -O3 -pipe
 
 ${PRDR_CMP_YACC_o_PATH}: ${PRDR_CMP_YACC_C_PATH} ${PRDR_CMP_YACC_H_PATH}
-	i686-mcp6-g++ -c $(USERDEFINES) $< \
+	i686-$(MCP_VER)-g++ -c $(USERDEFINES) $< \
 		-I ${PRD_USR_PATH}/common/framework/rule \
 		-I ${PRD_USR_PATH}/common/util -I ${RULEOBJDIR} \
 		-o $@
 
 ${PRDR_CMP_FLEX_o_PATH}: ${PRDR_CMP_FLEX_C_PATH} ${PRDR_CMP_YACC_H_PATH}
-	i686-mcp6-g++ -c $(USERDEFINES) $< \
+	i686-$(MCP_VER)-g++ -c $(USERDEFINES) $< \
 		-I ${PRD_USR_PATH}/common/framework/rule \
 		-I ${PRD_USR_PATH}/common/util -I ${RULEOBJDIR} \
 		-o $@
 
 ${PRDR_CMP_o_PATH}: ${PRDR_CMP_C}
 	mkdir -p ${RULEOBJDIR}
-	i686-mcp6-g++ -c $(USERDEFINES) $< \
+	i686-$(MCP_VER)-g++ -c $(USERDEFINES) $< \
 		-I ${PRD_USR_PATH}/common/framework/rule \
 		-I ${PRD_USR_PATH}/common \
 		-I ${PRD_USR_PATH}/common/util \
@@ -122,7 +122,7 @@ ${PRDR_CMP_o_PATH}: ${PRDR_CMP_C}
 
 ${PRDR_CMP_PATH}: ${PRDR_CMP_YACC_o_PATH} ${PRDR_CMP_FLEX_o_PATH} \
 				  ${PRDR_CMP_o_PATH}
-	i686-mcp6-g++ $(USERDEFINES) \
+	i686-$(MCP_VER)-g++ $(USERDEFINES) \
 		${PRDR_CMP_YACC_o_PATH} ${PRDR_CMP_FLEX_o_PATH} ${PRDR_CMP_o_PATH} \
         -o $@
 
@@ -136,7 +136,7 @@ PRDRPP_SEARCHDIRS = -I../../common/plat/pegasus
 # Build .prf files from .rule files and store them in ${RULEOBJDIR}
 ${RULEOBJDIR}/%.prf : %.rule ${PRDR_CMP_PATH}
 	cat $< | ${PRD_USR_PATH}/common/framework/rule/prdrpp ${PRDRPP_SEARCHDIRS} \
-		   | i686-mcp6-jail ${PRDR_CMP_PATH} $@
+		   | i686-$(MCP_VER)-jail ${PRDR_CMP_PATH} $@
 
 # Copy all .prf files from ${RULEOBJDIR} to ${IMGDIR}
 ${EXTRA_PARTS}: ${IMGDIR}/% : ${RULEOBJDIR}/%
-- 
cgit v1.2.1