Fix BEAM IPA analysis and errors.

Change-Id: I5b70acbb67581728e077816b822ecbbf6cbe07f6
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/9781
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 8 insertions, 72 deletions

diff --git a/src/build/beam/beam_parms.tcl b/src/build/beam/beam_parms.tcl
index b3f7a63da..7a4eccdad 100644
--- a/src/build/beam/beam_parms.tcl
+++ b/src/build/beam/beam_parms.tcl
@@ -28,6 +28,10 @@ source beam_min_parms.tcl
 
 set beam::max_time_per_kloc_in_sec "60"
 
+# Allow empty functions to be considered 'stubs' and not report 'no effect'
+# errors.
+set beam::stub_function_contents "return_constant"
+
 set allocateAnchored {allocator (anchored,
                       return_index=return) }
 
diff --git a/src/build/beam/core/heapmgr.C b/src/build/beam/core/heapmgr.C
deleted file mode 100644
index 9a9cfb39f..000000000
--- a/src/build/beam/core/heapmgr.C
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 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/ptmgr.C b/src/build/beam/core/ptmgr.C
deleted file mode 100644
index 96c9c64e9..000000000
--- a/src/build/beam/core/ptmgr.C
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 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/hwas/deconfigGard.C b/src/build/beam/hwas/deconfigGard.C
deleted file mode 100644
index 3c040f762..000000000
--- a/src/build/beam/hwas/deconfigGard.C
+++ /dev/null
@@ -1,23 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/build/beam/hwas/deconfigGard.C $                          */
-/*                                                                        */
-/* IBM CONFIDENTIAL                                                       */
-/*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2011,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__deconfigureTarget_80f954241505
diff --git a/src/build/mkrules/beam.env.mk b/src/build/mkrules/beam.env.mk
index 15c108130..dc0814dd1 100644
--- a/src/build/mkrules/beam.env.mk
+++ b/src/build/mkrules/beam.env.mk
@@ -25,8 +25,9 @@
 # Description:
 #     Configuration of the BEAM settings.
 
+AFSCELL := austin
 BEAMVER = beam-3.6.1
-BEAMPATH = /afs/rch/projects/esw/beam/$(BEAMVER)
+BEAMPATH = /afs/${AFSCELL}/projects/esw/beam/$(BEAMVER)
 BEAMCMD = $(HOST_PREFIX)jail $(BEAMPATH)/bin/beam_compile
 
 ifdef MODULE
@@ -44,7 +45,8 @@ 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)/..
+BEAMFLAGS += --beam::build_root=$(ROOTPATH)
 
 ##  point BEAM to the potential innocent directory for a module.
 BEAM_INNOCENT = $(ROOTPATH)/src/build/beam/$(BEAMMODULE)