[git commit master 1/1] libm_powerpc: update buildsys to use TARGET_SUBARCH

Carmelo AMOROSO carmelo.amoroso at st.com
Fri Dec 17 09:15:37 UTC 2010


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 12/17/2010 10:02 AM, Carmelo Amoroso wrote:
> 
> commit: 
> http://git.uclibc.org/uClibc/commit/?id=c61707353e16b8e22cab1a150cc3a6bf9b178e1c
> branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
> 
> Update the powerpc buildsys of libm to use the TARGET_SUBARCH.
> Further fix the e500 Makefile.arch by adding the definition
> of libm_ARCH_fpu_DIR that was actually missing.
> 
> Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
> ---
> libm/Makefile.in | 11 -----------
> libm/powerpc/classic/Makefile.arch | 4 ++--
> libm/powerpc/e500/Makefile.arch | 1 +
> 3 files changed, 3 insertions(+), 13 deletions(-)
> 
> diff --git a/libm/Makefile.in b/libm/Makefile.in
> index a0b2479..384365c 100644
> --- a/libm/Makefile.in
> +++ b/libm/Makefile.in
> @@ -34,15 +34,8 @@ libm_FULL_NAME := libm-$(VERSION).so
> libm_DIR:=$(top_srcdir)libm
> libm_OUT:=$(top_builddir)libm
> 
> -# Fix builds for powerpc as there are different cores in this
> -# section now.`
> -ifeq ($(TARGET_ARCH)-$(CONFIG_E500),powerpc-y)
> -libm_ARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)/e500
> -libm_ARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)/e500
> -else
> libm_ARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)
> libm_ARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)
> -endif
> 
> ifneq ($(TARGET_SUBARCH),)
> libm_SUBARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)/$(TARGET_SUBARCH)
> @@ -225,12 +218,8 @@ endif
> ifeq ($(UCLIBC_HAS_FPU),y)
> ifeq ($(DO_C99_MATH),y)
> ifneq ($(strip $(libm_ARCH_OBJS)),)
> -ifeq ($(TARGET_ARCH)-$(CONFIG_E500),powerpc-y)
> -CFLAGS-libm/$(TARGET_ARCH)/e500/ := $(CFLAGS-libm)
> -else
> CFLAGS-libm/$(TARGET_ARCH)/ := $(CFLAGS-libm)
> CFLAGS-libm/$(TARGET_ARCH)/$(TARGET_SUBARCH)/ := $(CFLAGS-libm)
> -endif
> 
> # remove generic sources, if arch specific version is present
> ifneq ($(strip $(libm_ARCH_SRC)),)
> diff --git a/libm/powerpc/classic/Makefile.arch b/libm/powerpc/classic/Makefile.arch
> index 7c7600f..53c6d2c 100644
> --- a/libm/powerpc/classic/Makefile.arch
> +++ b/libm/powerpc/classic/Makefile.arch
> @@ -5,8 +5,8 @@
> # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
> #
> 
> -libm_ARCH_SRC:=$(wildcard $(libm_ARCH_DIR)/*.c)
> -libm_ARCH_OBJ:=$(patsubst 
> $(libm_ARCH_DIR)/%.c,$(libm_ARCH_OUT)/%.o,$(libm_ARCH_SRC))
> +libm_ARCH_SRC:=$(wildcard $(libm_SUBARCH_DIR)/*.c)
> +libm_ARCH_OBJ:=$(patsubst 
> $(libm_SUBARCH_DIR)/%.c,$(libm_SUBARCH_OUT)/%.o,$(libm_ARCH_SRC))
> 
> libm_ARCH_OBJS:=$(libm_ARCH_OBJ)
> 
> diff --git a/libm/powerpc/e500/Makefile.arch b/libm/powerpc/e500/Makefile.arch
> index bec21ca..912ce7f 100644
> --- a/libm/powerpc/e500/Makefile.arch
> +++ b/libm/powerpc/e500/Makefile.arch
> @@ -5,5 +5,6 @@
> # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
> #
> 
> +libm_ARCH_fpu_DIR := $(libm_SUBARCH_DIR)/fpu
> -include $(libm_ARCH_fpu_DIR)/Makefile.arch
> 
> --
> 1.7.2.2
> 
> _______________________________________________
> uClibc-cvs mailing list
> uClibc-cvs at uclibc.org
> http://lists.busybox.net/mailman/listinfo/uclibc-cvs
> 

Hi,
I would like someone working on powerpc could actually test this change.
They seem fine to me, but I don't have a toolchain for testing the build.

Carmelo

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk0LKjkACgkQoRq/3BrK1s/b/QCfdRwKwg6TAYMheZG6HuEuIS4v
8LsAoOSEtsf22ydPImG7MXgD7W0ROxjN
=RHja
-----END PGP SIGNATURE-----


More information about the uClibc-cvs mailing list