Patchwork [2/4] gcc: Drop part of the 64bithack patch which is no longer used

login
register
mail settings
Submitter Richard Purdie
Date July 27, 2011, 2:29 p.m.
Message ID <fe78c19406d856cb9473e062f1c2905dfe063c2a.1311776363.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/8711/
State New, archived
Headers show

Comments

Richard Purdie - July 27, 2011, 2:29 p.m.
Since we now handle GLIBC_DYNAMIC_LINKER in gcc-configure-common.inc:

's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#'

we can drop the patch which changes a hardcoded value for this.

No PR bump since there is no code change resulting from this, its just
a cleanup.

There is still a valid question over the remainder of this patch and its
interaction with multilib configurations.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../recipes-devtools/gcc/gcc-4.5.1/64bithack.patch |   13 -------------
 meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch  |   13 -------------
 2 files changed, 0 insertions(+), 26 deletions(-)
Lianhao Lu - July 28, 2011, 2:35 p.m.
Richard Purdie wrote on 2011-07-27:
> Since we now handle GLIBC_DYNAMIC_LINKER in gcc-configure-common.inc:
> 
> 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#'
> 

It seems to me that this patch may not be removed. The above code in gcc-configure-common.inc said it only useful for SDK. For gcc-cross, it doesn't change /lib64/ld-linux-x86-64.so.2 to /lib/ld-linux-x86-64.so.2 as what the 64bithack.patch does.

-Lianhao

> we can drop the patch which changes a hardcoded value for this.
> 
> No PR bump since there is no code change resulting from this, its just
> a cleanup.
> 
> There is still a valid question over the remainder of this patch and
> its interaction with multilib configurations.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  .../recipes-devtools/gcc/gcc-4.5.1/64bithack.patch |   13 -------------
>  meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch  |   13 -------------
>  2 files changed, 0 insertions(+), 26 deletions(-)
Kumar Gala - July 28, 2011, 2:55 p.m.
On Jul 28, 2011, at 9:35 AM, Lu, Lianhao wrote:

> Richard Purdie wrote on 2011-07-27:
>> Since we now handle GLIBC_DYNAMIC_LINKER in gcc-configure-common.inc:
>> 
>> 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#'
>> 
> 
> It seems to me that this patch may not be removed. The above code in gcc-configure-common.inc said it only useful for SDK. For gcc-cross, it doesn't change /lib64/ld-linux-x86-64.so.2 to /lib/ld-linux-x86-64.so.2 as what the 64bithack.patch does.
> 
> -Lianhao

Agreed, seeing similar issues on ppc64.  I think the sed line might not be doing with Richard intended.

We get:

./i386/linux.h:#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "/lib/ld-linux.so.2"
./i386/linux64.h:#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "/lib/ld-linux.so.2"
./i386/linux64.h:#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "/lib64/ld-linux-x86-64.so.2"

- k


> 
>> we can drop the patch which changes a hardcoded value for this.
>> 
>> No PR bump since there is no code change resulting from this, its just
>> a cleanup.
>> 
>> There is still a valid question over the remainder of this patch and
>> its interaction with multilib configurations.
>> 
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> ---
>> .../recipes-devtools/gcc/gcc-4.5.1/64bithack.patch |   13 -------------
>> meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch  |   13 -------------
>> 2 files changed, 0 insertions(+), 26 deletions(-)
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Khem Raj - Aug. 2, 2011, 6:28 p.m.
On (27/07/11 15:29), Richard Purdie wrote:
> Since we now handle GLIBC_DYNAMIC_LINKER in gcc-configure-common.inc:
> 
> 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#'
> 
> we can drop the patch which changes a hardcoded value for this.
> 
> No PR bump since there is no code change resulting from this, its just
> a cleanup.
> 
> There is still a valid question over the remainder of this patch and its
> interaction with multilib configurations.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  .../recipes-devtools/gcc/gcc-4.5.1/64bithack.patch |   13 -------------
>  meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch  |   13 -------------
>  2 files changed, 0 insertions(+), 26 deletions(-)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch
> index 890cc2f..05eafe3 100644
> --- a/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch
> +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch
> @@ -20,16 +20,3 @@ Index: gcc-4.5.0/gcc/config/i386/t-linux64
>   
>   LIBGCC = stmp-multilib
>   INSTALL_LIBGCC = install-multilib
> -Index: gcc-4.5.0/gcc/config/i386/linux64.h
> -===================================================================
> ---- gcc-4.5.0.orig/gcc/config/i386/linux64.h	2010-08-10 15:49:06.000000000 +0100
> -+++ gcc-4.5.0/gcc/config/i386/linux64.h	2010-08-10 15:49:16.000000000 +0100
> -@@ -59,7 +59,7 @@
> -    done.  */
> - 
> - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
> --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
> -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"

This change while I like it that we are moving to use default will now
emit /lib64/ld-linux-x86-64.so.2 into INTERP section but I dont see
a corresponding patch to fix root file systems where the defualt libdir
for x86-64 is changed to be lib64

So this will end up in userspace not booting at all since init wont
find the dynamic linker to start with.

Thanks

-Khem

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch
index 890cc2f..05eafe3 100644
--- a/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch
@@ -20,16 +20,3 @@  Index: gcc-4.5.0/gcc/config/i386/t-linux64
  
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib
-Index: gcc-4.5.0/gcc/config/i386/linux64.h
-===================================================================
---- gcc-4.5.0.orig/gcc/config/i386/linux64.h	2010-08-10 15:49:06.000000000 +0100
-+++ gcc-4.5.0/gcc/config/i386/linux64.h	2010-08-10 15:49:16.000000000 +0100
-@@ -59,7 +59,7 @@
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
index 84962e6..4b846bb 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
+++ b/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
@@ -20,16 +20,3 @@  Index: gcc-4.6.0/gcc/config/i386/t-linux64
  
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib
-Index: gcc-4.6.0/gcc/config/i386/linux64.h
-===================================================================
---- gcc-4.6.0.orig/gcc/config/i386/linux64.h
-+++ gcc-4.6.0/gcc/config/i386/linux64.h
-@@ -63,7 +63,7 @@ see the files COPYING3 and COPYING.RUNTI
-    done.  */
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #if TARGET_64BIT_DEFAULT
- #define SPEC_32 "m32"