diff options
| author | Gerald Pfeifer <gerald@pfeifer.com> | 2018-05-28 23:20:15 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@gcc.gnu.org> | 2018-05-28 23:20:15 +0000 |
| commit | 1eae45747a6ababd8e37f6086e5889db2c2648f5 (patch) | |
| tree | 8c070dfffb78986ed6a30a4c88b9b7e96cf0057f | |
| parent | 1f161c48edf27eac74ceff8ccf73d232f14b7009 (diff) | |
| download | gcc-1eae45747a6ababd8e37f6086e5889db2c2648f5.zip gcc-1eae45747a6ababd8e37f6086e5889db2c2648f5.tar.gz gcc-1eae45747a6ababd8e37f6086e5889db2c2648f5.tar.bz2 | |
config.gcc: Identify FreeBSD 3.x and 4.x as unsupported.
* config.gcc: Identify FreeBSD 3.x and 4.x as unsupported.
* config/freebsd-spec.h (FBSD_LIB_SPEC): Only consider FreeBSD 5
and later.
From-SVN: r260852
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config.gcc | 2 | ||||
| -rw-r--r-- | gcc/config/freebsd-spec.h | 28 |
3 files changed, 15 insertions, 22 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8791af2..686db93 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-05-29 Gerald Pfeifer <gerald@pfeifer.com> + + * config.gcc: Identify FreeBSD 3.x and 4.x as unsupported. + + * config/freebsd-spec.h (FBSD_LIB_SPEC): Only consider FreeBSD 5 + and later. + 2018-05-28 Bernd Edlinger <bernd.edlinger@hotmail.de> * tree-dump.c (dump_node): Use splay_tree_delete_pointers. diff --git a/gcc/config.gcc b/gcc/config.gcc index d73e2cb..4d9f9c6 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -268,7 +268,7 @@ case ${target} in | pdp11-*-bsd \ | sparc-hal-solaris2* \ | thumb-*-* \ - | *-*-freebsd[12] | *-*-freebsd[12].* \ + | *-*-freebsd[12] | *-*-freebsd[1234].* \ | *-*-freebsd*aout* \ | *-*-linux*aout* \ | *-*-linux*coff* \ diff --git a/gcc/config/freebsd-spec.h b/gcc/config/freebsd-spec.h index 45d69a6..26ed711 100644 --- a/gcc/config/freebsd-spec.h +++ b/gcc/config/freebsd-spec.h @@ -79,15 +79,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define FBSD_ENDFILE_SPEC \ "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s" -/* Provide a LIB_SPEC appropriate for FreeBSD as configured and as - required by the user-land thread model. Before __FreeBSD_version - 500016, select the appropriate libc, depending on whether we're - doing profiling or need threads support. At __FreeBSD_version - 500016 and later, when threads support is requested include both - -lc and the threading lib instead of only -lc_r. To make matters - interesting, we can't actually use __FreeBSD_version provided by - <osreldate.h> directly since it breaks cross-compiling. As a final - twist, make it a hard error if -pthread is provided on the command +/* When threads support is requested include both -lc and the threading + library (which assumes FreeBSD 5.x or later, __FreeBSD_version 500016 + to be precise). + And make it a hard error if -pthread is provided on the command line and gcc was configured with --disable-threads (this will help avoid bug reports from users complaining about threading when they misconfigured the gcc bootstrap but are later consulting FreeBSD @@ -106,17 +101,6 @@ is built with the --enable-threads configure-time option.} \ %{pg: -lc_p} \ }" #else -#if FBSD_MAJOR < 5 -#define FBSD_LIB_SPEC " \ - %{!shared: \ - %{!pg: \ - %{!pthread:-lc} \ - %{pthread:-lc_r}} \ - %{pg: \ - %{!pthread:-lc_p} \ - %{pthread:-lc_r_p}} \ - }" -#else #define FBSD_LIB_SPEC " \ %{!shared: \ %{!pg: %{pthread:-lpthread} -lc} \ @@ -126,7 +110,9 @@ is built with the --enable-threads configure-time option.} \ %{pthread:-lpthread} -lc \ }" #endif -#endif + +/* To make matters interesting, we can't actually use __FreeBSD_version + provided by <osreldate.h> directly since it breaks cross-compiling. */ #if FBSD_MAJOR < 6 #define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1" |