Darwin, Simplify headers 4/5 : Remove redundant headers.

The darwinN.h headers (with the sole exception of darwin7.h,
which contains a target macro definition) now only contain
values that set fall-backs for cross-compilations, these can
be provided from the config.gcc script which means we no longer
need the darwinN.h - so delete them.

gcc/ChangeLog:

	* config.gcc: Compute default version information
	from the configured target.  Likewise defaults for
	ld64.
	* config/darwin10.h: Removed.
	* config/darwin12.h: Removed.
	* config/darwin9.h: Removed.
	* config/rs6000/darwin8.h: Removed.
This commit is contained in:
Iain Sandoe 2020-12-31 14:43:00 +00:00
parent 5282e22f0e
commit 4a04f09dc7
5 changed files with 39 additions and 106 deletions

View file

@ -685,17 +685,47 @@ case ${target} in
*-*-darwin*)
tmake_file="t-darwin "
tm_file="${tm_file} darwin.h"
darwin_os=`echo ${target} | sed 's/.*darwin\([0-9.]*\).*$/\1/'`
darwin_maj=`expr "$darwin_os" : '\([0-9]*\).*'`
macos_min=`expr "$darwin_os" : '[0-9]*\.\([0-9]*\).*'`
macos_maj=10
if test x"${macos_min}" = x; then
macos_min=0
fi
def_ld64=85.2
case ${target} in
*-*-darwin9*)
tm_file="${tm_file} darwin9.h"
;;
*-*-darwin[1][01]*)
tm_file="${tm_file} darwin9.h darwin10.h"
;;
*-*-darwin[1][2-9]* | *-*-darwin[2][0-9]*)
tm_file="${tm_file} darwin9.h darwin10.h darwin12.h"
;;
# Darwin 4 to 19 correspond to macOS 10.0 to 10.15
*-*-darwin[4-9]* | *-*-darwin1[0-9]*)
macos_min=`expr $darwin_maj - 4`
;;
*-*-darwin20*)
# Darwin 20 corresponds to macOS 11.
macos_maj=11
def_ld64=609.0
;;
*-*-darwin)
case ${cpu_type} in
aarch64) macos_maj=11 ;;
x86_64) macos_min=6 ;;
*) macos_min=5 ;;
esac
case ${host} in
*-*-darwin*) tm_defines="$tm_defines DARWIN_USE_KERNEL_VERS" ;;
*)
# If configuring a cross-compiler then we will have set some
# default above, but it is probably not what was intended.
echo "Warning: Using ${target} is only suitable for Darwin hosts" 1>&2
echo "configure with an explicit target version" 1>&2
;;
esac
;;
*)
echo "Error: configuring for an unreleased macOS version ${target}" 1>&2
exit 1
;;
esac
tm_defines="$tm_defines DEF_MIN_OSX_VERSION=\\\"${macos_maj}.${macos_min}\\\""
tm_defines="$tm_defines DEF_LD64=\\\"${def_ld64}\\\""
tm_file="${tm_file} ${cpu_type}/darwin.h"
tm_p_file="${tm_p_file} darwin-protos.h"
target_gtfiles="$target_gtfiles \$(srcdir)/config/darwin.c"

View file

@ -1,27 +0,0 @@
/* Target definitions for Darwin (Mac OS X) systems.
Copyright (C) 2009-2020 Free Software Foundation, Inc.
Contributed by Jack Howarth <howarth@bromo.med.uc.edu>.
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 DEF_MIN_OSX_VERSION
#define DEF_MIN_OSX_VERSION "10.6"
#ifndef LD64_VERSION
#undef DEF_LD64
#define DEF_LD64 "97.7"
#endif

View file

@ -1,27 +0,0 @@
/* Target definitions for Darwin (Mac OS X) systems.
Copyright (C) 2009-2020 Free Software Foundation, Inc.
Contributed by Jack Howarth <howarth.at.gcc@gmail.com>.
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 DEF_MIN_OSX_VERSION
#define DEF_MIN_OSX_VERSION "10.8"
#ifndef LD64_VERSION
#undef DEF_LD64
#define DEF_LD64 "236.4"
#endif

View file

@ -1,22 +0,0 @@
/* Target definitions for Darwin (Mac OS X) systems.
Copyright (C) 2006-2020 Free Software Foundation, Inc.
Contributed by Apple 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/>. */
#undef DEF_MIN_OSX_VERSION
#define DEF_MIN_OSX_VERSION "10.5"

View file

@ -1,21 +0,0 @@
/* Target definitions for Darwin 8.0 and above (Mac OS X) systems.
Copyright (C) 2004-2020 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/>. */
#undef DEF_MIN_OSX_VERSION
#define DEF_MIN_OSX_VERSION "10.4"