[PATCH 1/5] tune/arch-powerpc64: Fix typo with 64-bit TUNE_CCARGS handling

[PATCH 1/5] tune/arch-powerpc64: Fix typo with 64-bit TUNE_CCARGS handling

[Kumar Gala]

When figuring out how to set TUNE_CCARGS we should look for 'm64' not
'n64' in TUNE_FEATURES.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 .../machine/include/powerpc/arch-powerpc64.inc     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index a99f18d..e55910c 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -1,6 +1,6 @@
 TUNEVALID[m64] = "Power ELF64 standard ABI"
 TUNE_CONFLICTS[m64] = "m32"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n64", "-m64", "", d)}"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
 TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
 
 AVAILTUNES += "powerpc64 powerpc64-nf"
-- 
1.7.3.4

[PATCH 2/5] tune/arch-powerpc64: Remove support for soft-float from ppc64

[Kumar Gala]

All 64-bit PPC processors support hard-float so no need to support
soft-float.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 .../machine/include/powerpc/arch-powerpc64.inc     |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index e55910c..a965d59 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -1,10 +1,8 @@
 TUNEVALID[m64] = "Power ELF64 standard ABI"
-TUNE_CONFLICTS[m64] = "m32"
+TUNE_CONFLICTS[m64] = "m32 nf"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
 TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
 
-AVAILTUNES += "powerpc64 powerpc64-nf"
+AVAILTUNES += "powerpc64"
 TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
 BASE_LIB_tune-powerpc64 = "lib64"
-TUNE_FEATURES_tune-powerpc64-nf ?= "m64 fpu-soft"
-BASE_LIB_tune-powerpc64-nf = "lib64"
-- 
1.7.3.4

[PATCH 3/5] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU

[Kumar Gala]

Its more likely that we explicitly set soft-floating point support for a
given target than hard.  So use 'fpu-soft' in TUNE_FEATURES rather than
'fpu-hard' to determine setting 'nf' (no-float) in PPCPKGSFX_FPU.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/conf/machine/include/powerpc/arch-powerpc.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index 8cc76ab..013755d 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -18,7 +18,7 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}
 
 ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
 
-PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
+PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
 
 TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
 
-- 
1.7.3.4

[PATCH 4/5] tune/arch-powerpc: Merge powerpc64 changes into powerpc

[Kumar Gala]

We should be able to get away with just one include to handle all
arch-powerpc needs.  Also update comments about the various choices
between 32-bit/64-bit and hard/soft floating point.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/conf/machine/include/powerpc/arch-powerpc.inc |   14 ++++++++++----
 .../machine/include/powerpc/arch-powerpc64.inc     |    8 --------
 2 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 meta/conf/machine/include/powerpc/arch-powerpc64.inc

diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index 013755d..93b1c05 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -1,7 +1,6 @@
 # Power Architecture definition
-# Four defined ABIs, all combinations of:
-# *) Hard/Soft Floating Point
-# *) 32-bit/64-bit
+# *) Hard/Soft Floating Point on 32-bit
+# *) Hard Floating Point on 64-bit
 
 DEFAULTTUNE ?= "powerpc"
 
@@ -9,6 +8,11 @@ TUNEVALID[m32] = "Power ELF32 standard ABI"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
 TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "powerpc", "", d)}"
 
+TUNEVALID[m64] = "Power ELF64 standard ABI"
+TUNE_CONFLICTS[m64] = "m32 nf"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
+TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
+
 TUNEVALID[fpu-hard] = "Use hardware FPU."
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard", "-mhard-float", "", d)}"
 
@@ -29,4 +33,6 @@ BASE_LIB_tune-powerpc = "lib"
 TUNE_FEATURES_tune-powerpc-nf ?= "m32 fpu-soft"
 BASE_LIB_tune-powerpc-nf = "lib"
 
-
+AVAILTUNES += "powerpc64"
+TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
+BASE_LIB_tune-powerpc64 = "lib64"
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
deleted file mode 100644
index a965d59..0000000
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-TUNEVALID[m64] = "Power ELF64 standard ABI"
-TUNE_CONFLICTS[m64] = "m32 nf"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
-TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
-
-AVAILTUNES += "powerpc64"
-TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
-BASE_LIB_tune-powerpc64 = "lib64"
-- 
1.7.3.4

