summaryrefslogtreecommitdiffstats
path: root/src/build
diff options
context:
space:
mode:
authorPatrick Williams <iawillia@us.ibm.com>2014-02-17 17:29:55 -0600
committerA. Patrick Williams III <iawillia@us.ibm.com>2014-02-27 11:38:43 -0600
commit941d3e56f1f933dba3f98c3f82fae0561a5201e7 (patch)
treef8f907280d7176c83685739ca03797eb822bbfe9 /src/build
parent0f33e04d51a9ad3e37fa40db8970f166ff84432e (diff)
downloadtalos-hostboot-941d3e56f1f933dba3f98c3f82fae0561a5201e7.tar.gz
talos-hostboot-941d3e56f1f933dba3f98c3f82fae0561a5201e7.zip
Clean up beam errors in core.
Change-Id: I695a38ae88583a052cae19b930eb53171f8fab2b RTC:94993 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9050 Tested-by: Jenkins Server Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com> Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/build')
-rw-r--r--src/build/beam/core/assert.C24
-rw-r--r--src/build/beam/core/heapmgr.C23
-rw-r--r--src/build/beam/core/pagemgr.C24
-rw-r--r--src/build/beam/core/ptmgr.C24
-rw-r--r--src/build/beam/core/stacksegment.C23
-rw-r--r--src/build/beam/i2c/i2c.C23
-rw-r--r--src/build/mkrules/beam.env.mk11
7 files changed, 150 insertions, 2 deletions
diff --git a/src/build/beam/core/assert.C b/src/build/beam/core/assert.C
new file mode 100644
index 000000000..83cee0318
--- /dev/null
+++ b/src/build/beam/core/assert.C
@@ -0,0 +1,24 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/build/beam/core/assert.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2014 */
+/* */
+/* 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 */
+>>>ERROR5___assert_d9b551657c952063
+>>>ERROR5___assert_941b08c17c952063
diff --git a/src/build/beam/core/heapmgr.C b/src/build/beam/core/heapmgr.C
new file mode 100644
index 000000000..9a9cfb39f
--- /dev/null
+++ b/src/build/beam/core/heapmgr.C
@@ -0,0 +1,23 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/build/beam/core/heapmgr.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2014 */
+/* */
+/* 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 */
+>>>MISTAKE1__coalesce_4286eea91505
diff --git a/src/build/beam/core/pagemgr.C b/src/build/beam/core/pagemgr.C
new file mode 100644
index 000000000..1007dee77
--- /dev/null
+++ b/src/build/beam/core/pagemgr.C
@@ -0,0 +1,24 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/build/beam/core/pagemgr.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2014 */
+/* */
+/* 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 */
+>>>MISTAKE5__initialize_7639026bb95510e7
+>>>MISTAKE5__initialize_2d381016b95510e7
diff --git a/src/build/beam/core/ptmgr.C b/src/build/beam/core/ptmgr.C
new file mode 100644
index 000000000..96c9c64e9
--- /dev/null
+++ b/src/build/beam/core/ptmgr.C
@@ -0,0 +1,24 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/build/beam/core/ptmgr.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2014 */
+/* */
+/* 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 */
+>>>MISTAKE1_getAccessType_902999ce1505
+>>>MISTAKE1_writePTE_70ad5a471505
diff --git a/src/build/beam/core/stacksegment.C b/src/build/beam/core/stacksegment.C
new file mode 100644
index 000000000..04649d98b
--- /dev/null
+++ b/src/build/beam/core/stacksegment.C
@@ -0,0 +1,23 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/build/beam/core/stacksegment.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2014 */
+/* */
+/* 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 */
+>>>ERROR8_~StackSegment_b791f4a2ac177b6
diff --git a/src/build/beam/i2c/i2c.C b/src/build/beam/i2c/i2c.C
new file mode 100644
index 000000000..91e35f18b
--- /dev/null
+++ b/src/build/beam/i2c/i2c.C
@@ -0,0 +1,23 @@
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/build/beam/i2c/i2c.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2014 */
+/* */
+/* 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 */
+>>>MISTAKE17_i2cSetupMasters_8697e17e1505
diff --git a/src/build/mkrules/beam.env.mk b/src/build/mkrules/beam.env.mk
index 71a64cccc..d5888903f 100644
--- a/src/build/mkrules/beam.env.mk
+++ b/src/build/mkrules/beam.env.mk
@@ -5,7 +5,7 @@
#
# IBM CONFIDENTIAL
#
-# COPYRIGHT International Business Machines Corp. 2013
+# COPYRIGHT International Business Machines Corp. 2013,2014
#
# p1
#
@@ -31,8 +31,10 @@ BEAMCMD = $(HOST_PREFIX)jail $(BEAMPATH)/bin/beam_compile
ifdef MODULE
BEAMDIR = $(ROOTPATH)/obj/beam/$(MODULE)
+BEAMMODULE = $(MODULE)
else
BEAMDIR = $(ROOTPATH)/obj/beam/core
+BEAMMODULE = core
endif
## Set BEAM source files.
@@ -43,7 +45,12 @@ BEAMFLAGS += --beam::source=$(ROOTPATH)/src/build/beam/compiler_c_config.tcl
BEAMFLAGS += --beam::source=$(ROOTPATH)/src/build/beam/compiler_cpp_config.tcl
## point to a directory that BEAM can use for its' working files.
-BEAMFLAGS += --beam::data=${BEAMDIR}
+BEAMFLAGS += --beam::data=$(BEAMDIR)
+
+## point BEAM to the potential innocent directory for a module.
+BEAM_INNOCENT = $(ROOTPATH)/src/build/beam/$(BEAMMODULE)
+BEAMFLAGS += $(if $(wildcard $(BEAM_INNOCENT)), \
+ --beam::user_innocent=$(BEAM_INNOCENT))
## tell the "Edison" compiler to generate no warnings.
BEAMFLAGS += --edg=--no_warnings
OpenPOWER on IntegriCloud