Changes for GCC 4.9 and OP

Change-Id: I95ddff4b290fcf3eab617a674afc489698c78a1e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31563
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>

19 files changed, 80 insertions, 89 deletions

diff --git a/src/Makefile b/src/Makefile
index b72cbc4..83e8994 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -42,7 +42,7 @@ export PPETOOLS_OBJDIR = $(abspath ../obj/ppetools)
 endif
 
 ifndef TRACEPP_DIR
-export TRACEPP_DIR = $(abspath tracepp)
+export TRACEPP_DIR = $(abspath tools/tracepp)
 endif
 
 ifndef PK_SRCDIR
@@ -63,7 +63,6 @@ COMBINEIMAGE = $(MAKE) combineImage -C $(dir)
 IMAGEFILE = $(OBJDIR)/image.bin
 
 NEEDED_IMAGES = \
-     $(TRACEPP_DIR)/tracepp \
      $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(IMAGE_HDR_SCRIPT) \
      $(OBJDIR)/$(OCC_405_IMAGE_NAME)/$(OCC_405_IMAGE_NAME).out \
      $(OBJDIR)/$(OCC_GPE0_IMAGE_NAME)/$(OCC_GPE0_IMAGE_NAME).out \
@@ -74,7 +73,7 @@ NEEDED_IMAGES = \
 all: ppetools $(NEEDED_IMAGES) combineImage tracehash
 
 .PHONY: ppetools
-ppetools: $(PPETOOLS_OBJDIR)/ppetracepp $(PPETOOLS_OBJDIR)/ppe2fsp
+ppetools: $(PPETOOLS_OBJDIR)/ppetracepp $(PPETOOLS_OBJDIR)/ppe2fsp $(PPETOOLS_OBJDIR)/tracepp
 
 $(PPETOOLS_OBJDIR)/ppetracepp: $(PPETOOLS_OBJDIR)
 	g++ -O3 -w -g -I$(PPETRACEPP_DIR)/ $(PPETRACEPP_DIR)/ppetracepp.C -o $(PPETOOLS_OBJDIR)/ppetracepp
@@ -103,7 +102,6 @@ combineImage: $(NEEDED_IMAGES)
 .PHONY : clean
 clean:
 	rm -fr $(OBJDIR)
-	rm -f $(TRACEPP_DIR)/tracepp
 
 # Make binary application images
 .PHONY : $(OBJDIR)/$(OCC_405_IMAGE_NAME)/$(OCC_405_IMAGE_NAME).out
@@ -122,7 +120,7 @@ $(OBJDIR)/$(OCC_GPE1_IMAGE_NAME)/$(OCC_GPE1_IMAGE_NAME).out:
 $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(OCC_BOOTLOADER_NAME).out $(OBJDIR)/$(OCC_BOOTLOADER_DIR_NAME)/$(IMAGE_HDR_SCRIPT):
 	(cd $(SRCDIR)/$(OCC_BOOTLOADER_DIR_NAME) && make)
 
-$(TRACEPP_DIR)/tracepp:
+$(PPETOOLS_OBJDIR)/tracepp:
 	(cd $(TRACEPP_DIR) && make)
 
 # collect all of the trace hash files for all OCC images into a single trexStringFile
diff --git a/src/include/core_data.h b/src/include/core_data.h
index c3286eb..d3b3078 100644
--- a/src/include/core_data.h
+++ b/src/include/core_data.h
@@ -104,7 +104,6 @@ typedef struct
 {
     sensor_result_t core[2];
     sensor_result_t cache[2];
-    sensor_result_t reserved;
 } CoreDataDts;
 
 
diff --git a/src/lib/ppc405lib/libppc405files.mk b/src/lib/ppc405lib/libppc405files.mk
index 17028d1..1f0df2f 100644
--- a/src/lib/ppc405lib/libppc405files.mk
+++ b/src/lib/ppc405lib/libppc405files.mk
@@ -39,13 +39,8 @@ C-SOURCES = \
 	sprintf.c \
 	ssx_dump.c \
 	ssx_io.c \
-	stdlib.c \
 	strcasecmp.c \
-	strdup.c \
-	string.c \
-	string_stream.c \
-	strtox.c \
-	time.c
+	string_stream.c
 
 S-SOURCES =  
 
