diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8d684db633782acf8099648bb978137edce14b9..943f0e07c68945f925f0adea9524ad3c632ad548 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,22 @@
+2006-02-06  Aldy Hernandez  <aldyh@redhat.com>
+
+	* config/s390/s390.c (TARGET_MANGLE_FUNDAMENTAL_TYPE): Define.
+	(s390_mangle_fundamental_type): New.
+	* config/s390/linux.h (TARGET_ALTERNATE_LONG_DOUBLE_MANGLING):
+	Define.
+
+	* config/alpha/alpha.c (TARGET_MANGLE_FUNDAMENTAL_TYPE): Define.
+	(alpha_mangle_fundamental_type): New.
+	* config/alpha/linux.h (TARGET_ALTERNATE_LONG_DOUBLE_MANGLING):
+	Define.
+
+	* config/sparc/linux.h (TARGET_ALTERNATE_LONG_DOUBLE_MANGLING):
+	Define.
+	* config/sparc/linux64.h (TARGET_ALTERNATE_LONG_DOUBLE_MANGLING):
+	Define.
+	* config/sparc/sparc.c (TARGET_MANGLE_FUNDAMENTAL_TYPE): Define.
+	(sparc_mangle_fundamental_type): New.
+
 2006-02-06  Jakub Jelinek  <jakub@redhat.com>
 
 	* config.gcc (s390-*-linux*): Add s390/t-linux to tmake_file.
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index c684a4cb1e26bd315154a72af1eef4a65ed76dc0..909035a269400562850a20b08d51ea55ea1524fc 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -235,6 +235,21 @@ alpha_handle_option (size_t code, const char *arg, int value)
   return true;
 }
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+/* Implement TARGET_MANGLE_FUNDAMENTAL_TYPE.  */
+
+static const char *
+alpha_mangle_fundamental_type (tree type)
+{
+  if (TYPE_MAIN_VARIANT (type) == long_double_type_node
+      && TARGET_LONG_DOUBLE_128)
+    return "g";
+
+  /* For all other types, use normal C++ mangling.  */
+  return NULL;
+}
+#endif
+
 /* Parse target option strings.  */
 
 void
@@ -10722,6 +10737,11 @@ alpha_init_libfuncs (void)
 #undef TARGET_HANDLE_OPTION
 #define TARGET_HANDLE_OPTION alpha_handle_option
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+#undef TARGET_MANGLE_FUNDAMENTAL_TYPE
+#define TARGET_MANGLE_FUNDAMENTAL_TYPE alpha_mangle_fundamental_type
+#endif
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 
diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h
index ffb581c4f53e15ddff65a537a94f425895794c8f..3aa9d0005da81dcc12ad50945c7e060a3cb0e213 100644
--- a/gcc/config/alpha/linux.h
+++ b/gcc/config/alpha/linux.h
@@ -77,3 +77,6 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #define MD_UNWIND_SUPPORT "config/alpha/linux-unwind.h"
+
+/* Define if long doubles should be mangled as 'g'.  */
+#define TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
index 7fd5711a8a412e9ef21953bbc99d016a9642f0fd..fcb6dff0317304b0b15c21f7c4c1518f07606bd9 100644
--- a/gcc/config/s390/linux.h
+++ b/gcc/config/s390/linux.h
@@ -95,4 +95,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #define TARGET_THREAD_SSP_OFFSET        (TARGET_64BIT ? 0x28 : 0x14)
 #endif
 
+/* Define if long doubles should be mangled as 'g'.  */
+#define TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+
 #endif
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index dfefaca21fcf383e21cef29aef22f047f4660a6b..bdf1512554126d79a5619c6c6aa8312f7692d2d2 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -4293,6 +4293,21 @@ s390_output_dwarf_dtprel (FILE *file, int size, rtx x)
   fputs ("@DTPOFF", file);
 }
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+/* Implement TARGET_MANGLE_FUNDAMENTAL_TYPE.  */
+
+static const char *
+s390_mangle_fundamental_type (tree type)
+{
+  if (TYPE_MAIN_VARIANT (type) == long_double_type_node
+      && TARGET_LONG_DOUBLE_128)
+    return "g";
+
+  /* For all other types, use normal C++ mangling.  */
+  return NULL;
+}
+#endif
+
 /* In the name of slightly smaller debug output, and to cater to
    general assembler lossage, recognize various UNSPEC sequences
    and turn them back into a direct symbol reference.  */
