diff options
| author | Yvan Roux <yvan.roux@linaro.org> | 2016-09-05 19:08:55 +0200 |
|---|---|---|
| committer | Yvan Roux <yvan.roux@linaro.org> | 2016-09-07 22:09:01 +0200 |
| commit | e95b52e38b9f8596a7313170ae78286bb3772bb3 (patch) | |
| tree | 05cd129f8047e0b3b56430a2bd04c65cd49a710b | |
| parent | 7dadbcddcdaa2d76e0f9b5678e5d9fff255040a1 (diff) | |
gcc/
Backport from trunk r239859.
2016-08-30 Szabolcs Nagy <szabolcs.nagy@arm.com>
* config.gcc (*-*-*musl*): Disable gnu-indirect-function.
gcc/
Backport from trunk r239860.
2016-08-30 Szabolcs Nagy <szabolcs.nagy@arm.com>
* config/linux.c (linux_libc_has_function): Return true on musl.
Change-Id: Icd70e2db3b64b05fda721452e4a08c575e7a8832
| -rw-r--r-- | gcc/config.gcc | 4 | ||||
| -rw-r--r-- | gcc/config/linux.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gcc/config.gcc b/gcc/config.gcc index 0cbf84be1e2..00d010ece1f 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1484,7 +1484,7 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i extra_options="${extra_options} linux-android.opt" # Assume modern glibc if not targeting Android nor uclibc. case ${target} in - *-*-*android*|*-*-*uclibc*) + *-*-*android*|*-*-*uclibc*|*-*-*musl*) ;; *) default_gnu_indirect_function=yes @@ -1553,7 +1553,7 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu) extra_options="${extra_options} linux-android.opt" # Assume modern glibc if not targeting Android nor uclibc. case ${target} in - *-*-*android*|*-*-*uclibc*) + *-*-*android*|*-*-*uclibc*|*-*-*musl*) ;; *) default_gnu_indirect_function=yes diff --git a/gcc/config/linux.c b/gcc/config/linux.c index 250296bf425..16c37683b7d 100644 --- a/gcc/config/linux.c +++ b/gcc/config/linux.c @@ -26,7 +26,7 @@ along with GCC; see the file COPYING3. If not see bool linux_libc_has_function (enum function_class fn_class) { - if (OPTION_GLIBC) + if (OPTION_GLIBC || OPTION_MUSL) return true; if (OPTION_BIONIC) if (fn_class == function_c94 |