diff --git a/src/occBootLoader/bootMain.c b/src/occBootLoader/bootMain.c
index 89ea20a..15d12fa 100755
--- a/src/occBootLoader/bootMain.c
+++ b/src/occBootLoader/bootMain.c
@@ -84,7 +84,6 @@ void main()
     uint32_t l_rc = 0;
     uint32_t l_gpe0_start_addr = 0;
     uint32_t l_gpe1_start_addr = 0;
-    uint32_t l_gpe_size = 0;
     uint8_t* l_gpe0_src_ptr = 0;
     uint8_t* l_gpe1_src_ptr = 0;
 
diff --git a/src/occBootLoader/img_defs.mk b/src/occBootLoader/img_defs.mk
index 7b33b90..b32ef79 100644
--- a/src/occBootLoader/img_defs.mk
+++ b/src/occBootLoader/img_defs.mk
@@ -114,8 +114,12 @@ export OCC405_INCLDIR = $(OCC405_SRCDIR)/incl
 endif
 
 ifndef GCC-TOOL-PREFIX
+ifdef CROSS_PREFIX
+GCC-TOOL-PREFIX = $(CROSS_PREFIX)
+else
 GCC-TOOL-PREFIX = $(CTEPATH)/tools/ppcgcc/prod/bin/powerpc-linux-
 endif
+endif
 
 ifndef PPETRACEPP_DIR
 export PPETRACEPP_DIR = $(abspath ../ppe/tools/ppetracepp)
@@ -126,12 +130,12 @@ export PPETOOLS_OBJDIR = $(abspath ../../obj/ppetools)
 endif
 
 ifndef TRACEPP_DIR
-export TRACEPP_DIR = $(abspath ../tracepp)
+export TRACEPP_DIR = $(abspath ../tools/tracepp)
 endif
 
 CC_ASM  = $(GCC-TOOL-PREFIX)gcc
 TCC     = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
-THCC    = $(TRACEPP_DIR)/tracepp $(GCC-TOOL-PREFIX)gcc
+THCC    = $(PPETOOLS_OBJDIR)/tracepp $(GCC-TOOL-PREFIX)gcc
 CC      = $(GCC-TOOL-PREFIX)gcc
 AS      = $(GCC-TOOL-PREFIX)as
 AR      = $(GCC-TOOL-PREFIX)ar
diff --git a/src/occ_405/Makefile b/src/occ_405/Makefile
index 716af1f..ccd0c8b 100755
--- a/src/occ_405/Makefile
+++ b/src/occ_405/Makefile
@@ -79,14 +79,10 @@ $(OBJDIR)/$(IMAGE_NAME).bin $(OBJDIR)/$(IMAGE_NAME).dis: $(OBJDIR)/$(IMAGE_NAME)
 	$(OBJCOPY) -O binary  $< $(OBJDIR)/$(IMAGE_NAME).bin
 	$(OBJDUMP) -S $< > $(OBJDIR)/$(IMAGE_NAME).dis
 
-#create a linked ELF executable
-$(OBJDIR)/$(IMAGE_NAME).out: $(TRACEPP_DIR)/tracepp $(LINK_OBJS) $(LINK_SCRIPT) check-sensors
+# Create a linked ELF executable and verify we aren't missing sensors
+$(OBJDIR)/$(IMAGE_NAME).out: $(PPETOOLS_OBJDIR)/tracepp $(LINK_OBJS) $(LINK_SCRIPT)
 	$(LD) -e __ssx_boot -T$(LINK_SCRIPT) $(LDFLAGS) -Map $(OBJDIR)/$(IMAGE_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_NAME).out $(LIB_DIRS) -lssx -locc -lppc405 -lcommon
-
-#Verifies that we aren't missing sensors in the sensor lists
-.PHONY : check-sensors
-check-sensors:
-	$(OCCTOOLS)/check-sensors.sh $(OBJDUMP) $(OBJDIR)/sensor/
+	$(OCCTOOLS)/check-sensors.sh $(OBJDUMP) $(OBJDIR)
 
 $(PPETOOLS_OBJDIR)/ppetracepp: $(PPETOOLS_OBJDIR)
 	g++ -O3 -w -g -I$(PPETRACEPP_DIR)/ $(PPETRACEPP_DIR)/ppetracepp.C -o $(PPETOOLS_OBJDIR)/ppetracepp
