aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzabolcs Nagy <szabolcs.nagy@arm.com>2017-06-28 16:02:42 +0000
committerSzabolcs Nagy <nsz@gcc.gnu.org>2017-06-28 16:02:42 +0000
commitad669a1af4009b2d1f667716874758d91282869b (patch)
tree7eb1505fc5301b0499a19fe2c95393cd488cdf92
parent0ddc0ebc887b384fcb847743400be762b1a26f6d (diff)
downloadgcc-ad669a1af4009b2d1f667716874758d91282869b.zip
gcc-ad669a1af4009b2d1f667716874758d91282869b.tar.gz
gcc-ad669a1af4009b2d1f667716874758d91282869b.tar.bz2
multiarch support for non-glibc linux systems
Current multiarch directory name is always *-linux-gnu* on linux, this patch configures different names for uclibc and musl targets. 2017-06-28 Szabolcs Nagy <szabolcs.nagy@arm.com> * config.gcc (*-linux-musl*): Add t-musl tmake_file. (*-linux-uclibc*): Add t-uclibc tmake_file. * config/t-musl: New. * config/t-uclibc: New. From-SVN: r249745
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config.gcc10
-rw-r--r--gcc/config/t-musl2
-rw-r--r--gcc/config/t-uclibc2
4 files changed, 21 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0849c90..2ecc04d9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2017-06-28 Szabolcs Nagy <szabolcs.nagy@arm.com>
+
+ * config.gcc (*-linux-musl*): Add t-musl tmake_file.
+ (*-linux-uclibc*): Add t-uclibc tmake_file.
+ * config/t-musl: New.
+ * config/t-uclibc: New.
+
2017-06-28 Richard Earnshaw <rearnsha@arm.com>
* config/arm/parsecpu.awk (profile): Parse new keyword in an arch
diff --git a/gcc/config.gcc b/gcc/config.gcc
index a97bbc8..c5ae8ca 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -3112,6 +3112,16 @@ powerpc*-*-* | rs6000-*-*)
tm_file="${tm_file} ${cpu_type}/option-defaults.h"
esac
+# non-glibc systems
+case ${target} in
+*-linux-musl*)
+ tmake_file="${tmake_file} t-musl"
+ ;;
+*-linux-uclibc*)
+ tmake_file="${tmake_file} t-uclibc"
+ ;;
+esac
+
# Build mkoffload tool
case ${target} in
*-intelmic-* | *-intelmicemul-*)
diff --git a/gcc/config/t-musl b/gcc/config/t-musl
new file mode 100644
index 0000000..e203fce7
--- /dev/null
+++ b/gcc/config/t-musl
@@ -0,0 +1,2 @@
+MULTIARCH_DIRNAME := $(subst -linux-gnu,-linux-musl,$(MULTIARCH_DIRNAME))
+MULTILIB_OSDIRNAMES := $(subst -linux-gnu,-linux-musl,$(MULTILIB_OSDIRNAMES))
diff --git a/gcc/config/t-uclibc b/gcc/config/t-uclibc
new file mode 100644
index 0000000..c9b3a7b
--- /dev/null
+++ b/gcc/config/t-uclibc
@@ -0,0 +1,2 @@
+MULTIARCH_DIRNAME := $(subst -linux-gnu,-linux-uclibc,$(MULTIARCH_DIRNAME))
+MULTILIB_OSDIRNAMES := $(subst -linux-gnu,-linux-uclibc,$(MULTILIB_OSDIRNAMES))