Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | Change the dynamic linker hardcoding to use musl when not using glibc |
| 2 | this should be applied conditional to musl being the system C library |
| 3 | |
| 4 | Upstream-Status: Inappropriate [Real Fix should be portable across libcs] |
| 5 | |
| 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 7 | |
| 8 | Index: go/src/cmd/link/internal/amd64/obj.go |
| 9 | =================================================================== |
| 10 | --- go.orig/src/cmd/link/internal/amd64/obj.go |
| 11 | +++ go/src/cmd/link/internal/amd64/obj.go |
| 12 | @@ -67,7 +67,7 @@ func Init() { |
| 13 | ld.Thearch.Append64 = ld.Append64l |
| 14 | ld.Thearch.TLSIEtoLE = tlsIEtoLE |
| 15 | |
| 16 | - ld.Thearch.Linuxdynld = "/lib64/ld-linux-x86-64.so.2" |
| 17 | + ld.Thearch.Linuxdynld = "/lib/ld-musl-x86_64.so.1" |
| 18 | ld.Thearch.Freebsddynld = "/libexec/ld-elf.so.1" |
| 19 | ld.Thearch.Openbsddynld = "/usr/libexec/ld.so" |
| 20 | ld.Thearch.Netbsddynld = "/libexec/ld.elf_so" |
| 21 | Index: go/src/cmd/link/internal/arm/obj.go |
| 22 | =================================================================== |
| 23 | --- go.orig/src/cmd/link/internal/arm/obj.go |
| 24 | +++ go/src/cmd/link/internal/arm/obj.go |
| 25 | @@ -63,7 +63,7 @@ func Init() { |
| 26 | ld.Thearch.Append32 = ld.Append32l |
| 27 | ld.Thearch.Append64 = ld.Append64l |
| 28 | |
| 29 | - ld.Thearch.Linuxdynld = "/lib/ld-linux.so.3" // 2 for OABI, 3 for EABI |
| 30 | + ld.Thearch.Linuxdynld = "/lib/ld-musl-armhf.so.1" |
| 31 | ld.Thearch.Freebsddynld = "/usr/libexec/ld-elf.so.1" |
| 32 | ld.Thearch.Openbsddynld = "/usr/libexec/ld.so" |
| 33 | ld.Thearch.Netbsddynld = "/libexec/ld.elf_so" |
| 34 | Index: go/src/cmd/link/internal/arm64/obj.go |
| 35 | =================================================================== |
| 36 | --- go.orig/src/cmd/link/internal/arm64/obj.go |
| 37 | +++ go/src/cmd/link/internal/arm64/obj.go |
| 38 | @@ -62,7 +62,7 @@ func Init() { |
| 39 | ld.Thearch.Append32 = ld.Append32l |
| 40 | ld.Thearch.Append64 = ld.Append64l |
| 41 | |
| 42 | - ld.Thearch.Linuxdynld = "/lib/ld-linux-aarch64.so.1" |
| 43 | + ld.Thearch.Linuxdynld = "/lib/ld-musl-aarch64.so.1" |
| 44 | |
| 45 | ld.Thearch.Freebsddynld = "XXX" |
| 46 | ld.Thearch.Openbsddynld = "XXX" |
| 47 | Index: go/src/cmd/link/internal/mips/obj.go |
| 48 | =================================================================== |
| 49 | --- go.orig/src/cmd/link/internal/mips/obj.go |
| 50 | +++ go/src/cmd/link/internal/mips/obj.go |
| 51 | @@ -77,7 +77,7 @@ func Init() { |
| 52 | ld.Thearch.Append64 = ld.Append64b |
| 53 | } |
| 54 | |
| 55 | - ld.Thearch.Linuxdynld = "/lib/ld.so.1" |
| 56 | + ld.Thearch.Linuxdynld = "/lib/ld-musl-mipsle.so.1" |
| 57 | |
| 58 | ld.Thearch.Freebsddynld = "XXX" |
| 59 | ld.Thearch.Openbsddynld = "XXX" |
| 60 | Index: go/src/cmd/link/internal/mips64/obj.go |
| 61 | =================================================================== |
| 62 | --- go.orig/src/cmd/link/internal/mips64/obj.go |
| 63 | +++ go/src/cmd/link/internal/mips64/obj.go |
| 64 | @@ -75,7 +75,7 @@ func Init() { |
| 65 | ld.Thearch.Append64 = ld.Append64b |
| 66 | } |
| 67 | |
| 68 | - ld.Thearch.Linuxdynld = "/lib64/ld64.so.1" |
| 69 | + ld.Thearch.Linuxdynld = "/lib64/ld-musl-mips64le.so.1" |
| 70 | |
| 71 | ld.Thearch.Freebsddynld = "XXX" |
| 72 | ld.Thearch.Openbsddynld = "XXX" |
| 73 | Index: go/src/cmd/link/internal/ppc64/obj.go |
| 74 | =================================================================== |
| 75 | --- go.orig/src/cmd/link/internal/ppc64/obj.go |
| 76 | +++ go/src/cmd/link/internal/ppc64/obj.go |
| 77 | @@ -77,7 +77,7 @@ func Init() { |
| 78 | } |
| 79 | |
| 80 | // TODO(austin): ABI v1 uses /usr/lib/ld.so.1 |
| 81 | - ld.Thearch.Linuxdynld = "/lib64/ld64.so.1" |
| 82 | + ld.Thearch.Linuxdynld = "/lib/ld-musl-powerpc64le.so.1" |
| 83 | |
| 84 | ld.Thearch.Freebsddynld = "XXX" |
| 85 | ld.Thearch.Openbsddynld = "XXX" |
| 86 | Index: go/src/cmd/link/internal/s390x/obj.go |
| 87 | =================================================================== |
| 88 | --- go.orig/src/cmd/link/internal/s390x/obj.go |
| 89 | +++ go/src/cmd/link/internal/s390x/obj.go |
| 90 | @@ -62,7 +62,7 @@ func Init() { |
| 91 | ld.Thearch.Append32 = ld.Append32b |
| 92 | ld.Thearch.Append64 = ld.Append64b |
| 93 | |
| 94 | - ld.Thearch.Linuxdynld = "/lib64/ld64.so.1" |
| 95 | + ld.Thearch.Linuxdynld = "/lib/ld-musl-s390x.so.1" |
| 96 | |
| 97 | // not relevant for s390x |
| 98 | ld.Thearch.Freebsddynld = "XXX" |
| 99 | Index: go/src/cmd/link/internal/x86/obj.go |
| 100 | =================================================================== |
| 101 | --- go.orig/src/cmd/link/internal/x86/obj.go |
| 102 | +++ go/src/cmd/link/internal/x86/obj.go |
| 103 | @@ -63,7 +63,7 @@ func Init() { |
| 104 | ld.Thearch.Append32 = ld.Append32l |
| 105 | ld.Thearch.Append64 = ld.Append64l |
| 106 | |
| 107 | - ld.Thearch.Linuxdynld = "/lib/ld-linux.so.2" |
| 108 | + ld.Thearch.Linuxdynld = "/lib/ld-musl-i386.so.1" |
| 109 | ld.Thearch.Freebsddynld = "/usr/libexec/ld-elf.so.1" |
| 110 | ld.Thearch.Openbsddynld = "/usr/libexec/ld.so" |
| 111 | ld.Thearch.Netbsddynld = "/usr/libexec/ld.elf_so" |