From patchwork Fri Jul 5 15:15:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timo Teras X-Patchwork-Id: 257187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id BBD6D2C0091 for ; Sat, 6 Jul 2013 01:14:57 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=n/0 il2VAuR2/hfGp70syoPQdIPNn8ZmSFhs5H3O5PLCG12y79Y+BSLtZEBfJ31NKr+G 5M5tZoHQMTVrClm6WxC4CmLmuGtD1erI7cqhxq8zgpClaA05kD0wSX5opydMmayD tPwWhAShvwK+qlzE0C9hpLs2+WX+ISBA6h1dQOu4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=XdyKS4iQ0 q186RxVNV+tee/NcbM=; b=TQaJg2Xg6WimtGjL23fktm7gTX1i2ZOHm+6rarFP7 z+mNUUvrEkKxe+uxvRr8obt44+Dr5wiUe0B1Ud7zj8Nebcfhnbn9hXVnHtKFBnkF PEt8yhbLN5hpkKw+RIcI2Vw7mmuSFYfbbCP0OGFIewq3vceS8qfmN0qzzRjud7pl +A= Received: (qmail 26322 invoked by alias); 5 Jul 2013 15:14:50 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org Received: (qmail 26307 invoked by uid 89); 5 Jul 2013 15:14:48 -0000 X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, SPF_PASS, TW_HW autolearn=ham version=3.3.1 Received: from mail-ee0-f47.google.com (HELO mail-ee0-f47.google.com) (74.125.83.47) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 05 Jul 2013 15:14:45 +0000 Received: by mail-ee0-f47.google.com with SMTP id e49so1422785eek.6 for ; Fri, 05 Jul 2013 08:14:43 -0700 (PDT) X-Received: by 10.15.100.195 with SMTP id bn43mr12321937eeb.153.1373037283147; Fri, 05 Jul 2013 08:14:43 -0700 (PDT) Received: from vostro ([83.145.235.199]) by mx.google.com with ESMTPSA id p49sm14745529eeu.2.2013.07.05.08.14.42 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 05 Jul 2013 08:14:42 -0700 (PDT) Date: Fri, 5 Jul 2013 18:15:02 +0300 From: Timo Teras To: crossgcc@sourceware.org Subject: [RFC PATCH] preliminary musl support Message-ID: <20130705181502.5a0ecfe0@vostro> Mime-Version: 1.0 X-IsSubscribed: yes This is mainly for review and comments. There's likely few things to be improved. But this does work - I managed to build my native musl toolchain with this. # HG changeset patch # User Timo Teras # Date 1372743244 0 # Tue Jul 02 05:34:04 2013 +0000 # Node ID ea74ae048cecafd6a9078fe9c621934bc23e39f3 # Parent 2685dfa9de14fbe356ba76cb201bf5c039cf6860 libc/musl: preliminary musl support --- For unsubscribe information see http://sourceware.org/lists.html#faq diff -r 2685dfa9de14 -r ea74ae048cec config/libc.in --- a/config/libc.in Thu May 23 17:51:15 2013 +0200 +++ b/config/libc.in Tue Jul 02 05:34:04 2013 +0000 @@ -28,6 +28,10 @@ bool select LIBC_SUPPORT_THREADS_ANY +config LIBC_SUPPORT_MUSL + bool + select LIBC_SUPPORT_THREADS_ANY + config LIBC_SUPPORT_LINUXTHREADS bool select LIBC_SUPPORT_THREADS_ANY @@ -42,6 +46,7 @@ config THREADS string default "nptl" if THREADS_NPTL + default "musl" if THREADS_MUSL default "linuxthreads" if THREADS_LINUXTHREADS default "win32" if THREADS_WIN32THREADS default "none" if THREADS_NONE || LIBC_none @@ -55,6 +60,7 @@ bool prompt "Threading implementation to use:" default THREADS_NPTL if LIBC_SUPPORT_NPTL + default THREADS_MUSL if LIBC_SUPPORT_MUSL default THREADS_LINUXTHREADS if LIBC_SUPPORT_LINUXTHREADS && ! LIBC_SUPPORT_NPTL default THREADS_WIN32 if LIBC_SUPPORT_WIN32THREADS default THREADS_NONE if ! LIBC_SUPPORT_THREADS_ANY @@ -64,6 +70,11 @@ prompt "nptl" depends on LIBC_SUPPORT_NPTL +config THREADS_MUSL + bool + prompt "musl" + depends on LIBC_SUPPORT_MUSL + config THREADS_LINUXTHREADS bool prompt "linuxthreads" diff -r 2685dfa9de14 -r ea74ae048cec config/libc/musl.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/libc/musl.in Tue Jul 02 05:34:04 2013 +0000 @@ -0,0 +1,42 @@ +# musl options + +## depends on ! WINDOWS && ! BARE_METAL +## +## select LIBC_SUPPORT_THREADS_NONE +## select CC_CORE_PASSES_NEEDED +## +## help The de-facto standard for embeded linux systems. +## help +## help Highly configurable, thus as feature-rich as you +## help need, without compromising for size. + +choice + bool + prompt "musl version" +# Don't remove next line +# CT_INSERT_VERSION_BELOW + +config LIBC_MUSL_V_0_9_11 + bool + prompt "0.9.11" + select LIBC_MUSL_DEFAULTS + +config LIBC_MUSL_CUSTOM + bool + prompt "Custom musl" + select LIBC_MUSL_DEFAULTS + depends on EXPERIMENTAL + +endchoice + +config LIBC_MUSL_DEFAULTS + bool + select LIBC_SUPPORT_MUSL + +config LIBC_VERSION + string +# Don't remove next line +# CT_INSERT_VERSION_STRING_BELOW + default "0.9.11" if LIBC_MUSL_V_0_9_11 + default "custom" if LIBC_MUSL_CUSTOM + diff -r 2685dfa9de14 -r ea74ae048cec config/libc/musl.in.2 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/config/libc/musl.in.2 Tue Jul 02 05:34:04 2013 +0000 @@ -0,0 +1,2 @@ +# musl second-part option + diff -r 2685dfa9de14 -r ea74ae048cec patches/gcc/4.7.2/100-musl.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/gcc/4.7.2/100-musl.patch Tue Jul 02 05:34:04 2013 +0000 @@ -0,0 +1,464 @@ +# HG changeset patch +# Parent 05e4cf5f033d266c8f8fe065f8c5752891c5bf7a +Adding musl to config.sub, so it's recognized as a target platform. + + +diff -r 05e4cf5f033d -r 04a6a82b8e06 config.sub +--- a/config.sub Wed Nov 21 21:16:07 2012 -0500 ++++ b/config.sub Wed Nov 21 21:16:58 2012 -0500 +@@ -125,6 +125,7 @@ + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ +@@ -1346,6 +1347,7 @@ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ ++ | -linux-musl* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +# HG changeset patch +# Parent 04a6a82b8e06669a42181c96381b4fbc3ffa008c +Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. + + +diff -r 04a6a82b8e06 -r 193f80e01b02 libstdc++-v3/configure.host +--- a/libstdc++-v3/configure.host Wed Nov 21 21:16:58 2012 -0500 ++++ b/libstdc++-v3/configure.host Wed Nov 21 21:17:38 2012 -0500 +@@ -243,6 +243,13 @@ + os_include_dir="os/bsd/freebsd" + ;; + gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) ++ # check for musl by target ++ case "${host_os}" in ++ *-musl*) ++ os_include_dir="os/generic" ++ ;; ++ *) ++ + if [ "$uclibc" = "yes" ]; then + os_include_dir="os/uclibc" + elif [ "$bionic" = "yes" ]; then +@@ -251,6 +258,9 @@ + os_include_dir="os/gnu-linux" + fi + ;; ++ ++ esac ++ ;; + hpux*) + os_include_dir="os/hpux" + ;; +# HG changeset patch +# Parent 193f80e01b026d8de7f53d467f2c59cd0b7927dc +Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. + + +diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/config.gcc +--- a/gcc/config.gcc Wed Nov 21 21:17:38 2012 -0500 ++++ b/gcc/config.gcc Wed Nov 21 21:19:19 2012 -0500 +@@ -522,7 +522,7 @@ + esac + + # Common C libraries. +-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" ++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" + + # Common parts for widely ported systems. + case ${target} in +@@ -625,6 +625,9 @@ + *-*-*uclibc*) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" + ;; ++ *-*-*musl*) ++ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" ++ ;; + *) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" + ;; +diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/config/linux.h +--- a/gcc/config/linux.h Wed Nov 21 21:17:38 2012 -0500 ++++ b/gcc/config/linux.h Wed Nov 21 21:19:19 2012 -0500 +@@ -33,10 +33,12 @@ + #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) + #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) + #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) ++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) + #else + #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) + #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) + #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) ++#define OPTION_MUSL (linux_libc == LIBC_MUSL) + #endif + + #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ +@@ -54,18 +56,21 @@ + uClibc or Bionic is the default C library and whether + -muclibc or -mglibc or -mbionic has been passed to change the default. */ + +-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ +- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" ++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ ++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" + + #if DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) + #elif DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) + #elif DEFAULT_LIBC == LIBC_BIONIC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) + #else + #error "Unsupported DEFAULT_LIBC" + #endif /* DEFAULT_LIBC */ +@@ -85,16 +90,16 @@ + + #define GNU_USER_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ +- BIONIC_DYNAMIC_LINKER) ++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + #define GNU_USER_DYNAMIC_LINKER32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ +- BIONIC_DYNAMIC_LINKER32) ++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ +- BIONIC_DYNAMIC_LINKER64) ++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + #define GNU_USER_DYNAMIC_LINKERX32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ +- BIONIC_DYNAMIC_LINKERX32) ++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) + + /* Determine whether the entire c99 runtime + is present in the runtime library. */ +diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/config/linux.opt +--- a/gcc/config/linux.opt Wed Nov 21 21:17:38 2012 -0500 ++++ b/gcc/config/linux.opt Wed Nov 21 21:19:19 2012 -0500 +@@ -30,3 +30,7 @@ + muclibc + Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) + Use uClibc C library ++ ++mmusl ++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) ++Use musl C library +diff -r 193f80e01b02 -r 45cd88d4fb7b gcc/ginclude/stddef.h +--- a/gcc/ginclude/stddef.h Wed Nov 21 21:17:38 2012 -0500 ++++ b/gcc/ginclude/stddef.h Wed Nov 21 21:19:19 2012 -0500 +@@ -184,6 +184,7 @@ + #ifndef _GCC_SIZE_T + #ifndef _SIZET_ + #ifndef __size_t ++#ifndef __DEFINED_size_t /* musl */ + #define __size_t__ /* BeOS */ + #define __SIZE_T__ /* Cray Unicos/Mk */ + #define _SIZE_T +@@ -200,6 +201,7 @@ + #define ___int_size_t_h + #define _GCC_SIZE_T + #define _SIZET_ ++#define __DEFINED_size_t /* musl */ + #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ + || defined(__FreeBSD_kernel__) + /* __size_t is a typedef on FreeBSD 5, must not trash it. */ +@@ -215,6 +217,7 @@ + typedef long ssize_t; + #endif /* __BEOS__ */ + #endif /* !(defined (__GNUG__) && defined (size_t)) */ ++#endif /* __DEFINED_size_t */ + #endif /* __size_t */ + #endif /* _SIZET_ */ + #endif /* _GCC_SIZE_T */ +# HG changeset patch +# Parent 45cd88d4fb7b0e813578c296004eaab2c2d0bfb9 +A fix for libgomp to correctly request a POSIX version for time support. + + +diff -r 45cd88d4fb7b -r 0afd9d82498d libgomp/config/posix/time.c +--- a/libgomp/config/posix/time.c Wed Nov 21 21:19:19 2012 -0500 ++++ b/libgomp/config/posix/time.c Wed Nov 21 21:20:22 2012 -0500 +@@ -28,6 +28,8 @@ + The following implementation uses the most simple POSIX routines. + If present, POSIX 4 clocks should be used instead. */ + ++#define _POSIX_C_SOURCE 199309L /* for clocks */ ++ + #include "libgomp.h" + #include + #if TIME_WITH_SYS_TIME +# HG changeset patch +# Parent 0afd9d82498d2cd30aa78529ff25f211bdc0c3b9 +Support for i386-linux-musl and x86_64-linux-musl. + + +diff -r 0afd9d82498d -r 53f3e21a7d14 gcc/config/i386/linux.h +--- a/gcc/config/i386/linux.h Wed Nov 21 21:20:22 2012 -0500 ++++ b/gcc/config/i386/linux.h Wed Nov 21 21:21:21 2012 -0500 +@@ -22,3 +22,4 @@ + + #define GNU_USER_LINK_EMULATION "elf_i386" + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" +diff -r 0afd9d82498d -r 53f3e21a7d14 gcc/config/i386/linux64.h +--- a/gcc/config/i386/linux64.h Wed Nov 21 21:20:22 2012 -0500 ++++ b/gcc/config/i386/linux64.h Wed Nov 21 21:21:21 2012 -0500 +@@ -31,3 +31,7 @@ + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" ++ ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" ++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" +diff -r 0afd9d82498d -r 53f3e21a7d14 libitm/config/linux/x86/tls.h +--- a/libitm/config/linux/x86/tls.h Wed Nov 21 21:20:22 2012 -0500 ++++ b/libitm/config/linux/x86/tls.h Wed Nov 21 21:21:21 2012 -0500 +@@ -25,16 +25,19 @@ + #ifndef LIBITM_X86_TLS_H + #define LIBITM_X86_TLS_H 1 + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + /* Use slots in the TCB head rather than __thread lookups. + GLIBC has reserved words 10 through 13 for TM. */ + #define HAVE_ARCH_GTM_THREAD 1 + #define HAVE_ARCH_GTM_THREAD_DISP 1 + #endif ++#endif + + #include "config/generic/tls.h" + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + namespace GTM HIDDEN { + + #ifdef __x86_64__ +@@ -101,5 +104,6 @@ + + } // namespace GTM + #endif /* >= GLIBC 2.10 */ ++#endif + + #endif // LIBITM_X86_TLS_H +# HG changeset patch +# Parent 53f3e21a7d14d0514ec7cb9ffb67b24dcf1f9fc9 +Support for arm-linux-musl. + + +diff -r 53f3e21a7d14 -r 0a4e297edad6 gcc/config/arm/linux-eabi.h +--- a/gcc/config/arm/linux-eabi.h Wed Nov 21 21:21:21 2012 -0500 ++++ b/gcc/config/arm/linux-eabi.h Wed Nov 21 21:21:54 2012 -0500 +@@ -64,6 +64,10 @@ + #undef GLIBC_DYNAMIC_LINKER + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" + ++/* musl has no "classic" (i.e. broken) mode */ ++#undef MUSL_DYNAMIC_LINKER ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1" ++ + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ + #undef LINK_SPEC +diff -r 53f3e21a7d14 -r 0a4e297edad6 libitm/config/arm/hwcap.cc +--- a/libitm/config/arm/hwcap.cc Wed Nov 21 21:21:21 2012 -0500 ++++ b/libitm/config/arm/hwcap.cc Wed Nov 21 21:21:54 2012 -0500 +@@ -40,7 +40,11 @@ + + #ifdef __linux__ + #include ++#ifdef __GLIBC__ + #include ++#else ++#include ++#endif + #include + + static void __attribute__((constructor)) +# HG changeset patch +# Parent 0a4e297edad6e46f4b66401b93b217aa3194af4e +Support for mips-linux-musl. + + +diff -r 0a4e297edad6 -r 78025c74c5c1 gcc/config/mips/linux.h +--- a/gcc/config/mips/linux.h Wed Nov 21 21:21:54 2012 -0500 ++++ b/gcc/config/mips/linux.h Wed Nov 21 21:23:49 2012 -0500 +@@ -19,3 +19,5 @@ + . */ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++ ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1" +# HG changeset patch +# Parent 78025c74c5c1705f16ce13f3645ecb86c10cc1c2 +Support for powerpc-linux-musl. + +diff -r 78025c74c5c1 gcc/config.gcc +--- a/gcc/config.gcc Wed Nov 21 21:23:49 2012 -0500 ++++ b/gcc/config.gcc Wed Nov 21 21:45:58 2012 -0500 +@@ -2078,6 +2078,10 @@ + powerpc*-*-linux*paired*) + tm_file="${tm_file} rs6000/750cl.h" ;; + esac ++ case ${target} in ++ *-linux*-musl*) ++ enable_secureplt=yes ;; ++ esac + if test x${enable_secureplt} = xyes; then + tm_file="rs6000/secureplt.h ${tm_file}" + fi +diff -r 78025c74c5c1 gcc/config/rs6000/linux64.h +--- a/gcc/config/rs6000/linux64.h Wed Nov 21 21:23:49 2012 -0500 ++++ b/gcc/config/rs6000/linux64.h Wed Nov 21 21:45:58 2012 -0500 +@@ -362,17 +362,21 @@ + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" + #elif DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER32 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + + + #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ +diff -r 78025c74c5c1 gcc/config/rs6000/secureplt.h +--- a/gcc/config/rs6000/secureplt.h Wed Nov 21 21:23:49 2012 -0500 ++++ b/gcc/config/rs6000/secureplt.h Wed Nov 21 21:45:58 2012 -0500 +@@ -18,3 +18,4 @@ + . */ + + #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" ++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +diff -r 78025c74c5c1 gcc/config/rs6000/sysv4.h +--- a/gcc/config/rs6000/sysv4.h Wed Nov 21 21:23:49 2012 -0500 ++++ b/gcc/config/rs6000/sysv4.h Wed Nov 21 21:45:58 2012 -0500 +@@ -566,6 +566,9 @@ + #ifndef CC1_SECURE_PLT_DEFAULT_SPEC + #define CC1_SECURE_PLT_DEFAULT_SPEC "" + #endif ++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC ++#define LINK_SECURE_PLT_DEFAULT_SPEC "" ++#endif + + /* Pass -G xxx to the compiler and set correct endian mode. */ + #define CC1_SPEC "%{G*} %(cc1_cpu) \ +@@ -626,7 +629,8 @@ + %{mlittle: --oformat elf32-powerpcle } %{mlittle-endian: --oformat elf32-powerpcle } \ + %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \ + %{mcall-i960-old: --oformat elf32-powerpcle} \ +- }}}}" ++ }}}} \ ++%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" + + /* Any specific OS flags. */ + #define LINK_OS_SPEC "\ +@@ -804,15 +808,18 @@ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + + #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -938,6 +945,7 @@ + { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \ + { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \ + { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ ++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ + { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ + { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ + { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ +diff -r 78025c74c5c1 libgcc/config/rs6000/linux-unwind.h +--- a/libgcc/config/rs6000/linux-unwind.h Wed Nov 21 21:23:49 2012 -0500 ++++ b/libgcc/config/rs6000/linux-unwind.h Wed Nov 21 21:45:58 2012 -0500 +@@ -176,6 +176,7 @@ + } + #endif + ++#ifdef __GLIBC__ + /* Find an entry in the process auxiliary vector. The canonical way to + test for VMX is to look at AT_HWCAP. */ + +@@ -207,6 +208,7 @@ + return auxp->a_val; + return 0; + } ++#endif + + /* Do code reading to identify a signal frame, and set the frame + state data appropriately. See unwind-dw2.c for the structs. */ +@@ -253,7 +255,11 @@ + + if (hwcap == 0) + { ++#ifdef __GLIBC__ + hwcap = ppc_linux_aux_vector (16); ++#else ++ hwcap = -1; ++#endif + /* These will already be set if we found AT_HWCAP. A nonzero + value stops us looking again if for some reason we couldn't + find AT_HWCAP. */ +# HG changeset patch +# Parent de922e533313cc0a2af7e1f69a65ed69263904cd +Support (partial) for microblaze-linux-musl. + + +diff -r de922e533313 -r b065d0a4bebb gcc/config.gcc +--- a/gcc/config.gcc Wed Nov 21 21:24:08 2012 -0500 ++++ b/gcc/config.gcc Wed Nov 21 21:31:28 2012 -0500 +@@ -1725,6 +1725,7 @@ + tm_file="${tm_file} dbxelf.h gnu-user.h linux.h microblaze/linux.h" + c_target_objs="${c_target_objs} microblaze-c.o" + cxx_target_objs="${cxx_target_objs} microblaze-c.o" ++ tmake_file="${tmake_file} microblaze/t-microblaze" + ;; + microblaze*-*-*) + tm_file="${tm_file} dbxelf.h" diff -r 2685dfa9de14 -r ea74ae048cec patches/musl/0.9.11/000-fix-make-install-headers.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/musl/0.9.11/000-fix-make-install-headers.patch Tue Jul 02 05:34:04 2013 +0000 @@ -0,0 +1,48 @@ +From d66ab4f1409ad1a2093239ef48b7bca596acdf52 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Mon, 01 Jul 2013 17:43:43 +0000 +Subject: fix Makefile so "make install" works before include/bits symlink exists + +previously, determination of the list of header files for installation +depended on the include/bits symlink (to the arch-specific files) +already having been created. in other words, running "make install" +immediately after configure without first running "make" caused the +bits headers not to be installed. + +the solution I have applied is to pull the list of headers directly +from arch/$(ARCH)/bits rather than include/bits, and likewise to +install directly from arch/$(ARCH)/bits rather than via the symlink. + +at this point, the only purpose served by keeping the symlink around +is that it enables use of the in-tree headers and libs directly via -I +and -L, which can be useful when testing against a new version of the +library before installing it. on the other hand, removing the bits +symlink would be beneficial if we ever want to support building +multiple archs in the same source tree. +--- +diff --git a/Makefile b/Makefile +index 997c5bb..6a86211 100644 +--- a/Makefile ++++ b/Makefile +@@ -37,7 +37,8 @@ CFLAGS_ALL_SHARED = $(CFLAGS_ALL) -fPIC -DSHARED + AR = $(CROSS_COMPILE)ar + RANLIB = $(CROSS_COMPILE)ranlib + +-ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH)) ++ARCH_INCLUDES = $(wildcard arch/$(ARCH)/bits/*.h) ++ALL_INCLUDES = $(sort $(wildcard include/*.h include/*/*.h) $(GENH) $(ARCH_INCLUDES:arch/$(ARCH)/%=include/%)) + + EMPTY_LIB_NAMES = m rt pthread crypt util xnet resolv dl + EMPTY_LIBS = $(EMPTY_LIB_NAMES:%=lib/lib%.a) +@@ -124,6 +125,9 @@ $(DESTDIR)$(libdir)/%.so: lib/%.so + $(DESTDIR)$(libdir)/%: lib/% + install -D -m 644 $< $@ + ++$(DESTDIR)$(includedir)/bits/%: arch/$(ARCH)/bits/% ++ install -D -m 644 $< $@ ++ + $(DESTDIR)$(includedir)/%: include/% + install -D -m 644 $< $@ + +-- +cgit v0.9.0.3-65-g4555 diff -r 2685dfa9de14 -r ea74ae048cec patches/musl/0.9.11/001-ether_h-stubs.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/musl/0.9.11/001-ether_h-stubs.patch Tue Jul 02 05:34:04 2013 +0000 @@ -0,0 +1,53 @@ +From fbcd82040cb67ee14886c6ac4c200cde3662f986 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Mon, 01 Jul 2013 17:50:02 +0000 +Subject: add stubs for additional legacy ether.h functions + +these would not be expensive to actually implement, but reading +/etc/ethers does not sound like a particularly useful feature, so for +now I'm leaving them as stubs. +--- +diff --git a/include/netinet/ether.h b/include/netinet/ether.h +index c5179d5..d64c9ef 100644 +--- a/include/netinet/ether.h ++++ b/include/netinet/ether.h +@@ -4,11 +4,11 @@ + #include + + char *ether_ntoa (const struct ether_addr *); +- + struct ether_addr *ether_aton (const char *); +- + char *ether_ntoa_r (const struct ether_addr *, char *); +- + struct ether_addr *ether_aton_r (const char *, struct ether_addr *); ++int ether_line(const char *, struct ether_addr *, char *); ++int ether_ntohost(char *, const struct ether_addr *); ++int ether_hostton(const char *, struct ether_addr *); + + #endif +diff --git a/src/network/ether.c b/src/network/ether.c +index ac55411..4304a97 100644 +--- a/src/network/ether.c ++++ b/src/network/ether.c +@@ -41,3 +41,18 @@ char *ether_ntoa (const struct ether_addr *p_a) { + static char x[18]; + return ether_ntoa_r (p_a, x); + } ++ ++int ether_line(const char *l, struct ether_addr *e, char *hostname) ++{ ++ return -1; ++} ++ ++int ether_ntohost(char *hostname, const struct ether_addr *e) ++{ ++ return -1; ++} ++ ++int ether_hostton(const char *hostname, struct ether_addr *e) ++{ ++ return -1; ++} +-- +cgit v0.9.0.3-65-g4555 diff -r 2685dfa9de14 -r ea74ae048cec scripts/build/arch/arm.sh --- a/scripts/build/arch/arm.sh Thu May 23 17:51:15 2013 +0200 +++ b/scripts/build/arch/arm.sh Tue Jul 02 05:34:04 2013 +0000 @@ -8,6 +8,7 @@ case "${CT_LIBC},${CT_ARCH_ARM_EABI}" in *glibc,y) CT_TARGET_SYS=gnueabi;; uClibc,y) CT_TARGET_SYS=uclibcgnueabi;; + musl,y) CT_TARGET_SYS=muslgnueabi;; *,y) CT_TARGET_SYS=eabi;; esac diff -r 2685dfa9de14 -r ea74ae048cec scripts/build/cc/gcc.sh --- a/scripts/build/cc/gcc.sh Thu May 23 17:51:15 2013 +0200 +++ b/scripts/build/cc/gcc.sh Tue Jul 02 05:34:04 2013 +0000 @@ -86,6 +86,9 @@ if [ "${CT_CC_CORE_PASSES_NEEDED}" != "y" ]; then return 0 fi + if [ "${CT_LIBC}" = "musl" ]; then + return 0 + fi core_opts+=( "mode=static" ) core_opts+=( "host=${CT_BUILD}" ) diff -r 2685dfa9de14 -r ea74ae048cec scripts/build/libc/musl.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/build/libc/musl.sh Tue Jul 02 05:34:04 2013 +0000 @@ -0,0 +1,97 @@ +# This file adds functions to build the musl C library +# Copyright 2013 Timo Teräs +# Licensed under the GPL v2. See COPYING in the root of this package +# + +do_libc_get() { + local libc_src + + libc_src="http://www.musl-libc.org/releases" + + if [ "${CT_LIBC_MUSL_CUSTOM}" = "y" ]; then + CT_GetCustom "musl" "${CT_LIBC_VERSION}" \ + "${CT_LIBC_MUSL_CUSTOM_LOCATION}" + else # ! custom location + CT_GetFile "musl-${CT_LIBC_VERSION}" ${libc_src} + fi # ! custom location +} + +do_libc_extract() { + # If using custom directory location, nothing to do + if [ "${CT_LIBC_MUSL_CUSTOM}" != "y" \ + -a -d "${CT_SRC_DIR}/musl-${CT_LIBC_VERSION}" ]; then + return 0 + fi + + CT_Extract "musl-${CT_LIBC_VERSION}" + CT_Patch "musl" "${CT_LIBC_VERSION}" +} + +do_libc_check_config() { + : +} + +do_libc_configure() { + CT_DoLog EXTRA "Configuring C library" + + # Note: musl handles the build/host/target a little bit differently + # than one would expect: + # build : not used + # host : the machine building musl + # target : the machine musl runs on + CT_DoExecLog CFG \ + CROSS_COMPILE="${CT_TARGET}-" \ + ./configure \ + --host=${CT_BUILD} \ + --target=${CT_TARGET} \ + --prefix=/usr \ + --disable-gcc-wrapper +} + +do_libc_start_files() { + local ARCH + + CT_DoStep INFO "Installing C library headers" + + # Simply copy files until musl has the ability to build out-of-tree + CT_DoLog EXTRA "Copying sources to build dir" + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/musl-${CT_LIBC_VERSION}" \ + "${CT_BUILD_DIR}/build-libc-headers" + cd "${CT_BUILD_DIR}/build-libc-headers" + + # musl can be installed without gcc if arch is known + case "${CT_TARGET}" in + arm*) ARCH=arm ;; + i?86*) ARCH=i386 ;; + x86_64*) ARCH=x86_64 ;; + mips-*|mipsel-*) ARCH=mips ;; + microblaze-*) ARCH=microblaze ;; + powerpc-*) ARCH=powerpc ;; + *) return 1 ;; + esac + + CT_DoLog EXTRA "Installing headers" + CT_DoExecLog ALL make ARCH="${ARCH}" install-headers DESTDIR="${CT_SYSROOT_DIR}/" + + CT_EndStep +} + +do_libc() { + CT_DoStep INFO "Installing C library" + + # Simply copy files until musl has the ability to build out-of-tree + CT_DoLog EXTRA "Copying sources to build dir" + CT_DoExecLog ALL cp -av "${CT_SRC_DIR}/musl-${CT_LIBC_VERSION}" \ + "${CT_BUILD_DIR}/build-libc" + cd "${CT_BUILD_DIR}/build-libc" + + do_libc_configure + + CT_DoLog EXTRA "Building C library" + CT_DoExecLog ALL make ${JOBSFLAGS} + + CT_DoLog EXTRA "Installing C library" + CT_DoExecLog ALL make install DESTDIR="${CT_SYSROOT_DIR}/" + + CT_EndStep +} diff -r 2685dfa9de14 -r ea74ae048cec scripts/functions --- a/scripts/functions Thu May 23 17:51:15 2013 +0200 +++ b/scripts/functions Tue Jul 02 05:34:04 2013 +0000 @@ -1132,6 +1132,7 @@ case "${CT_LIBC}" in *glibc) CT_TARGET_SYS=gnu;; uClibc) CT_TARGET_SYS=uclibc;; + musl) CT_TARGET_SYS=musl;; *) CT_TARGET_SYS=elf;; esac