Commit b274051d58f7b6e48078a84427d24b79d3a56b73
Committed by
Anthony Liguori
1 parent
dfe5fff3
Remove SP_CFLAGS and SP_LDFLAGS
SP_CFLAGS and SP_LDFLAGS are only used as initial values for ARCH_CFLAGS/ARCH_LDFLAGS. Call it directly ARCH_*. Once there, use the same indentantion that the rest of the file Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing
1 changed file
with
22 additions
and
13 deletions
configure
@@ -475,13 +475,28 @@ for opt do | @@ -475,13 +475,28 @@ for opt do | ||
475 | --sparc_cpu=*) | 475 | --sparc_cpu=*) |
476 | sparc_cpu="$optarg" | 476 | sparc_cpu="$optarg" |
477 | case $sparc_cpu in | 477 | case $sparc_cpu in |
478 | - v7|v8) SP_CFLAGS="-m32 -mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32" | ||
479 | - target_arch2="sparc"; cpu="sparc" ;; | ||
480 | - v8plus|v8plusa) SP_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m32" | ||
481 | - target_arch2="sparc"; cpu="sparc" ;; | ||
482 | - v9) SP_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"; SP_LDFLAGS="-m64" | ||
483 | - target_arch2="sparc64"; cpu="sparc64" ;; | ||
484 | - *) echo "undefined SPARC architecture. Exiting";exit 1;; | 478 | + v7|v8) |
479 | + ARCH_CFLAGS="-m32 -mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__" | ||
480 | + ARCH_LDFLAGS="-m32" | ||
481 | + target_arch2="sparc" | ||
482 | + cpu="sparc" | ||
483 | + ;; | ||
484 | + v8plus|v8plusa) | ||
485 | + ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__" | ||
486 | + ARCH_LDFLAGS="-m32" | ||
487 | + target_arch2="sparc" | ||
488 | + cpu="sparc" | ||
489 | + ;; | ||
490 | + v9) | ||
491 | + ARCH_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__" | ||
492 | + ARCH_LDFLAGS="-m64" | ||
493 | + target_arch2="sparc64" | ||
494 | + cpu="sparc64" | ||
495 | + ;; | ||
496 | + *) | ||
497 | + echo "undefined SPARC architecture. Exiting"; | ||
498 | + exit 1 | ||
499 | + ;; | ||
485 | esac | 500 | esac |
486 | ;; | 501 | ;; |
487 | --enable-werror) werror="yes" | 502 | --enable-werror) werror="yes" |
@@ -554,9 +569,6 @@ case "$cpu" in | @@ -554,9 +569,6 @@ case "$cpu" in | ||
554 | sparc) if test -z "$sparc_cpu" ; then | 569 | sparc) if test -z "$sparc_cpu" ; then |
555 | ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__" | 570 | ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__" |
556 | ARCH_LDFLAGS="-m32" | 571 | ARCH_LDFLAGS="-m32" |
557 | - else | ||
558 | - ARCH_CFLAGS="${SP_CFLAGS}" | ||
559 | - ARCH_LDFLAGS="${SP_LDFLAGS}" | ||
560 | fi | 572 | fi |
561 | ARCH_CFLAGS="$ARCH_CFLAGS -ffixed-g2 -ffixed-g3" | 573 | ARCH_CFLAGS="$ARCH_CFLAGS -ffixed-g2 -ffixed-g3" |
562 | if test "$solaris" = "no" ; then | 574 | if test "$solaris" = "no" ; then |
@@ -566,9 +578,6 @@ case "$cpu" in | @@ -566,9 +578,6 @@ case "$cpu" in | ||
566 | sparc64) if test -z "$sparc_cpu" ; then | 578 | sparc64) if test -z "$sparc_cpu" ; then |
567 | ARCH_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_v9__" | 579 | ARCH_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_v9__" |
568 | ARCH_LDFLAGS="-m64" | 580 | ARCH_LDFLAGS="-m64" |
569 | - else | ||
570 | - ARCH_CFLAGS="${SP_CFLAGS}" | ||
571 | - ARCH_LDFLAGS="${SP_LDFLAGS}" | ||
572 | fi | 581 | fi |
573 | if test "$solaris" = "no" ; then | 582 | if test "$solaris" = "no" ; then |
574 | ARCH_CFLAGS="$ARCH_CFLAGS -ffixed-g5 -ffixed-g6 -ffixed-g7" | 583 | ARCH_CFLAGS="$ARCH_CFLAGS -ffixed-g5 -ffixed-g6 -ffixed-g7" |