Index: head/devel/powerpc64-gcc/files/patch-gcc-freebsd-mips =================================================================== --- head/devel/powerpc64-gcc/files/patch-gcc-freebsd-mips (revision 472010) +++ head/devel/powerpc64-gcc/files/patch-gcc-freebsd-mips (revision 472011) @@ -1,427 +1,400 @@ diff --git a/gcc/config.gcc b/gcc/config.gcc index 90d4f71..5a05e22 100644 --- gcc/config.gcc +++ gcc/config.gcc @@ -1949,6 +1949,26 @@ microblaze*-*-elf) cxx_target_objs="${cxx_target_objs} microblaze-c.o" tmake_file="${tmake_file} microblaze/t-microblaze" ;; +mips*-*-freebsd*) # FreeBSD/mips[64], either endian. + tm_file="${tm_file} elfos.h ${fbsd_tm_file} mips/elf.h mips/freebsd.h" -+ target_cpu_default=MASK_SOFT_FLOAT_ABI ++ target_cpu_default="MASK_ABICALLS|MASK_SOFT_FLOAT_ABI" + case ${target} in + mips64*-*-freebsd*) + tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_64" + ;; -+ mips32*-*-freebsd*) -+ tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32 MIPS_ISA_DEFAULT=33" -+ ;; + mipsn32*-*-freebsd*) -+ tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32 MIPS_ISA_DEFAULT=33" ++ tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32" + ;; ++ mips*-*-freebsd*) ++ tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32 MIPS_ISA_DEFAULT=3" ++ ;; + esac + case ${target} in + mips*el-*-freebsd*) + tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0"; + ;; + esac + ;; mips*-*-netbsd*) # NetBSD/mips, either endian. target_cpu_default="MASK_ABICALLS" tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h" diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h index c1d5553..5d882e3 100644 --- gcc/config/elfos.h +++ gcc/config/elfos.h @@ -198,7 +198,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define ASCII_DATA_ASM_OP "\t.ascii\t" /* Support a read-only data section. */ +#ifndef READONLY_DATA_SECTION_ASM_OP #define READONLY_DATA_SECTION_ASM_OP "\t.section\t.rodata" +#endif /* On svr4, we *do* have support for the .init and .fini sections, and we can put stuff in there to be executed before and after `main'. We let @@ -292,6 +294,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define USE_GNU_UNIQUE_OBJECT 0 #endif +#ifndef ASM_DECLARE_OBJECT_NAME #define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL) \ do \ { \ @@ -320,6 +323,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see ASM_OUTPUT_LABEL (FILE, NAME); \ } \ while (0) +#endif /* Output the size directive for a decl in rest_of_decl_compilation in the case where we did not do so before the initializer. diff --git a/gcc/config/mips/freebsd.h b/gcc/config/mips/freebsd.h new file mode 100644 index 0000000..56a921e --- /dev/null +++ gcc/config/mips/freebsd.h -@@ -0,0 +1,347 @@ +@@ -0,0 +1,320 @@ +/* Definitions for MIPS varients running FreeBSD with ELF format + Copyright (C) 2008 Free Software Foundation, Inc. + Continued by David O'Brien + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ + +/* $FreeBSD$ */ + +#undef SUBTARGET_EXTRA_SPECS /* mips.h bogusly defines it. */ +#define SUBTARGET_EXTRA_SPECS \ + { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER}, \ + { "fbsd_link_spec", FBSD_LINK_SPEC } + +/* config/mips/mips.h defines CC1_SPEC, + but gives us an "out" with SUBTARGET_CC1_SPEC. */ +#undef SUBTARGET_CC1_SPEC +#define SUBTARGET_CC1_SPEC "%{profile:-p}" + +/* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support + for the special GCC options -static and -shared, which allow us to + link things in one of these three modes by applying the appropriate + combinations of options at link-time. We like to support here for + as many of the other GNU linker options as possible. But I don't + have the time to search for those flags. I am sure how to add + support for -soname shared_object_name. H.J. + + When the -shared link option is used a final link is not being + done. */ + +#define FBSD_LINK_SPEC "\ + %{p:%nconsider using `-pg' instead of `-p' with gprof(1) } \ + %{v:-V} \ + %{assert*} %{R*} %{rpath*} %{defsym*} \ + %{shared:-Bshareable %{h*} %{soname*}} \ + %{!static:--enable-new-dtags} \ + %{!shared: \ + %{!static: \ + %{rdynamic: -export-dynamic} \ + %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \ + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic} " + +#undef LINK_SPEC +#define LINK_SPEC "\ + %{EB} %{EL} %(endian_spec) \ + %{G*} %{mips1} %{mips2} %{mips3} %{mips4} \ + %{mips32} %{mips32r2} %{mips64} %{mips64r2} \ + %{bestGnum} %{call_shared} %{no_archive} %{exact_version} \ + %{mabi=32:-melf32%{EB:b}%{EL:l}tsmip_fbsd} \ + %{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32_fbsd} \ + %{mabi=64:-melf64%{EB:b}%{EL:l}tsmip_fbsd} \ + %{mabi=o64:-melf64%{EB:b}%{EL:l}tsmip_fbsd} \ + %(fbsd_link_spec)" + +#undef LINK_GCC_C_SEQUENCE_SPEC +#define LINK_GCC_C_SEQUENCE_SPEC \ + "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}" + +/* Reset our STARTFILE_SPEC which was properly set in config/freebsd.h + but trashed by config/mips/elf.h. */ +#undef STARTFILE_SPEC +#define STARTFILE_SPEC FBSD_STARTFILE_SPEC + +/* Provide an ENDFILE_SPEC appropriate for FreeBSD/mips. */ +#undef ENDFILE_SPEC +#define ENDFILE_SPEC FBSD_ENDFILE_SPEC + +/* Reset our LIB_SPEC which was properly set in config/freebsd.h + but trashed by config/mips/elf.h. */ +#undef LIB_SPEC +#define LIB_SPEC FBSD_LIB_SPEC + +/* config/mips/mips.h defines CPP_SPEC, and it expects SUBTARGET_CPP_SPEC. */ +#undef SUBTARGET_CPP_SPEC +#define SUBTARGET_CPP_SPEC FBSD_CPP_SPEC + + +/************************[ Target stuff ]***********************************/ + +/* Define the actual types of some ANSI-mandated types. + Needs to agree with . GCC defaults come from c-decl.c, + c-common.c, and config//.h. */ + +#undef TARGET_DEFAULT +#define TARGET_DEFAULT (MASK_ABICALLS | MASK_SOFT_FLOAT_ABI) + +/* The generic MIPS TARGET_CPU_CPP_BUILTINS are incorrect for FreeBSD. + Specifically, they define too many namespace-invasive macros. Override + them here. Note this is structured for easy comparison to the version + in mips.h. */ + +#undef TARGET_CPU_CPP_BUILTINS +#define TARGET_CPU_CPP_BUILTINS() \ + do \ + { \ + builtin_assert ("machine=mips"); \ + builtin_assert ("cpu=mips"); \ + builtin_define ("__mips__"); \ + \ + if (TARGET_64BIT) \ + builtin_define ("__mips64"); \ + \ + if (TARGET_FLOAT64) \ + builtin_define ("__mips_fpr=64"); \ + else \ + builtin_define ("__mips_fpr=32"); \ + \ + if (TARGET_MIPS16) \ + builtin_define ("__mips16"); \ + \ + if (mips_abi == ABI_N32) \ + { \ + builtin_define ("__mips_n32"); \ + builtin_define ("_ABIN32=2"); \ + builtin_define ("_MIPS_SIM=_ABIN32"); \ + builtin_define ("_MIPS_SZLONG=32"); \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + else if (mips_abi == ABI_64) \ + { \ + builtin_define ("__mips_n64"); \ + builtin_define ("_ABI64=3"); \ + builtin_define ("_MIPS_SIM=_ABI64"); \ + builtin_define ("_MIPS_SZLONG=64"); \ + builtin_define ("_MIPS_SZPTR=64"); \ + } \ + else if (mips_abi == ABI_O64) \ + { \ + builtin_define ("__mips_o64"); \ + builtin_define ("_ABIO64=4"); \ + builtin_define ("_MIPS_SIM=_ABIO64"); \ + builtin_define ("_MIPS_SZLONG=64"); \ + builtin_define ("_MIPS_SZPTR=64"); \ + } \ + else if (mips_abi == ABI_EABI) \ + { \ + builtin_define ("__mips_eabi"); \ + builtin_define ("_ABIEMB=5"); \ + builtin_define ("_MIPS_SIM=_ABIEMB"); \ + if (TARGET_LONG64) \ + builtin_define ("_MIPS_SZLONG=64"); \ + else \ + builtin_define ("_MIPS_SZLONG=32"); \ + if (TARGET_64BIT) \ + builtin_define ("_MIPS_SZPTR=64"); \ + else \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + else \ + { \ + builtin_define ("__mips_o32"); \ + builtin_define ("_ABIO32=1"); \ + builtin_define ("_MIPS_SIM=_ABIO32"); \ + builtin_define ("_MIPS_SZLONG=32"); \ + builtin_define ("_MIPS_SZPTR=32"); \ + } \ + if (TARGET_FLOAT64) \ + builtin_define ("_MIPS_FPSET=32"); \ + else \ + builtin_define ("_MIPS_FPSET=16"); \ + \ + builtin_define ("_MIPS_SZINT=32"); \ + \ + MIPS_CPP_SET_PROCESSOR ("_MIPS_ARCH", mips_arch_info); \ + MIPS_CPP_SET_PROCESSOR ("_MIPS_TUNE", mips_tune_info); \ + \ + if (ISA_MIPS1) \ + { \ + builtin_define ("__mips=1"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS1"); \ + } \ + else if (ISA_MIPS2) \ + { \ + builtin_define ("__mips=2"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS2"); \ + } \ + else if (ISA_MIPS3) \ + { \ + builtin_define ("__mips=3"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS3"); \ + } \ + else if (ISA_MIPS4) \ + { \ + builtin_define ("__mips=4"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS4"); \ + } \ + else if (ISA_MIPS32) \ + { \ + builtin_define ("__mips=32"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS32"); \ + builtin_define ("__mips_isa_rev=1"); \ + } \ + else if (ISA_MIPS32R2) \ + { \ + builtin_define ("__mips=32"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS32"); \ + builtin_define ("__mips_isa_rev=2"); \ + } \ + else if (ISA_MIPS64) \ + { \ + builtin_define ("__mips=64"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS64"); \ + builtin_define ("__mips_isa_rev=1"); \ + } \ + else if (ISA_MIPS64R2) \ + { \ + builtin_define ("__mips=64"); \ + builtin_define ("_MIPS_ISA=_MIPS_ISA_MIPS64"); \ + builtin_define ("__mips_isa_rev=2"); \ + } \ + \ + if (TARGET_HARD_FLOAT) \ + builtin_define ("__mips_hard_float"); \ + else if (TARGET_SOFT_FLOAT) \ + builtin_define ("__mips_soft_float"); \ + \ + if (TARGET_SINGLE_FLOAT) \ + builtin_define ("__mips_single_float"); \ + \ + if (TARGET_BIG_ENDIAN) \ + builtin_define ("__MIPSEB__"); \ + else \ + builtin_define ("__MIPSEL__"); \ + \ + /* No language dialect defines. */ \ + if (TARGET_ABICALLS) \ + builtin_define ("__ABICALLS__"); \ + } \ + while (0) + -+/* Default ABI and ISA */ -+/* -+ * XXX/juli -+ * Shouldn't this also be dependent on !mips*? -+ */ -+#ifdef MIPS_CPU_STRING_DEFAULT -+#define DRIVER_SELF_ISA_SPEC "%{!march=*: -march=" MIPS_CPU_STRING_DEFAULT "}" -+#else -+#define DRIVER_SELF_ISA_SPEC "%{!march=*: -march=from-abi}" -+#endif -+ ++/* Always pass ISA to drivers */ +#undef DRIVER_SELF_SPECS -+#if MIPS_ABI_DEFAULT == ABI_N32 -+#define DRIVER_SELF_SPECS \ -+ "%{!EB:%{!EL:%(endian_spec)}}", \ -+ "%{!mabi=*: -mabi=n32}", \ -+ DRIVER_SELF_ISA_SPEC -+#elif MIPS_ABI_DEFAULT == ABI_64 -+#define DRIVER_SELF_SPECS \ -+ "%{!EB:%{!EL:%(endian_spec)}}", \ -+ "%{!mabi=*: -mabi=64}", \ -+ DRIVER_SELF_ISA_SPEC -+#elif MIPS_ABI_DEFAULT == ABI_O64 -+#define DRIVER_SELF_SPECS \ -+ "%{!EB:%{!EL:%(endian_spec)}}", \ -+ "%{!mabi=*: -mabi=o64}", \ -+ DRIVER_SELF_ISA_SPEC -+#else /* default to o32 */ -+#define DRIVER_SELF_SPECS \ -+ "%{!EB:%{!EL:%(endian_spec)}}", \ -+ "%{!mabi=*: -mabi=32}", \ -+ DRIVER_SELF_ISA_SPEC -+#endif ++#define DRIVER_SELF_SPECS \ ++ MIPS_DEFAULT_ISA_LEVEL_SPEC, \ ++ MIPS_ISA_LEVEL_SPEC, \ ++ BASE_DRIVER_SELF_SPECS + +#if 0 +/* Don't default to pcc-struct-return, we want to retain compatibility with + older gcc versions AND pcc-struct-return is nonreentrant. + (even though the SVR4 ABI for the i386 says that records and unions are + returned in memory). */ + +#undef DEFAULT_PCC_STRUCT_RETURN +#define DEFAULT_PCC_STRUCT_RETURN 0 +#endif + + +/************************[ Assembler stuff ]********************************/ + +#undef SUBTARGET_ASM_SPEC +#define SUBTARGET_ASM_SPEC \ + "%{!mno-abicalls: %{!fno-PIC:%{!fno-pic:-KPIC}}}" + +/* -G is incompatible with -KPIC which is the default, so only allow objects + in the small data section if the user explicitly asks for it. */ + +#undef MIPS_DEFAULT_GVALUE +#define MIPS_DEFAULT_GVALUE 0 + +/* If defined, a C expression whose value is a string containing the + assembler operation to identify the following data as + uninitialized global data. If not defined, and neither + `ASM_OUTPUT_BSS' nor `ASM_OUTPUT_ALIGNED_BSS' are defined, + uninitialized global data will be output in the data section if + `-fno-common' is passed, otherwise `ASM_OUTPUT_COMMON' will be + used. */ +#undef BSS_SECTION_ASM_OP +#define BSS_SECTION_ASM_OP "\t.section\t.bss" + +/* Like `ASM_OUTPUT_BSS' except takes the required alignment as a + separate, explicit argument. If you define this macro, it is used + in place of `ASM_OUTPUT_BSS', and gives you more flexibility in + handling the required alignment of the variable. The alignment is + specified as the number of bits. + + Try to use function `asm_output_aligned_bss' defined in file + `varasm.c' when defining this macro. */ +#undef ASM_OUTPUT_ALIGNED_BSS +#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ + asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) + +/* Standard AT&T UNIX 'as' local label spelling. */ +#undef LOCAL_LABEL_PREFIX +#define LOCAL_LABEL_PREFIX "." + +/* Currently we don't support 128bit long doubles, so for now we force + n32 to be 64bit. */ +#undef LONG_DOUBLE_TYPE_SIZE +#define LONG_DOUBLE_TYPE_SIZE 64 + +#ifdef IN_LIBGCC2 +#undef LIBGCC2_LONG_DOUBLE_TYPE_SIZE +#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64 +#endif + +/************************[ Debugger stuff ]*********************************/ +#undef DBX_DEBUGGING_INFO + +#if MIPS_ABI_DEFAULT == ABI_64 +#undef STANDARD_STARTFILE_PREFIX_1 +#define STANDARD_STARTFILE_PREFIX_1 "/lib/" +#undef STANDARD_STARTFILE_PREFIX_2 +#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" +#endif diff --git a/libgcc/config.host b/libgcc/config.host index f4a7428..5e5c33e 100644 --- libgcc/config.host +++ libgcc/config.host @@ -783,6 +783,8 @@ microblaze*-*-rtems*) tmake_file="${tmake_file} microblaze/t-microblaze t-fdpbit" extra_parts="$extra_parts crtbeginS.o crtendS.o crtbeginT.o crti.o crtn.o" ;; +mips*-*-freebsd*) # FreeBSD/mips, either endian. + ;; mips*-*-netbsd*) # NetBSD/mips, either endian. ;; mips*-*-linux*) # Linux MIPS, either endian.