[PATCH 5/5] image-mklibs.bbclass: Add powerpc64 arch support

[Kumar Gala]

Just mimic what we do on powerpc (32-bit).

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/classes/image-mklibs.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass
index 9f5a4ea..d5e8ab7 100644
--- a/meta/classes/image-mklibs.bbclass
+++ b/meta/classes/image-mklibs.bbclass
@@ -16,7 +16,7 @@ mklibs_optimize_image_doit() {
 		> ${WORKDIR}/mklibs/executables.list
 
 	case ${TARGET_ARCH} in
-		powerpc | mips | microblaze )
+		powerpc | powerpc64 | mips | microblaze )
 			dynamic_loader="/lib/ld.so.1"
 			;;
 		x86_64)
-- 
1.7.3.4

Re: [PATCH 1/5] tune/arch-powerpc64: Fix typo with 64-bit TUNE_CCARGS handling

[Saul Wold]

On 07/28/2011 01:59 PM, Kumar Gala wrote:
> When figuring out how to set TUNE_CCARGS we should look for 'm64' not
> 'n64' in TUNE_FEATURES.
>
> Signed-off-by: Kumar Gala<galak@kernel.crashing.org>
> ---
>   .../machine/include/powerpc/arch-powerpc64.inc     |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> index a99f18d..e55910c 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> @@ -1,6 +1,6 @@
>   TUNEVALID[m64] = "Power ELF64 standard ABI"
>   TUNE_CONFLICTS[m64] = "m32"
> -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n64", "-m64", "", d)}"
> +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
>   TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
>
>   AVAILTUNES += "powerpc64 powerpc64-nf"

Merged into OE-Core

Thanks
	Sau!

Re: [PATCH 2/5] tune/arch-powerpc64: Remove support for soft-float from ppc64

[Saul Wold]

On 07/28/2011 01:59 PM, Kumar Gala wrote:
> All 64-bit PPC processors support hard-float so no need to support
> soft-float.
>
> Signed-off-by: Kumar Gala<galak@kernel.crashing.org>
> ---
>   .../machine/include/powerpc/arch-powerpc64.inc     |    6 ++----
>   1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> index e55910c..a965d59 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
> @@ -1,10 +1,8 @@
>   TUNEVALID[m64] = "Power ELF64 standard ABI"
> -TUNE_CONFLICTS[m64] = "m32"
> +TUNE_CONFLICTS[m64] = "m32 nf"
>   TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
>   TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
>
> -AVAILTUNES += "powerpc64 powerpc64-nf"
> +AVAILTUNES += "powerpc64"
>   TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
>   BASE_LIB_tune-powerpc64 = "lib64"
> -TUNE_FEATURES_tune-powerpc64-nf ?= "m64 fpu-soft"
> -BASE_LIB_tune-powerpc64-nf = "lib64"

Merged into OE-Core

Thanks
	Sau!

Re: [PATCH 3/5] tune/arch-powerpc: Use fpu-soft to set PPCPKGSFX_FPU

[Saul Wold]

On 07/28/2011 01:59 PM, Kumar Gala wrote:
> Its more likely that we explicitly set soft-floating point support for a
> given target than hard.  So use 'fpu-soft' in TUNE_FEATURES rather than
> 'fpu-hard' to determine setting 'nf' (no-float) in PPCPKGSFX_FPU.
>
> Signed-off-by: Kumar Gala<galak@kernel.crashing.org>
> ---
>   meta/conf/machine/include/powerpc/arch-powerpc.inc |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> index 8cc76ab..013755d 100644
> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
> @@ -18,7 +18,7 @@ TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}
>
>   ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
>
> -PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard" , "", "-nf", d)}"
> +PPCPKGSFX_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", "", d)}"
>
>   TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}"
>

The next three in this series need more work, Richard has commented on 
this in the CONSOLIDATED pull thread.

Sau!