Merge pull request #536 from stilor/musl-update

Musl update to 1.1.16
crosstool-ng · Jan 16, 2017 · 2b2c496 · 2b2c496
2 parents ef58f6c + 41bdf88
commit 2b2c496
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 298 deletions.
diff --git a/config/libc/musl.in b/config/libc/musl.in
@@ -53,17 +53,23 @@ choice
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
-config LIBC_MUSL_V_1_1
+config LIBC_MUSL_V_1_1_16
     bool
-    prompt "1.1.15 (Mainline)"
+    prompt "1.1.16"
     depends on EXPERIMENTAL
 
+config LIBC_MUSL_V_1_1_15
+    bool
+    prompt "1.1.15 (OBSOLETE)"
+    depends on EXPERIMENTAL && OBSOLETE
+
 endchoice
 
 config LIBC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
-    default "1.1.15" if LIBC_MUSL_V_1_1
+    default "1.1.16" if LIBC_MUSL_V_1_1_16
+    default "1.1.15" if LIBC_MUSL_V_1_1_15
 
 endif # ! LIBC_MUSL_CUSTOM
diff --git a/patches/musl/1.0.4/0001-max_align_t.patch b/patches/musl/1.0.4/0001-max_align_t.patch
diff --git a/patches/musl/1.1.4/0001-max_align_t.patch b/patches/musl/1.1.4/0001-max_align_t.patch
diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
@@ -18,7 +18,7 @@ doHelp() {
           'tool' in one of:
             gcc, binutils, glibc, uClibc, uClibc-ng, newlib, linux, gdb,
             duma, strace, ltrace, libelf, gmp, mpfr, isl, cloog, mpc,
-            mingw-w64, expat, ncurses
+            mingw-w64, expat, ncurses, musl
 
           Valid options for all tools:
             --stable, -s, +x   (default)
@@ -151,7 +151,7 @@ addToolVersion() {
             ver_M=$(getVersionField "${version}" . 1)
             ver_m=$(getVersionField "${version}" . 2)
             ver_p=$(getVersionField "${version}" . 3)
-            if [  ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -eq 33 ]; then
+            if [  ${ver_M} -eq 1 -a ${ver_m} -eq 0 -a ${ver_p} -eq 15 ]; then
                 SedExpr1="${SedExpr1}\n    select LIBC_UCLIBC_NG_1_0_15_or_later"
             fi
             ;;
@@ -195,6 +195,7 @@ while [ $# -gt 0 ]; do
         --uClibc-ng)EXP=; OBS=; cat=LIBC_UCLIBC_NG; tool=uClibc;    tool_prefix=libc;            dot2suffix=;;
         --newlib)   EXP=; OBS=; cat=LIBC_NEWLIB;    tool=newlib;    tool_prefix=libc;            dot2suffix=;;
         --mingw-w64)EXP=; OBS=; cat=WINAPI;         tool=mingw;     tool_prefix=libc;            dot2suffix=;;
+        --musl)     EXP=; OBS=; cat=LIBC_MUSL;      tool=musl;      tool_prefix=libc;            dot2suffix=;;
         --linux)    EXP=; OBS=; cat=KERNEL;         tool=linux;     tool_prefix=kernel;          dot2suffix=;;
         --gdb)      EXP=; OBS=; cat=GDB;            tool=gdb;       tool_prefix=debug;           dot2suffix=;;
         --duma)     EXP=; OBS=; cat=DUMA;           tool=duma;      tool_prefix=debug;           dot2suffix=;;