Skip to content

Commit

Permalink
Fix build failure on GCC8
Browse files Browse the repository at this point in the history
Change-Id: Ib952f5ccd721de3c581eb2c4bde112aa23db28ac
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76845
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christopher J. Cain <cjcain@us.ibm.com>
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
  • Loading branch information
madscientist159 authored and wilbryan committed May 2, 2019
1 parent afa37a7 commit 4b93968
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
6 changes: 4 additions & 2 deletions src/occBootLoader/img_defs.mk
Expand Up @@ -5,8 +5,9 @@
#
# OpenPOWER OnChipController Project
#
# Contributors Listed Below - COPYRIGHT 2015,2017
# Contributors Listed Below - COPYRIGHT 2015,2019
# [+] International Business Machines Corp.
# [+] Timothy Pearson
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -226,7 +227,8 @@ PIPE-CFLAGS = -pipe -Wa,-m405
GCC-CFLAGS += -g -Wall -fsigned-char -msoft-float \
-m32 -mbig-endian -mcpu=405 -mmultiple -mstring \
-meabi -msdata=eabi -ffreestanding -fno-common \
-fno-inline-functions-called-once -std=gnu89
-fno-inline-functions-called-once \
-fno-asynchronous-unwind-tables -std=gnu89

CFLAGS = -c $(GCC-CFLAGS) $(PIPE-CFLAGS) $(GCC-O-LEVEL) $(INCLUDES)

Expand Down
6 changes: 4 additions & 2 deletions src/occ_405/img_defs.mk
Expand Up @@ -5,8 +5,9 @@
#
# OpenPOWER OnChipController Project
#
# Contributors Listed Below - COPYRIGHT 2015,2017
# Contributors Listed Below - COPYRIGHT 2015,2019
# [+] International Business Machines Corp.
# [+] Timothy Pearson
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -253,7 +254,8 @@ PIPE-CFLAGS = -pipe -Wa,-m405
GCC-CFLAGS += -g -Wall -fsigned-char -msoft-float \
-m32 -mbig-endian -mcpu=405 -mmultiple -mstring \
-meabi -msdata=eabi -ffreestanding -fno-common \
-fno-inline-functions-called-once -std=gnu89
-fno-inline-functions-called-once \
-fno-asynchronous-unwind-tables -std=gnu89

CFLAGS = -c $(GCC-CFLAGS) $(PIPE-CFLAGS) $(GCC-O-LEVEL) $(INCLUDES)

Expand Down
3 changes: 2 additions & 1 deletion src/occ_gpe0/img_defs.mk
Expand Up @@ -5,7 +5,7 @@
#
# OpenPOWER OnChipController Project
#
# Contributors Listed Below - COPYRIGHT 2015,2018
# Contributors Listed Below - COPYRIGHT 2015,2019
# [+] International Business Machines Corp.
#
#
Expand Down Expand Up @@ -209,6 +209,7 @@ GCC-CFLAGS += -msdata=eabi
GCC-CFLAGS += -ffreestanding
GCC-CFLAGS += -fno-common
GCC-CFLAGS += -fno-inline-functions-called-once
GCC-CFLAGS += -fno-asynchronous-unwind-tables

CFLAGS = -c -std=gnu89 $(GCC-CFLAGS) $(PIPE-CFLAGS) $(GCC-O-LEVEL) $(INCLUDES)

Expand Down
3 changes: 2 additions & 1 deletion src/occ_gpe1/img_defs.mk
Expand Up @@ -5,7 +5,7 @@
#
# OpenPOWER OnChipController Project
#
# Contributors Listed Below - COPYRIGHT 2015,2018
# Contributors Listed Below - COPYRIGHT 2015,2019
# [+] International Business Machines Corp.
#
#
Expand Down Expand Up @@ -216,6 +216,7 @@ GCC-CFLAGS += -meabi
GCC-CFLAGS += -ffreestanding
GCC-CFLAGS += -fno-common
GCC-CFLAGS += -fno-inline-functions-called-once
GCC-CFLAGS += -fno-asynchronous-unwind-tables
GCC-CFLAGS += -std=gnu89

CFLAGS = -c $(GCC-CFLAGS) $(PIPE-CFLAGS) $(GCC-O-LEVEL) $(INCLUDES)
Expand Down

0 comments on commit 4b93968

Please sign in to comment.