From patchwork Tue Sep 18 14:17:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [AARCH64] Remove hardwired multiarch. Date: Tue, 18 Sep 2012 04:17:03 -0000 From: Marcus Shawcroft X-Patchwork-Id: 184726 Message-Id: <5058825F.2000208@arm.com> To: "gcc-patches@gcc.gnu.org" I've just committed this patch to aarch64-branch to remove the multi-arch fudge. /Marcus 2012-09-18 Marcus Shawcroft * config/aarch64/aarch64-linux.h (MULTIARCH_TUPLE): Remove. (STANDARD_STARTFILE_PREFIX_1): Likewise. (STANDARD_STARTFILE_PREFIX_2): Likewise. diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h index 2b5ec7e..faf2e6c 100644 --- a/gcc/config/aarch64/aarch64-linux.h +++ b/gcc/config/aarch64/aarch64-linux.h @@ -21,14 +21,6 @@ #ifndef GCC_AARCH64_LINUX_H #define GCC_AARCH64_LINUX_H -#define MULTIARCH_TUPLE "aarch64-linux-gnu" - -#undef STANDARD_STARTFILE_PREFIX_1 -#define STANDARD_STARTFILE_PREFIX_1 "/lib/" MULTIARCH_TUPLE "/" - -#undef STANDARD_STARTFILE_PREFIX_2 -#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" MULTIARCH_TUPLE "/" - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1" #define LINUX_TARGET_LINK_SPEC "%{h*} \ -- 1.7.12.rc0.22.gcdd159b