@@ -9185,6 +9200,11 @@ s390_reorg (void)
 #define TARGET_ASM_OUTPUT_DWARF_DTPREL s390_output_dwarf_dtprel
 #endif
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+#undef TARGET_MANGLE_FUNDAMENTAL_TYPE
+#define TARGET_MANGLE_FUNDAMENTAL_TYPE s390_mangle_fundamental_type
+#endif
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 #include "gt-s390.h"
diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
index 10edd746f7f965b9533faf85006558e8a3362ec5..df0fe58bc7352922fb98e47332d51db2e8425b25 100644
--- a/gcc/config/sparc/linux.h
+++ b/gcc/config/sparc/linux.h
@@ -229,3 +229,6 @@ do {									\
 /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14].  */
 #define TARGET_THREAD_SSP_OFFSET	0x14
 #endif
+
+/* Define if long doubles should be mangled as 'g'.  */
+#define TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
index e4fe918e6a42d5df11fa8f446a5e5dd0e0321158..f997fee37f7cd4be42689b4cbc62473c40948d72 100644
--- a/gcc/config/sparc/linux64.h
+++ b/gcc/config/sparc/linux64.h
@@ -364,3 +364,6 @@ do {									\
    sparc64 glibc provides it at [%g7 + 0x28].  */
 #define TARGET_THREAD_SSP_OFFSET	(TARGET_ARCH64 ? 0x28 : 0x14)
 #endif
+
+/* Define if long doubles should be mangled as 'g'.  */
+#define TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 2d2adba0ab06235880412b8a9d63968ff1150f37..c633e8a9fc7c441395c6c4fd7fc32469781a7828 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -368,6 +368,9 @@ static int sparc_arg_partial_bytes (CUMULATIVE_ARGS *,
 static void sparc_dwarf_handle_frame_unspec (const char *, rtx, int);
 static void sparc_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED;
 static void sparc_file_end (void);
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+static const char *sparc_mangle_fundamental_type (tree);
+#endif
 #ifdef SUBTARGET_ATTRIBUTE_TABLE
 const struct attribute_spec sparc_attribute_table[];
 #endif
@@ -527,6 +530,11 @@ static bool fpu_option_set = false;
 #undef TARGET_ASM_FILE_END
 #define TARGET_ASM_FILE_END sparc_file_end
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+#undef TARGET_MANGLE_FUNDAMENTAL_TYPE
+#define TARGET_MANGLE_FUNDAMENTAL_TYPE sparc_mangle_fundamental_type
+#endif
+
 struct gcc_target targetm = TARGET_INITIALIZER;
 
 /* Implement TARGET_HANDLE_OPTION.  */
@@ -8713,6 +8721,22 @@ sparc_file_end (void)
     file_end_indicate_exec_stack ();
 }
 
+#ifdef TARGET_ALTERNATE_LONG_DOUBLE_MANGLING
+/* Implement TARGET_MANGLE_FUNDAMENTAL_TYPE.  */
+
+static const char *
+sparc_mangle_fundamental_type (tree type)
+{
+  if (!TARGET_64BIT
+      && TYPE_MAIN_VARIANT (type) == long_double_type_node
+      && TARGET_LONG_DOUBLE_128)
+    return "g";
+
+  /* For all other types, use normal C++ mangling.  */
+  return NULL;
+}
+#endif
+
 /* Expand code to perform a 8 or 16-bit compare and swap by doing 32-bit
    compare and swap on the word containing the byte or half-word.  */