[PATCH 3/7] remove knetbsd support
tbsaunde+gcc@tbsaunde.org
tbsaunde+gcc@tbsaunde.org
Mon Jun 20 08:10:00 GMT 2016
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
gcc/ChangeLog:
2016-06-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* config.gcc: Remove support for knetbsd.
* configure.ac: Likewise.
* config/i386/knetbsd-gnu.h: Remove. * config/i386/knetbsd-gnu64.h: Remove.
* config/knetbsd-gnu.h: Remove.
* configure: Regenerate.
libgcc/ChangeLog:
2016-06-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* config.host: Remove support for knetbsd.
libstdc++-v3/ChangeLog:
2016-06-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* configure: Regenerate.
* configure.host: Remove support for knetbsd.
* crossconfig.m4: Likewise.
contrib/ChangeLog:
2016-06-20 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* config-list.mk: stop testing knetbsd.
---
contrib/config-list.mk | 4 ++--
gcc/config.gcc | 17 +++++------------
gcc/config/i386/knetbsd-gnu.h | 21 ---------------------
gcc/config/i386/knetbsd-gnu64.h | 26 --------------------------
gcc/config/knetbsd-gnu.h | 35 -----------------------------------
gcc/configure | 10 +++-------
gcc/configure.ac | 2 +-
libgcc/config.host | 7 +++----
libstdc++-v3/configure | 2 +-
libstdc++-v3/configure.host | 2 +-
libstdc++-v3/crossconfig.m4 | 2 +-
11 files changed, 17 insertions(+), 111 deletions(-)
delete mode 100644 gcc/config/i386/knetbsd-gnu.h
delete mode 100644 gcc/config/i386/knetbsd-gnu64.h
delete mode 100644 gcc/config/knetbsd-gnu.h
diff --git a/contrib/config-list.mk b/contrib/config-list.mk
index a437ece..2fe90bb 100644
--- a/contrib/config-list.mk
+++ b/contrib/config-list.mk
@@ -48,7 +48,7 @@ LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \
hppa64-hpux11.0OPT-enable-sjlj-exceptions=yes hppa2.0-hpux11.9 \
i686-pc-linux-gnu i686-apple-darwin i686-apple-darwin9 i686-apple-darwin10 \
i486-freebsd4 i686-freebsd6 i686-kfreebsd-gnu \
- i686-netbsdelf9 i686-knetbsd-gnuOPT-enable-obsolete \
+ i686-netbsdelf9 \
i686-openbsd i686-elf i686-kopensolaris-gnu i686-symbolics-gnu \
i686-pc-msdosdjgpp i686-lynxos i686-nto-qnx \
i686-rtems i686-solaris2.10 i686-wrs-vxworks \
@@ -95,7 +95,7 @@ LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \
vax-netbsdelf vax-openbsd visium-elf x86_64-apple-darwin \
x86_64-pc-linux-gnuOPT-with-fpmath=avx \
x86_64-elfOPT-with-fpmath=sse x86_64-freebsd6 x86_64-netbsd \
- x86_64-knetbsd-gnuOPT-enable-obsolete x86_64-w64-mingw32 \
+ x86_64-w64-mingw32 \
x86_64-mingw32OPT-enable-sjlj-exceptions=yes x86_64-rtems \
xstormy16-elf xtensa-elf \
xtensa-linux
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 7b091fb..669cb9f 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -236,8 +236,7 @@ md_file=
# Obsolete configurations.
case ${target} in
- *-knetbsd-* \
- | avr-*rtems* \
+ avr-*rtems* \
| h8300-*rtems* \
| m32r-*rtems* \
| mep-* \
@@ -707,7 +706,7 @@ case ${target} in
esac
use_gcc_stdint=wrap
;;
-*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
+*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
extra_options="$extra_options gnu-user.opt"
gas=yes
gnu_ld=yes
@@ -716,7 +715,7 @@ case ${target} in
esac
tmake_file="t-slibgcc"
case $target in
- *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-kopensolaris*-gnu)
+ *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-kopensolaris*-gnu)
:;;
*-*-gnu*)
native_system_header_dir=/include
@@ -1459,7 +1458,7 @@ x86_64-*-openbsd*)
gas=yes
gnu_ld=yes
;;
-i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
+i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
# Intel 80386's running GNU/*
# with ELF format using glibc 2
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h gnu-user.h glibc-stdint.h"
@@ -1515,9 +1514,6 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i
tm_file="${tm_file} i386/gnu-user-common.h i386/gnu-user.h i386/linux-common.h i386/linux.h"
fi
;;
- i[34567]86-*-knetbsd*-gnu)
- tm_file="${tm_file} i386/gnu-user-common.h i386/gnu-user.h knetbsd-gnu.h i386/knetbsd-gnu.h"
- ;;
i[34567]86-*-kfreebsd*-gnu)
tm_file="${tm_file} i386/gnu-user-common.h i386/gnu-user.h kfreebsd-gnu.h i386/kfreebsd-gnu.h"
;;
@@ -1529,7 +1525,7 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i
;;
esac
;;
-x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
+x86_64-*-linux* | x86_64-*-kfreebsd*-gnu)
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h gnu-user.h glibc-stdint.h \
i386/x86-64.h i386/gnu-user-common.h i386/gnu-user64.h"
case ${target} in
@@ -1548,9 +1544,6 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
x86_64-*-kfreebsd*-gnu)
tm_file="${tm_file} kfreebsd-gnu.h i386/kfreebsd-gnu64.h"
;;
- x86_64-*-knetbsd*-gnu)
- tm_file="${tm_file} knetbsd-gnu.h i386/knetbsd-gnu64.h"
- ;;
esac
tmake_file="${tmake_file} i386/t-linux64"
x86_multilibs="${with_multilib_list}"
diff --git a/gcc/config/i386/knetbsd-gnu.h b/gcc/config/i386/knetbsd-gnu.h
deleted file mode 100644
index 51f8a0c..0000000
--- a/gcc/config/i386/knetbsd-gnu.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Definitions for Intel 386 running kNetBSD-based GNU systems with ELF format
- Copyright (C) 2004-2016 Free Software Foundation, Inc.
- Contributed by Robert Millan.
-
-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 3, 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 COPYING3. If not see
-<http://www.gnu.org/licenses/>. */
-
-#define GNU_USER_LINK_EMULATION "elf_i386"
diff --git a/gcc/config/i386/knetbsd-gnu64.h b/gcc/config/i386/knetbsd-gnu64.h
deleted file mode 100644
index fb9e2c0..0000000
--- a/gcc/config/i386/knetbsd-gnu64.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Definitions for AMD x86-64 running kNetBSD-based GNU systems with ELF format
- Copyright (C) 2012-2016 Free Software Foundation, Inc.
-
-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 3, 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 COPYING3. If not see
-<http://www.gnu.org/licenses/>. */
-
-#define GNU_USER_LINK_EMULATION32 "elf_i386"
-#define GNU_USER_LINK_EMULATION64 "elf_x86_64"
-#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
-
-#define GNU_USER_DYNAMIC_LINKER32 "/lib/ld.so.1"
-#define GNU_USER_DYNAMIC_LINKER64 "/lib/ld-knetbsd-x86-64.so.1"
-#define GNU_USER_DYNAMIC_LINKERX32 "/lib/ld-knetbsd-x32.so.1"
diff --git a/gcc/config/knetbsd-gnu.h b/gcc/config/knetbsd-gnu.h
deleted file mode 100644
index 02b7488..0000000
--- a/gcc/config/knetbsd-gnu.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Definitions for kNetBSD-based GNU systems with ELF format
- Copyright (C) 2004-2016 Free Software Foundation, Inc.
- Contributed by Robert Millan.
-
-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 3, 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 COPYING3. If not see
-<http://www.gnu.org/licenses/>. */
-
-#undef GNU_USER_TARGET_OS_CPP_BUILTINS
-#define GNU_USER_TARGET_OS_CPP_BUILTINS() \
- do \
- { \
- builtin_define ("__NetBSD_kernel__"); \
- builtin_define ("__GLIBC__"); \
- builtin_define_std ("unix"); \
- builtin_assert ("system=unix"); \
- builtin_assert ("system=posix"); \
- } \
- while (0)
-
-
-#undef GNU_USER_DYNAMIC_LINKER
-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
diff --git a/gcc/configure b/gcc/configure
index 5648eca..9b1a404 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -5033,10 +5033,6 @@ case "${target}" in
;;
i[34567]86-*-mingw* | x86_64-*-mingw*)
;;
- i[34567]86-*-interix[3-9]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
- # Instead, we relocate shared libraries at runtime.
- ;;
i[34567]86-*-nto-qnx*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
# it will coredump.
@@ -18479,7 +18475,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18482 "configure"
+#line 18478 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18585,7 +18581,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18588 "configure"
+#line 18584 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -28517,7 +28513,7 @@ else
*-*-musl*)
# All versions of musl provide stack protector
gcc_cv_libc_provides_ssp=yes;;
- *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+ *-*-linux* | *-*-kfreebsd*-gnu)
# glibc 2.4 and later provides __stack_chk_fail and
# either __stack_chk_guard, or TLS access to stack guard canary.
diff --git a/gcc/configure.ac b/gcc/configure.ac
index af40895..1bcb6f53 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -5495,7 +5495,7 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
*-*-musl*)
# All versions of musl provide stack protector
gcc_cv_libc_provides_ssp=yes;;
- *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
+ *-*-linux* | *-*-kfreebsd*-gnu)
# glibc 2.4 and later provides __stack_chk_fail and
# either __stack_chk_guard, or TLS access to stack guard canary.
GCC_GLIBC_VERSION_GTE_IFELSE([2], [4], [gcc_cv_libc_provides_ssp=yes], [
diff --git a/libgcc/config.host b/libgcc/config.host
index 0d9bb0d..12b69cf 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -230,7 +230,7 @@ case ${host} in
;;
esac
;;
-*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
+*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
if test x$enable_vtable_verify = xyes; then
@@ -613,7 +613,7 @@ i[34567]86-*-linux*)
tm_file="${tm_file} i386/elf-lib.h"
md_unwind_header=i386/linux-unwind.h
;;
-i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
+i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
tmake_file="${tmake_file} i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules"
tm_file="${tm_file} i386/elf-lib.h"
@@ -624,7 +624,7 @@ x86_64-*-linux*)
tm_file="${tm_file} i386/elf-lib.h"
md_unwind_header=i386/linux-unwind.h
;;
-x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
+x86_64-*-kfreebsd*-gnu)
extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
tmake_file="${tmake_file} i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules"
tm_file="${tm_file} i386/elf-lib.h"
@@ -1334,7 +1334,6 @@ esac
case ${host} in
i[34567]86-*-linux* | x86_64-*-linux* | \
i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu | \
- i[34567]86-*-knetbsd*-gnu | \
i[34567]86-*-gnu*)
tmake_file="${tmake_file} t-tls i386/t-linux t-slibgcc-libgcc"
if test "$libgcc_cv_cfi" = "yes"; then
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 4e81166..fcbf402 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -53544,7 +53544,7 @@ $as_echo "#define HAVE_TLS 1" >>confdefs.h
;;
esac
;;
- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu | *-cygwin*)
+ *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin*)
# All these tests are for C++; save the language and the compiler flags.
# The CXXFLAGS thing is suspicious, but based on similar bits previously
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 0b366ea..451c209 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -265,7 +265,7 @@ case "${host_os}" in
linux-musl*)
os_include_dir="os/generic"
;;
- gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
+ gnu* | linux* | kfreebsd*-gnu)
if [ "$uclibc" = "yes" ]; then
os_include_dir="os/uclibc"
elif [ "$bionic" = "yes" ]; then
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index ece1256..6abc84f 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -149,7 +149,7 @@ case "${host}" in
;;
esac
;;
- *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu | *-cygwin*)
+ *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin*)
GLIBCXX_CHECK_COMPILER_FEATURES
GLIBCXX_CHECK_LINKER_FEATURES
GLIBCXX_CHECK_MATH_SUPPORT
--
2.7.0
More information about the Gcc-patches
mailing list