@@ -95,11 +91,9 @@ $(PPETOOLS_OBJDIR):
 	mkdir -p $(PPETOOLS_OBJDIR)
 
 #pass the link command file through the C preprocessor to evaluate macros and remove comments
-#$(LINK_SCRIPT): linkocc.cmd
 $(LINK_SCRIPT): $(LINK_CMD_SCRIPT)
 	$(CPP) -E -x c -P $(DEFS) $(LINK_CMD_SCRIPT) -o $(LINK_SCRIPT)
 
-
 #Create an obj directory if needed
 $(LINK_OBJS) $(OBJS) $(OBJS:.o=.d): | $(OBJDIRS)
 
@@ -122,7 +116,7 @@ $(OCCLIB):
 $(PPC405LIB):
 	$(MAKE) -I $(IMAGE_SRCDIR) -C $(PPC405LIB_SRCDIR)
 
-$(TRACEPP_DIR)/tracepp:
+$(PPETOOLS_OBJDIR)/tracepp:
 	(cd $(TRACEPP_DIR) && make)
 
 # collect all of the trace hash files for this image into a single trexStringFile
diff --git a/src/occ_405/amec/amec_freq.c b/src/occ_405/amec/amec_freq.c
index 1fcdf2f..a003dd1 100755
--- a/src/occ_405/amec/amec_freq.c
+++ b/src/occ_405/amec/amec_freq.c
@@ -545,6 +545,10 @@ void amec_slv_voting_box(void)
 // End Function Specification
 void amec_slv_freq_smh(void)
 {
+// TODO/TEMP: Remove '#if 0' when/if needed. Currently does nothing and
+//            causes warning of set but not used..
+#if 0
+
     /*------------------------------------------------------------------------*/
     /*  Local Variables                                                       */
     /*------------------------------------------------------------------------*/
@@ -572,7 +576,7 @@ void amec_slv_freq_smh(void)
     {
         // send an IPC with l_pstate to set pstates for all Cores
     }
-
+#endif
 }
 
 
diff --git a/src/occ_405/amec/amec_parm.c b/src/occ_405/amec/amec_parm.c
index a3dafd6..235bc0a 100755
--- a/src/occ_405/amec/amec_parm.c
+++ b/src/occ_405/amec/amec_parm.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -23,38 +23,37 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
-//*************************************************************************
+//*************************************************************************/
 // Includes
-//*************************************************************************
+//*************************************************************************/
 #include <common_types.h>
 #include <amec_parm.h>
 #include <string.h>
-#include <stdlib.h>
 #include <occ_common.h>
 #include <amec_amester.h>
 
-//*************************************************************************
+//*************************************************************************/
 // Externs
-//*************************************************************************
+//*************************************************************************/
 
-//*************************************************************************
+//*************************************************************************/
 // Defines/Enums
-//*************************************************************************
+//*************************************************************************/
 
-//*************************************************************************
+//*************************************************************************/
 // Globals
-//*************************************************************************
+//*************************************************************************/
 
 ///Array that maintains a list of all parameters built
 extern amec_parm_t              g_amec_parm_list[];
 
-//*************************************************************************
+//*************************************************************************/
 // Function Declarations
-//*************************************************************************
+//*************************************************************************/
 
-//*************************************************************************
+//*************************************************************************/
 // Functions
