[oe] [PATCH 04/11] gcc 4.2.4: add gcc-multilib64dir.patch

[Khem Raj]

On (15/04/09 16:35), Roman I Khimov wrote:
> ---
>  recipes/gcc/files/gcc-multilib64dir.patch |   43 +++++++++++++++++++++++++++++
>  recipes/gcc/gcc-4.2.4.inc                 |    1 +
>  2 files changed, 44 insertions(+), 0 deletions(-)
>  create mode 100644 recipes/gcc/files/gcc-multilib64dir.patch
> 
> diff --git a/recipes/gcc/files/gcc-multilib64dir.patch b/recipes/gcc/files/gcc-multilib64dir.patch
> new file mode 100644
> index 0000000..301e596
> --- /dev/null
> +++ b/recipes/gcc/files/gcc-multilib64dir.patch
> @@ -0,0 +1,43 @@
> +#! /bin/sh -e
> +
> +# DP: Use lib instead of lib64 as multilibdir on amd64 and ppc64.
> +#
> +# Taken from Debian, fixed to apply with quilt
> +
> +Index: gcc/config/i386/t-linux64
> +===================================================================
> +--- gcc/config/i386/t-linux64	(revision 130706)
> ++++ gcc/config/i386/t-linux64	(working copy)
> +@@ -13,7 +13,7 @@
> + 
> + MULTILIB_OPTIONS = m64/m32
> + MULTILIB_DIRNAMES = 64 32 
> +-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
> ++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
> + 
> + LIBGCC = stmp-multilib
> + INSTALL_LIBGCC = install-multilib
> +Index: gcc/config/rs6000/t-linux64
> +===================================================================
> +--- gcc/config/rs6000/t-linux64	(revision 130706)
> ++++ gcc/config/rs6000/t-linux64	(working copy)
> +@@ -14,13 +14,13 @@
> + # it doesn't tell anything about the 32bit libraries on those systems.  Set
> + # MULTILIB_OSDIRNAMES according to what is found on the target.
> + 
> +-MULTILIB_OPTIONS        = m64/m32 msoft-float
> +-MULTILIB_DIRNAMES       = 64 32 nof
> ++MULTILIB_OPTIONS        = m64/m32
> ++MULTILIB_DIRNAMES       = 64 32
> + MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
> +-MULTILIB_EXCEPTIONS     = m64/msoft-float
> +-MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
> +-MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
> +-MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
> ++MULTILIB_EXCEPTIONS     =
> ++MULTILIB_EXCLUSIONS     =
> ++MULTILIB_OSDIRNAMES	= ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
> ++MULTILIB_MATCHES        =
> + 
> + softfp_wrap_start := '\#ifndef __powerpc64__'
> + softfp_wrap_end := '\#endif'
> diff --git a/recipes/gcc/gcc-4.2.4.inc b/recipes/gcc/gcc-4.2.4.inc
> index 085f241..20bdfef 100644
> --- a/recipes/gcc/gcc-4.2.4.inc
> +++ b/recipes/gcc/gcc-4.2.4.inc
> @@ -37,6 +37,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
>  	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
>  	file://fortran-static-linking.patch;patch=1 \
>  	file://intermask-bigendian.patch;patch=1 \
> +	file://gcc-multilib64dir.patch;patch=1;pnum=0 \
>  "
>  
>  SRC_URI_append_ep93xx = " \


which multilib are you chosing as default? if it is 64 bit then the
patch is ok.

> -- 
> 1.6.2.1
> 
> 
> -- 
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel