[OE-core] [PATCH 18/24] Revert "gcc-4.9: redefine default library install directory"

[Kai Kang]

This reverts commit 208c5e37f98cd98629bad0562fbbc77d7b71e8ff.

GCC can choose the right value as defined by the system, it's the libc
that needs to know how to get to the ABI specific version of the dynamic
loader.  Which is in /lib even if aarch64 libraries are installed in
lib64 due to the specifications in the ABI.

Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
Signed-off-by: Kai Kang <kai.kang at windriver.com>
---
 meta/recipes-devtools/gcc/gcc-4.9.inc              |  1 -
 ...0099-gcc-redefine-library-dir-for-aarch64.patch | 29 ----------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.9/0099-gcc-redefine-library-dir-for-aarch64.patch

diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc
index e3775cd..8f212b2 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -73,7 +73,6 @@ SRC_URI = "\
     file://0056-top-level-reorder_gcc-bug-61144.patch \
     file://0058-gcc-r212171.patch \
     file://0059-gcc-PR-rtl-optimization-63348.patch \
-    file://0099-gcc-redefine-library-dir-for-aarch64.patch \
 "
 SRC_URI[md5sum] = "fddf71348546af523353bd43d34919c1"
 SRC_URI[sha256sum] = "d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e"
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0099-gcc-redefine-library-dir-for-aarch64.patch b/meta/recipes-devtools/gcc/gcc-4.9/0099-gcc-redefine-library-dir-for-aarch64.patch
deleted file mode 100644
index 23cdb95..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.9/0099-gcc-redefine-library-dir-for-aarch64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Redefine default library directory for aarch64.
-
-Packages use 'aarch64-poky-linux-gcc -print-multi-os-directory' to get the
-value of install directory. The value is set by MULTILIB_OSDIRNAMES and default
-is '/lib64'. Add the dynamic linker ld-linux-aarch64.so.1 from package eglibc
-is installed to /lib64.
-
-But the default dynamic linker defined in gcc/config/aarch64/aarch64-linux.h
-is:
-
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1"
-
-Then cause all the ELF files fail to launch because fail to find the linker.
-
-Upstream-Status: Pending
-
-Signed-off-by: Kai Kang <kai.kang at windriver.com>
----
---- gcc-4.9.1/gcc/config/aarch64/t-aarch64-linux.orig	2014-09-19 14:38:47.550669143 +0800
-+++ gcc-4.9.1/gcc/config/aarch64/t-aarch64-linux	2014-09-19 14:39:01.234669516 +0800
-@@ -22,7 +22,7 @@
- LIB1ASMFUNCS = _aarch64_sync_cache_range
- 
- AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
--MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-+MULTILIB_OSDIRNAMES = .=../lib$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
- MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
- 
- # Disable the multilib for linux-gnu targets for the time being; focus
-- 
1.9.1