-//*************************************************************************
+//*************************************************************************/
 
 void amec_parm_get_number(const IPMIMsg_t *i_psMsg,
                           UINT8 *o_pu8Resp,
diff --git a/src/occ_405/img_defs.mk b/src/occ_405/img_defs.mk
index 45ab35d..2e3a4f3 100644
--- a/src/occ_405/img_defs.mk
+++ b/src/occ_405/img_defs.mk
@@ -110,8 +110,12 @@ export SSXLIB_SRCDIR = $(abspath ../lib/ssxlib)
 endif
 
 ifndef GCC-TOOL-PREFIX
+ifdef CROSS_PREFIX
+GCC-TOOL-PREFIX = $(CROSS_PREFIX)
+else
 GCC-TOOL-PREFIX = $(CTEPATH)/tools/ppcgcc/prod/bin/powerpc-linux-
 endif
+endif
 
 ifndef PPETRACEPP_DIR
 export PPETRACEPP_DIR = $(abspath ../ppe/tools/ppetracepp)
@@ -122,12 +126,12 @@ export PPETOOLS_OBJDIR = $(BASE_OBJDIR)/ppetools
 endif
 
 ifndef TRACEPP_DIR
-export TRACEPP_DIR = $(abspath ../tracepp)
+export TRACEPP_DIR = $(abspath ../tools/tracepp)
 endif
 
 CC_ASM  = $(GCC-TOOL-PREFIX)gcc
 TCC     = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
-THCC    = $(TRACEPP_DIR)/tracepp $(GCC-TOOL-PREFIX)gcc
+THCC    = $(PPETOOLS_OBJDIR)/tracepp $(GCC-TOOL-PREFIX)gcc
 CC      = $(GCC-TOOL-PREFIX)gcc
 AS      = $(GCC-TOOL-PREFIX)as
 AR      = $(GCC-TOOL-PREFIX)ar
diff --git a/src/occ_405/lock/lock.c b/src/occ_405/lock/lock.c
index 0e75a93..51bed42 100755
--- a/src/occ_405/lock/lock.c
+++ b/src/occ_405/lock/lock.c
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/occ_405/dimm/dimm.c $                                     */
+/* $Source: src/occ_405/lock/lock.c $                                     */
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -226,9 +226,6 @@ void occ_i2c_lock_release(const uint8_t i_engine)
     if ((PIB_I2C_ENGINE_ALL == i_engine) ||
         (PIB_I2C_ENGINE_E == i_engine) || (PIB_I2C_ENGINE_D == i_engine) || (PIB_I2C_ENGINE_C == i_engine))
     {
-        ocb_occflg_t occ_flags;
-        occ_flags.value = in32(OCB_OCCFLG);
-
         if ((PIB_I2C_ENGINE_E == i_engine) || (PIB_I2C_ENGINE_ALL == i_engine))
         {
             update_i2c_lock(LOCK_RELEASE, PIB_I2C_ENGINE_E);
@@ -311,10 +308,8 @@ bool check_and_update_i2c_lock(const uint8_t i_engine)
         bool needRetry = false;
         do
         {
-            ocb_occflg_t occ_flags;
             ocb_occflg_t original_occflags;
             original_occflags.value = in32(OCB_OCCFLG);
-            occ_flags.value = original_occflags.value;
 
             LOCK_DBG("check_and_update_i2c_lock: I2C engine %d - host=%d, occ=%d (dimmTick=%d)",
                      i_engine, original_occflags.fields.i2c_engine3_lock_host, original_occflags.fields.i2c_engine3_lock_occ, DIMM_TICK);
diff --git a/src/occ_405/sensor/sensor_query_list.c b/src/occ_405/sensor/sensor_query_list.c
index ab3d0d7..2cae2c7 100755
--- a/src/occ_405/sensor/sensor_query_list.c
+++ b/src/occ_405/sensor/sensor_query_list.c
@@ -73,6 +73,10 @@
 // End Function Specification
 void printSensorInfo(uint16_t i_gsid)
 {
+// This prevents warnings of set but not used since without SNSR_DEBUG
+// being set, the SNSR_DBG macros don't do anything.
+#ifdef SNSR_DEBUG
+
     // Initialize variable j and k with NULL and then
     // point to sensor to avoid compilation error when SNSR_DEBUG is not
     // defined. j and k are only used with SNSR_DBG which is no-op statement
@@ -104,6 +108,8 @@ void printSensorInfo(uint16_t i_gsid)
              (uint32_t)k->mini_sensor,
              (NULL != j) ? *j : 0
     );
+
+#endif
 }
 
 // Function Specification
diff --git a/src/occ_gpe0/img_defs.mk b/src/occ_gpe0/img_defs.mk
index 74a2e4e..21d78e7 100644
--- a/src/occ_gpe0/img_defs.mk
+++ b/src/occ_gpe0/img_defs.mk
@@ -128,10 +128,6 @@ endif
 
 endif
 
-ifndef BINUTILS-TOOL-PREFIX
-BINUTILS-TOOL-PREFIX = $(CTEPATH)/tools/ppetools/prod/powerpc-eabi/bin/
-endif
-
 ifndef P2P_SRCDIR
 export P2P_SRCDIR $(abspath ../ppe/tools/PowerPCtoPPE)
 endif
@@ -154,11 +150,11 @@ OBJDIR = $(IMG_OBJDIR)$(SUB_OBJDIR)
 CC_ASM  = $(GCC-TOOL-PREFIX)gcc
 TCC     = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
 CC      = $(GCC-TOOL-PREFIX)gcc
-AS      = $(BINUTILS-TOOL-PREFIX)as
-AR      = $(BINUTILS-TOOL-PREFIX)ar
-LD      = $(BINUTILS-TOOL-PREFIX)ld
-OBJDUMP = $(BINUTILS-TOOL-PREFIX)objdump
-OBJCOPY = $(BINUTILS-TOOL-PREFIX)objcopy
+AS      = $(GCC-TOOL-PREFIX)as
+AR      = $(GCC-TOOL-PREFIX)ar
+LD      = $(GCC-TOOL-PREFIX)ld
+OBJDUMP = $(GCC-TOOL-PREFIX)objdump
+OBJCOPY = $(GCC-TOOL-PREFIX)objcopy
 TCPP    = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
 THASH	= $(PPETRACEPP_DIR)/tracehash.pl
 CPP     = $(GCC-TOOL-PREFIX)gcc
diff --git a/src/occ_gpe1/img_defs.mk b/src/occ_gpe1/img_defs.mk
index 8526b3d..63b6bb3 100644
--- a/src/occ_gpe1/img_defs.mk
+++ b/src/occ_gpe1/img_defs.mk
@@ -128,10 +128,6 @@ endif
 
 endif
 
-ifndef BINUTILS-TOOL-PREFIX
-BINUTILS-TOOL-PREFIX = $(CTEPATH)/tools/ppetools/prod/powerpc-eabi/bin/
-endif
-
 ifndef P2P_SRCDIR
 export P2P_SRCDIR $(abspath ../ppe/tools/PowerPCtoPPE)
 endif
@@ -154,11 +150,11 @@ OBJDIR = $(IMG_OBJDIR)$(SUB_OBJDIR)
 CC_ASM  = $(GCC-TOOL-PREFIX)gcc
 TCC     = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
 CC      = $(GCC-TOOL-PREFIX)gcc
-AS      = $(BINUTILS-TOOL-PREFIX)as
-AR      = $(BINUTILS-TOOL-PREFIX)ar
-LD      = $(BINUTILS-TOOL-PREFIX)ld
-OBJDUMP = $(BINUTILS-TOOL-PREFIX)objdump
-OBJCOPY = $(BINUTILS-TOOL-PREFIX)objcopy
+AS      = $(GCC-TOOL-PREFIX)as
+AR      = $(GCC-TOOL-PREFIX)ar
+LD      = $(GCC-TOOL-PREFIX)ld
+OBJDUMP = $(GCC-TOOL-PREFIX)objdump
+OBJCOPY = $(GCC-TOOL-PREFIX)objcopy
 TCPP    = $(PPETOOLS_OBJDIR)/ppetracepp $(GCC-TOOL-PREFIX)gcc
 THASH	= $(PPETRACEPP_DIR)/tracehash.pl
 CPP     = $(GCC-TOOL-PREFIX)gcc
diff --git a/src/tools/check-sensors.sh b/src/tools/check-sensors.sh
index 450c4e6..39ed157 100755
--- a/src/tools/check-sensors.sh
+++ b/src/tools/check-sensors.sh
@@ -38,7 +38,7 @@ SCRIPTNAME=`basename "$0"`
 
 # Check that we have two arguments
 if [ $# -ne 2 ]; then
-    echo ${SCRIPTNAME}: usage: ${SCRIPTNAME} /path/to/powerpc-objdump /path/to/occ_405/sensor/
+    echo ${SCRIPTNAME}: usage: ${SCRIPTNAME} /path/to/powerpc-objdump /path/to/obj/occ_405/
     exit 1
 fi
 
@@ -48,11 +48,11 @@ READELF=`which readelf`
 
 # Assign arguments to coherent variables
 OBJDUMP=$1
-SENSOR_PATH=$2
+OBJ_PATH=$2
 
 # Object files that contain the sensor lists
-SENSOR_TABLE=${SENSOR_PATH}/sensor_table.o
-SENSOR_INFO=${SENSOR_PATH}/sensor_info.o
+OCC_405_OUT=${OBJ_PATH}/occ_405.out
+SENSOR_INFO=${OBJ_PATH}/sensor/sensor_info.o
 
 # Keep track of if a sensor is missing from a list
 ERROR=0
@@ -63,8 +63,10 @@ ERROR=0
 # is an array of pointers. On the 405 processor, pointers
 # are 4 bytes, so this looks for any lines in the objdump
 # output that are NULL pointers, indicating either a missing
-# sensor or one that was improperly implemented.
-NUM_ZERO_ENTRIES=$(${OBJDUMP} -Dz ${SENSOR_TABLE} \
+# sensor or one that was improperly implemented. We have to
+# dump the full 405 binary because later gcc versions don't
+# add the sensor addresses until after linking.
+NUM_ZERO_ENTRIES=$(${OBJDUMP} -Dz ${OCC_405_OUT} \
       | awk -v RS= '/^[[:xdigit:]].*<G_amec_sensor_list>/' \
       | grep .long\ 0x0 \
       | ${WC} -l)
@@ -93,6 +95,4 @@ if [ ${NUM_ZERO_ENTRIES} -ne 0 ]; then
     ERROR=1
 fi
 
-if [ ${ERROR} -ne 0 ]; then
-    exit 1
-fi
+exit ${ERROR}
diff --git a/src/tracepp/.gitignore b/src/tools/tracepp/.gitignore
index 8136910..8136910 100644
--- a/src/tracepp/.gitignore
+++ b/src/tools/tracepp/.gitignore
diff --git a/src/tracepp/jhash.h b/src/tools/tracepp/jhash.h
index 5de3f69..5de3f69 100755
--- a/src/tracepp/jhash.h
+++ b/src/tools/tracepp/jhash.h
diff --git a/src/tracepp/makefile b/src/tools/tracepp/makefile
index 788bf13..e3032ed 100644
--- a/src/tracepp/makefile
+++ b/src/tools/tracepp/makefile
@@ -1,12 +1,11 @@
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/tracepp/Makefile $
+# $Source: src/tools/tracepp/makefile $
 #
 # OpenPOWER OnChipController Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2014
-# [+] Google Inc.
+# Contributors Listed Below - COPYRIGHT 2011,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -14,7 +13,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,5 +23,9 @@
 #
 # IBM_PROLOG_END_TAG
 
-tracepp: tracepp.C jhash.h
+ifndef PPETOOLS_OBJDIR
+export PPETOOLS_OBJDIR = ../../../obj/ppetools
+endif
+
+$(PPETOOLS_OBJDIR)/tracepp: tracepp.C jhash.h
 	g++ -O3 -w -g -I. $< -o $@
diff --git a/src/tracepp/tracehash.pl b/src/tools/tracepp/tracehash.pl
index 1bb1197..9004067 100755
--- a/src/tracepp/tracehash.pl
+++ b/src/tools/tracepp/tracehash.pl
@@ -1,14 +1,12 @@
 #!/usr/bin/perl -w
-
 # IBM_PROLOG_BEGIN_TAG
 # This is an automatically generated prolog.
 #
-# $Source: src/tracepp/tracehash.pl $
+# $Source: src/tools/tracepp/tracehash.pl $
 #
 # OpenPOWER OnChipController Project
 #
-# Contributors Listed Below - COPYRIGHT 2011,2014
-# [+] Google Inc.
+# Contributors Listed Below - COPYRIGHT 2011,2016
 # [+] International Business Machines Corp.
 #
 #
@@ -16,7 +14,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -26,6 +24,7 @@
 #
 # IBM_PROLOG_END_TAG
 
+
 use strict;
 
 sub determine_args();
diff --git a/src/tracepp/tracepp.C b/src/tools/tracepp/tracepp.C
index a197dd5..4ed2b04 100755
--- a/src/tracepp/tracepp.C
+++ b/src/tools/tracepp/tracepp.C
@@ -1,14 +1,14 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/tracepp/tracepp.C $                                       */
+/* $Source: src/tools/tracepp/tracepp.C $                                 */
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2014                        */
-/* [+] Google Inc.                                                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
+/*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
 /* You may obtain a copy of the License at                                */