--- gcc/config/darwin.h.orig +++ gcc/config/darwin.h @@ -435,7 +435,7 @@ line with different arguments each time, so put a * after their names so all of them get passed. */ #define LINK_SPEC \ - "%{static}%{!static:%{!dynamic:-dynamic}} \ + "%{static}%{!static:%{!dynamic:-dynamic -rpath @PREFIX@/@GCCAUX@/lib:@LOCALBASE@/lib}} \ %:remove-outfile(-ldl) \ %:remove-outfile(-lm) \ %:remove-outfile(-lpthread) \ --- gcc/config/dragonfly.h.orig +++ gcc/config/dragonfly.h @@ -84,13 +84,13 @@ } \ %{static:-Bstatic} \ } \ - %{!static:--hash-style=gnu} \ + %{!static:--hash-style=gnu --enable-new-dtags -rpath @PREFIX@/@GCCAUX@/lib:@LOCALBASE@/lib} \ %{symbolic:-Bsymbolic}" #undef LINK_SPEC #define LINK_SPEC DFBSD_LINK_SPEC -#define DFBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.2" +#define DFBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.2" /* Use --as-needed -lgcc_s for eh support. */ --- gcc/config/sol2.h.orig +++ gcc/config/sol2.h @@ -418,6 +418,7 @@ %{static:-dn -Bstatic} \ %{shared:-G -dy %{!mimpure-text:-z text}} " \ LINK_LIBGCC_MAPFILE_SPEC LINK_CLEARCAP_SPEC " \ + %{!static:-R/lib/amd64:@PREFIX@/@GCCAUX@/lib/amd64:@LOCALBASE@/lib} \ %{symbolic:-Bsymbolic -G -dy -z text} \ %(link_arch) \ %{Qy:} %{!Qn:-Qy}" --- gcc/config/aarch64/aarch64-freebsd.h.orig +++ gcc/config/aarch64/aarch64-freebsd.h @@ -40,7 +40,7 @@ %{shared:-Bshareable %{h*} %{soname*}} \ %{symbolic:-Bsymbolic} \ %{static:-Bstatic} \ - %{!static: \ + %{!static:--hash-style=gnu --enable-new-dtags -rpath @PREFIX@/@GCCAUX@/lib:@LOCALBASE@/lib \ %{rdynamic:-export-dynamic} \ %{!shared:-dynamic-linker " FBSD_DYNAMIC_LINKER " }} \ -X" SUBTARGET_EXTRA_LINK_SPEC " \ @@ -81,4 +81,6 @@ #undef MCOUNT_NAME #define MCOUNT_NAME ".mcount" +/* Static stack checking is supported by means of probes. */ +#define STACK_CHECK_STATIC_BUILTIN 1 #endif /* GCC_AARCH64_FREEBSD_H */ --- gcc/config/i386/freebsd.h.orig +++ gcc/config/i386/freebsd.h @@ -88,6 +88,7 @@ %{rdynamic:-export-dynamic} \ -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}} \ + %{!static:--hash-style=gnu --enable-new-dtags -rpath @PREFIX@/@GCCAUX@/lib:@LOCALBASE@/lib} \ %{symbolic:-Bsymbolic}" /* A C statement to output to the stdio stream FILE an assembler --- gcc/config/i386/freebsd64.h.orig +++ gcc/config/i386/freebsd64.h @@ -41,6 +41,7 @@ %{rdynamic:-export-dynamic} \ -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}} \ + %{!static:--hash-style=gnu -rpath @PREFIX@/@GCCAUX@/lib:@LOCALBASE@/lib} \ %{symbolic:-Bsymbolic}" #undef MULTILIB_DEFAULTS --- gcc/Makefile.in.orig +++ gcc/Makefile.in @@ -1293,7 +1293,6 @@ insn-emit.o \ insn-extract.o \ insn-latencytab.o \ - insn-modes.o \ insn-opinit.o \ insn-output.o \ insn-peep.o \ @@ -1746,6 +1745,7 @@ $(OBJS-libcommon-target) main.o c-family/cppspec.o \ $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) \ $(GCOV_TOOL_OBJS) $(GENGTYPE_OBJS) gcc-ar.o gcc-nm.o gcc-ranlib.o \ + insn-modes.o insn-modes-ada.o \ lto-wrapper.o collect-utils.o # for anything that is shared use the cc1plus profile data, as that @@ -1761,6 +1761,11 @@ ALL_HOST_OBJS = $(ALL_HOST_FRONTEND_OBJS) $(ALL_HOST_BACKEND_OBJS) BACKEND = libbackend.a main.o libcommon-target.a libcommon.a \ + insn-modes.o \ + $(CPPLIB) $(LIBDECNUMBER) + +BACKEND2 = libbackend.a main.o libcommon-target.a libcommon.a \ + insn-modes-ada.o \ $(CPPLIB) $(LIBDECNUMBER) # This is defined to "yes" if Tree checking is enabled, which roughly means @@ -2495,6 +2500,7 @@ insn-modes.cc: s-modes; @true insn-modes.h: s-modes-h; @true +insn-modes-ada.cc: s-modes-ada; @true insn-modes-inline.h: s-modes-inline-h; @true min-insn-modes.cc: s-modes-m; @true @@ -2519,6 +2525,12 @@ $(SHELL) $(srcdir)/../move-if-change tmp-min-modes.cc min-insn-modes.cc $(STAMP) s-modes-m +s-modes-ada: s-modes + $(shell sed -e 's/: TARGET_96_ROUND_53_LONG_DOUBLE \? &ieee_extended_intel_96_round_53_format //' \ + < insn-modes.cc > tmp-modes-ada.cc) + $(SHELL) $(srcdir)/../move-if-change tmp-modes-ada.cc insn-modes-ada.cc + $(STAMP) s-modes-ada + insn-preds.cc: s-preds; @true tm-preds.h: s-preds-h; @true tm-constrs.h: s-constrs-h; @true @@ -3772,6 +3784,9 @@ ( cd $(DESTDIR)$(bindir) && \ $(LN) $(GCC_INSTALL_NAME)$(exeext) $(FULL_DRIVER_NAME) ); \ fi; \ + if [ -f gnat1$(exeext) ] ; then \ + ( cd $(DESTDIR)$(bindir) && $(LN) $(GCC_INSTALL_NAME)$(exeext) ada$(exeext) ) \ + fi; \ if [ ! -f gcc-cross$(exeext) ] \ && [ "$(GCC_INSTALL_NAME)" != "$(GCC_TARGET_INSTALL_NAME)" ]; then \ rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-tmp$(exeext); \ --- gcc/config/i386/gnu-user64.h.orig +++ gcc/config/i386/gnu-user64.h @@ -57,6 +57,7 @@ %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \ %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \ %{shared:-shared} \ + %{!static:--enable-new-dtags -rpath @PREFIX@/@GCCAUX@/lib64:@LOCALBASE@/lib} \ %{!shared: \ %{!static: \ %{!static-pie: \ --- gcc/config/netbsd-elf.h.orig +++ gcc/config/netbsd-elf.h @@ -80,6 +80,7 @@ "%{assert*} %{R*} %{rpath*} \ %{shared:-shared} \ %{symbolic:-Bsymbolic} \ + %{!static:-rpath @PREFIX@/@GCCAUX@/lib:@LOCALBASE@/lib} \ %{!shared: \ -dc -dp \ %{!nostdlib: \ @@ -101,6 +102,9 @@ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS NETBSD_SUBTARGET_EXTRA_SPECS +/* Define this to be nonzero if static stack checking is supported. */ +#define STACK_CHECK_STATIC_BUILTIN 1 + /* Use --as-needed -lgcc_s for eh support. */ #ifdef HAVE_LD_AS_NEEDED #define USE_LD_AS_NEEDED 1 --- gcc/configure.orig +++ gcc/configure @@ -31605,6 +31605,13 @@ gcc_cv_target_dl_iterate_phdr=no fi ;; + *-*-netbsd*) + if grep dl_iterate_phdr $target_header_dir/link_elf.h > /dev/null 2>&1; then + gcc_cv_target_dl_iterate_phdr=yes + else + gcc_cv_target_dl_iterate_phdr=no + fi + ;; *-linux-musl*) gcc_cv_target_dl_iterate_phdr=yes ;; --- gcc/gcc.cc.orig +++ gcc/gcc.cc @@ -1638,6 +1638,9 @@ static const char *const standard_startfile_prefix_2 = STANDARD_STARTFILE_PREFIX_2; +/* Since we hardset rpath to LOCALBASE, follow with library search path */ +static const char *const standard_raven_prefix = "@LOCALBASE@/lib/"; + /* A relative path to be used in finding the location of tools relative to the driver. */ static const char *const tooldir_base_prefix = TOOLDIR_BASE_PREFIX; @@ -5399,6 +5402,8 @@ #endif add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS", PREFIX_PRIORITY_LAST, 1, 0); + add_prefix (&startfile_prefixes, standard_raven_prefix, "BINUTILS", + PREFIX_PRIORITY_LAST, 0, 0); } gcc_assert (!IS_ABSOLUTE_PATH (tooldir_base_prefix));