From 32a9ea0a3b622bd2f24812e02fee45ef33239c0e Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Mon, 26 Dec 2016 06:37:55 +0100 Subject: [PATCH] gcc: remove extra MUSL_DYNAMIC_LINKER See #5400 --- srcpkgs/gcc/files/gcc-6.3.0-musl.diff | 12 ------------ srcpkgs/gcc/template | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/srcpkgs/gcc/files/gcc-6.3.0-musl.diff b/srcpkgs/gcc/files/gcc-6.3.0-musl.diff index a891dc3d44f..f0837da30e3 100644 --- a/srcpkgs/gcc/files/gcc-6.3.0-musl.diff +++ b/srcpkgs/gcc/files/gcc-6.3.0-musl.diff @@ -137,18 +137,6 @@ diff -r 971d41041173 gcc/config.gcc if test x${enable_secureplt} = xyes; then tm_file="rs6000/secureplt.h ${tm_file}" fi -diff -r 9555ffb5873b gcc/config/aarch64/aarch64-linux.h ---- a/gcc/config/aarch64/aarch64-linux.h Thu Dec 24 11:25:06 2015 -0500 -+++ b/gcc/config/aarch64/aarch64-linux.h Thu Dec 24 11:25:09 2015 -0500 -@@ -32,6 +32,8 @@ - #undef CC1_SPEC - #define CC1_SPEC GNU_USER_TARGET_CC1_SPEC ASAN_CC1_SPEC - -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" -+ - #define CPP_SPEC "%{pthread:-D_REENTRANT}" - - #define LINUX_TARGET_LINK_SPEC "%{h*} \ diff -r a522e4b04c77 gcc/config/microblaze/microblaze.h --- a/gcc/config/microblaze/microblaze.h Thu Dec 24 11:25:11 2015 -0500 +++ b/gcc/config/microblaze/microblaze.h Thu Dec 24 11:25:13 2015 -0500 diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 507af66090d..14fcb4e09a9 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -4,7 +4,7 @@ _gcjrel=17 pkgname=gcc version=${_majorver}.0 -revision=1 +revision=2 short_desc="The GNU C Compiler" maintainer="Juan RP " homepage="http://gcc.gnu.org"