From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Fri, 15 Nov 2019 19:47:12 +0000 (+0000)
Subject: m68k: add musl support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=838fd641a6ffb7e4734321de14385bece3e4506b;p=gcc.git

m68k: add musl support

Add the dynamic linker name and fix a type name to use the public name
instead of the glibc internal name.

gcc/ChangeLog:

2019-11-15  Szabolcs Nagy  <szabolcs.nagy@arm.com>

	* config/m68k/linux.h (MUSL_DYNAMIC_LINKER): Define.

libgcc/ChangeLog:

2019-11-15  Szabolcs Nagy  <szabolcs.nagy@arm.com>

	* config/m68k/linux-unwind.h (struct uw_ucontext): Use sigset_t instead
	of __sigset_t.

From-SVN: r278312
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e5b735ef50a..ef62b5dee44 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-11-15  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* config/m68k/linux.h (MUSL_DYNAMIC_LINKER): Define.
+
 2019-11-15  Nick Clifton  <nickc@redhat.com>
 	    Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h
index ebdf0281071..beef554b31c 100644
--- a/gcc/config/m68k/linux.h
+++ b/gcc/config/m68k/linux.h
@@ -73,6 +73,9 @@ along with GCC; see the file COPYING3.  If not see
 
 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
 
+#undef MUSL_DYNAMIC_LINKER
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-m68k.so.1"
+
 #undef LINK_SPEC
 #define LINK_SPEC "-m m68kelf %{shared} \
   %{!shared: \
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index dfc842d0125..a93048c8751 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-15  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* config/m68k/linux-unwind.h (struct uw_ucontext): Use sigset_t instead
+	of __sigset_t.
+
 2019-11-14  Jerome Lambourg  <lambourg@adacore.com>
 	    Doug Rupp <rupp@adacore.com>
 	    Olivier Hainque  <hainque@adacore.com>
diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
index fbe0d4748ba..57c354ee9b4 100644
--- a/libgcc/config/m68k/linux-unwind.h
+++ b/libgcc/config/m68k/linux-unwind.h
@@ -37,7 +37,7 @@ struct uw_ucontext {
 	stack_t		  uc_stack;
 	mcontext_t	  uc_mcontext;
 	unsigned long	  uc_filler[80];
-	__sigset_t	  uc_sigmask;
+	sigset_t	  uc_sigmask;
 };
 
 #define MD_FALLBACK_FRAME_STATE_FOR m68k_fallback_frame_state