summaryrefslogtreecommitdiffstats
path: root/src/occ_gpe0
diff options
context:
space:
mode:
authorWilliam Bryan <wilbryan@us.ibm.com>2016-08-24 12:16:26 -0500
committerWilliam A. Bryan <wilbryan@us.ibm.com>2016-08-26 16:45:00 -0400
commit30ed7685e39b12255247d0c30db8660f4e42eadb (patch)
tree616b802cbb9ecba0de32ad5044a93b288e3cda25 /src/occ_gpe0
parentc184079818cd001b5fd7664ca974ee721c576522 (diff)
downloadtalos-occ-30ed7685e39b12255247d0c30db8660f4e42eadb.tar.gz
talos-occ-30ed7685e39b12255247d0c30db8660f4e42eadb.zip
Update build process for OpenPOWER
Change-Id: I0852869bdc9d527c54112de7223b6e95111c750a Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28741 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: William A. Bryan <wilbryan@us.ibm.com> Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com> Reviewed-by: Wael El-Essawy <welessa@us.ibm.com> Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Diffstat (limited to 'src/occ_gpe0')
-rw-r--r--src/occ_gpe0/Makefile4
-rw-r--r--src/occ_gpe0/img_defs.mk12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/occ_gpe0/Makefile b/src/occ_gpe0/Makefile
index d695628..b19aab9 100644
--- a/src/occ_gpe0/Makefile
+++ b/src/occ_gpe0/Makefile
@@ -60,7 +60,7 @@ $(OBJDIR)/$(IMAGE_NAME).bin $(OBJDIR)/$(IMAGE_NAME).dis: $(OBJDIR)/$(IMAGE_NAME)
$(OBJDIR)/$(IMAGE_NAME).out: $(LINK_OBJS) $(LINK_SCRIPT)
$(LD) -e __system_reset -N -T$(LINK_SCRIPT) -Map $(OBJDIR)/$(IMAGE_NAME).map \
-Bstatic -o $(OBJDIR)/$(IMAGE_NAME).out $(LIB_DIRS) $(OBJS) \
- -locc -lcommon -lpk -leabi -lmath -lc
+ -locc -lcommon -lpk
#pass the link command file through the C preprocessor to evaluate macros and remove comments
$(LINK_SCRIPT): link.cmd
@@ -73,7 +73,7 @@ $(OBJDIR):
mkdir -p $(OBJDIR)
$(PPETOOLS_OBJDIR)/ppetracepp: $(PPETOOLS_OBJDIR)
- g++ -m32 -O3 -w -g -I$(PPETRACEPP_DIR)/ $(PPETRACEPP_DIR)/ppetracepp.C -o $(PPETOOLS_OBJDIR)/ppetracepp
+ g++ -O3 -w -g -I$(PPETRACEPP_DIR)/ $(PPETRACEPP_DIR)/ppetracepp.C -o $(PPETOOLS_OBJDIR)/ppetracepp
$(PPETOOLS_OBJDIR):
mkdir -p $(PPETOOLS_OBJDIR)
diff --git a/src/occ_gpe0/img_defs.mk b/src/occ_gpe0/img_defs.mk
index ba9ad98..5b77299 100644
--- a/src/occ_gpe0/img_defs.mk
+++ b/src/occ_gpe0/img_defs.mk
@@ -114,18 +114,18 @@ endif
ifdef P2P_ENABLE
# TODO
else
+
+# libs needed by compiler
+ifndef PPE_TOOL_PATH
PPE_TOOL_PATH = $(CTEPATH)/tools/ppetools/prod
+LD_LIBRARY_PATH += :$(PPE_TOOL_PATH)/lib:
+export LD_LIBRARY_PATH
+endif
ifndef GCC-TOOL-PREFIX
GCC-TOOL-PREFIX = $(PPE_TOOL_PATH)/bin/powerpc-eabi-
endif
-# libs needed by compiler
-LD_LIBRARY_PATH += :$(PPE_TOOL_PATH)/lib:
-export LD_LIBRARY_PATH
-
-# libs needed by compiled code
-LIB_DIRS += -L$(PPE_TOOL_PATH)/libgcc
endif
ifndef BINUTILS-TOOL-PREFIX
OpenPOWER on IntegriCloud