CbC/CbC_gcc: gcc/config/darwin-c.c comparison

comparison gcc/config/darwin-c.c @ 111:04ced10e8804

gcc 7

author	kono
date	Fri, 27 Oct 2017 22:46:09 +0900
parents	f6334be47118
children	84e7813d76e9

comparison

equal deleted inserted replaced

-:561a7518be6b
+:04ced10e8804
 /* Darwin support needed only by C/C++ frontends.
-Copyright (C) 2001, 2003, 2004, 2005, 2007, 2008, 2010
+Copyright (C) 2001-2017 Free Software Foundation, Inc.
-Free Software Foundation, Inc.
 Contributed by Apple Computer Inc.
 This file is part of GCC.
 GCC is free software; you can redistribute it and/or modify
 <http://www.gnu.org/licenses/>.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
+#include "target.h"
-#include "cpplib.h"
+#include "c-family/c-target.h"
-#include "tree.h"
+#include "c-family/c-target-def.h"
+#include "memmodel.h"
+#include "tm_p.h"
+#include "cgraph.h"
 #include "incpath.h"
-#include "c-family/c-common.h"
 #include "c-family/c-pragma.h"
 #include "c-family/c-format.h"
-#include "diagnostic-core.h"
-#include "flags.h"
-#include "tm_p.h"
 #include "cppdefault.h"
 #include "prefix.h"
-#include "target.h"
+#include "../../libcpp/internal.h"
-#include "target-def.h"
 /* Pragmas.  */
 #define BAD(gmsgid) do { warning (OPT_Wpragmas, gmsgid); return; } while (0)
 #define BAD2(msgid, arg) do { warning (OPT_Wpragmas, msgid, arg); return; } while (0)
 to the file, given the base name and the name.  */
 static char *
 framework_construct_pathname (const char *fname, cpp_dir *dir)
 {
-char *buf;
+const char *buf;
 size_t fname_len, frname_len;
 cpp_dir *fast_dir;
 char *frname;
 struct stat st;
 int i;
 static const char*
 find_subframework_file (const char *fname, const char *pname)
 {
 char *sfrname;
 const char *dot_framework = ".framework/";
-char *bufptr;
+const char *bufptr;
 int sfrname_len, i, fname_len;
 struct cpp_dir *fast_dir;
 static struct cpp_dir subframe_dir;
 struct stat st;
 p->name = path;
 p->sysp = 1 + !cxx_aware;
 p->construct = framework_construct_pathname;
 using_frameworks = 1;
-add_cpp_dir_path (p, SYSTEM);
+add_cpp_dir_path (p, INC_SYSTEM);
 }
 /* Add PATH to the bracket includes. PATH must be malloc-ed and
 NUL-terminated.  */
 p->name = path;
 p->sysp = 0;
 p->construct = framework_construct_pathname;
 using_frameworks = 1;
-add_cpp_dir_path (p, BRACKET);
+add_cpp_dir_path (p, INC_BRACKET);
 }
 static const char *framework_defaults [] =
 {
 "/System/Library/Frameworks",
 if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0 && !sysroot
 	  && !strncmp (fname, cpp_GCC_INCLUDE_DIR, len))
 	{
 	  str = concat (iprefix, fname + len, NULL);
 /* FIXME: wrap the headers for C++awareness.  */
-	  add_path (str, SYSTEM, /*c++aware=*/false, false);
+	  add_path (str, INC_SYSTEM, /*c++aware=*/false, false);
 	}
 /* Should this directory start with the sysroot?  */
 if (sysroot)
 	str = concat (sysroot, fname, NULL);
 else
 	str = update_path (fname, "");
-add_path (str, SYSTEM, /*c++aware=*/false, false);
+add_path (str, INC_SYSTEM, /*c++aware=*/false, false);
 }
 }
 /* Register all the system framework paths if STDINC is true and setup
 }
 return 0;
 }
-/* Return the value of darwin_macosx_version_min suitable for the
+/* Given an OS X version VERSION_STR, return it as a statically-allocated array
-__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro,
+of three integers. If VERSION_STR is invalid, return NULL.
-so '10.4.2' becomes 1040.  The lowest digit is always zero.
-Print a warning if the version number can't be understood.  */
+VERSION_STR must consist of one, two, or three tokens, each separated by
+a single period.  Each token must contain only the characters '0' through
+'9' and is converted to an equivalent non-negative decimal integer. Omitted
+tokens become zeros.  For example:
+"10"              becomes       {10,0,0}
+"10.10"           becomes       {10,10,0}
+"10.10.1"         becomes       {10,10,1}
+"10.000010.1"     becomes       {10,10,1}
+"10.010.001"      becomes       {10,10,1}
+"000010.10.00001" becomes       {10,10,1}
+".9.1"            is invalid
+"10..9"           is invalid
+"10.10."          is invalid  */
+enum version_components { MAJOR, MINOR, TINY };
+static const unsigned long *
+parse_version (const char *version_str)
+{
+size_t version_len;
+char *end;
+static unsigned long version_array[3];
+version_len = strlen (version_str);
+if (version_len < 1)
+return NULL;
+/* Version string must consist of digits and periods only.  */
+if (strspn (version_str, "0123456789.") != version_len)
+return NULL;
+if (!ISDIGIT (version_str[0]) || !ISDIGIT (version_str[version_len - 1]))
+return NULL;
+version_array[MAJOR] = strtoul (version_str, &end, 10);
+version_str = end + ((*end == '.') ? 1 : 0);
+/* Version string must not contain adjacent periods.  */
+if (*version_str == '.')
+return NULL;
+version_array[MINOR] = strtoul (version_str, &end, 10);
+version_str = end + ((*end == '.') ? 1 : 0);
+version_array[TINY] = strtoul (version_str, &end, 10);
+/* Version string must contain no more than three tokens.  */
+if (*end != '\0')
+return NULL;
+return version_array;
+}
+/* Given VERSION -- a three-component OS X version represented as an array of
+non-negative integers -- return a statically-allocated string suitable for
+the legacy __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro.  If VERSION
+is invalid and cannot be coerced into a valid form, return NULL.
+The legacy format is a four-character string -- two chars for the major
+number and one each for the minor and tiny numbers.  Minor and tiny numbers
+from 10 through 99 are permitted but are clamped to 9 (for example, {10,9,10}
+produces "1099").  If VERSION contains numbers greater than 99, it is
+rejected.  */
 static const char *
-version_as_macro (void)
+version_as_legacy_macro (const unsigned long *version)
 {
-static char result[] = "1000";
+unsigned long major, minor, tiny;
+static char result[5];
-if (strncmp (darwin_macosx_version_min, "10.", 3) != 0)
+major = version[MAJOR];
+minor = version[MINOR];
+tiny = version[TINY];
+if (major > 99 || minor > 99 || tiny > 99)
+return NULL;
+minor = ((minor > 9) ? 9 : minor);
+tiny = ((tiny > 9) ? 9 : tiny);
+if (sprintf (result, "%lu%lu%lu", major, minor, tiny) != 4)
+return NULL;
+return result;
+}
+/* Given VERSION -- a three-component OS X version represented as an array of
+non-negative integers -- return a statically-allocated string suitable for
+the modern __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro.  If VERSION
+is invalid, return NULL.
+The modern format is a six-character string -- two chars for each component,
+with zero-padding if necessary (for example, {10,10,1} produces "101001"). If
+VERSION contains numbers greater than 99, it is rejected.  */
+static const char *
+version_as_modern_macro (const unsigned long *version)
+{
+unsigned long major, minor, tiny;
+static char result[7];
+major = version[MAJOR];
+minor = version[MINOR];
+tiny = version[TINY];
+if (major > 99 || minor > 99 || tiny > 99)
+return NULL;
+if (sprintf (result, "%02lu%02lu%02lu", major, minor, tiny) != 6)
+return NULL;
+return result;
+}
+/* Return the value of darwin_macosx_version_min, suitably formatted for the
+__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro.  Values representing
+OS X 10.9 and earlier are encoded using the legacy four-character format,
+while 10.10 and later use a modern six-character format.  (For example,
+"10.9" produces "1090", and "10.10.1" produces "101001".)  If
+darwin_macosx_version_min is invalid and cannot be coerced into a valid
+form, print a warning and return "1000".  */
+static const char *
+macosx_version_as_macro (void)
+{
+const unsigned long *version_array;
+const char *version_macro;
+version_array = parse_version (darwin_macosx_version_min);
+if (!version_array)
 goto fail;
-if (! ISDIGIT (darwin_macosx_version_min[3]))
+if (version_array[MAJOR] != 10)
 goto fail;
-result[2] = darwin_macosx_version_min[3];
-if (darwin_macosx_version_min[4] != '\0'
+if (version_array[MINOR] < 10)
-&& darwin_macosx_version_min[4] != '.')
+version_macro = version_as_legacy_macro (version_array);
+else
+version_macro = version_as_modern_macro (version_array);
+if (!version_macro)
 goto fail;
-return result;
+return version_macro;
 fail:
 error ("unknown value %qs of -mmacosx-version-min",
-	 darwin_macosx_version_min);
+darwin_macosx_version_min);
 return "1000";
 }
 /* Define additional CPP flags for Darwin.   */
 if (darwin_constant_cfstrings)
 builtin_define ("__CONSTANT_CFSTRINGS__");
 builtin_define_with_value ("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__",
-			     version_as_macro(), false);
+			     macosx_version_as_macro(), false);
 /* Since we do not (at 4.6) support ObjC gc for the NeXT runtime, the
 following will cause a syntax error if one tries to compile gc attributed
 items.  However, without this, NeXT system headers cannot be parsed
 properly (on systems >= darwin 9).  */
 {
 builtin_define ("__strong=");
 builtin_define ("__weak=");
 }
-if (flag_objc_abi == 2)
+if (CPP_OPTION (pfile, objc) && flag_objc_abi == 2)
 builtin_define ("__OBJC2__");
 }
 /* Handle C family front-end options.  */
 /* We recognized the option.  */
 return true;
 }
-#undef TARGET_HANDLE_C_OPTION
-#define TARGET_HANDLE_C_OPTION handle_c_option
-struct gcc_targetcm targetcm = TARGETCM_INITIALIZER;
 /* Allow ObjC* access to CFStrings.  */
-tree
+static tree
 darwin_objc_construct_string (tree str)
 {
 if (!darwin_constant_cfstrings)
 {
 /* Even though we are not using CFStrings, place our literal
 }
 /* The string ref type is created as CFStringRef by <CFBase.h> therefore, we
 must match for it explicitly, since it's outside the gcc code.  */
-bool
+static bool
 darwin_cfstring_ref_p (const_tree strp)
 {
 tree tn;
 if (!strp || TREE_CODE (strp) != POINTER_TYPE)
 return false;
 	  && IDENTIFIER_POINTER (tn)
 	  && !strncmp (IDENTIFIER_POINTER (tn), "CFStringRef", 8));
 }
 /* At present the behavior of this is undefined and it does nothing.  */
-void
+static void
 darwin_check_cfstring_format_arg (tree ARG_UNUSED (format_arg),
 				  tree ARG_UNUSED (args_list))
 {
 }
 NULL, NULL,
 FMT_FLAG_ARG_CONVERT|FMT_FLAG_PARSE_ARG_CONVERT_EXTERNAL, 0, 0, 0, 0, 0, 0,
 NULL, NULL
 }
 };
+/* Support routines to dump the class references for NeXT ABI v1, aka
+32-bits ObjC-2.0, as top-level asms.
+The following two functions should only be called from
+objc/objc-next-runtime-abi-01.c.  */
+static void
+darwin_objc_declare_unresolved_class_reference (const char *name)
+{
+const char *lazy_reference = ".lazy_reference\t";
+const char *hard_reference = ".reference\t";
+const char *reference = MACHOPIC_INDIRECT ? lazy_reference : hard_reference;
+size_t len = strlen (reference) + strlen(name) + 2;
+char *buf = (char *) alloca (len);
+gcc_checking_assert (!strncmp (name, ".objc_class_name_", 17));
+snprintf (buf, len, "%s%s", reference, name);
+symtab->finalize_toplevel_asm (build_string (strlen (buf), buf));
+}
+static void
+darwin_objc_declare_class_definition (const char *name)
+{
+const char *xname = targetm.strip_name_encoding (name);
+size_t len = strlen (xname) + 7 + 5;
+char *buf = (char *) alloca (len);
+gcc_checking_assert (!strncmp (name, ".objc_class_name_", 17)
+		       || !strncmp (name, "*.objc_category_name_", 21));
+/* Mimic default_globalize_label.  */
+snprintf (buf, len, ".globl\t%s", xname);
+symtab->finalize_toplevel_asm (build_string (strlen (buf), buf));
+snprintf (buf, len, "%s = 0", xname);
+symtab->finalize_toplevel_asm (build_string (strlen (buf), buf));
+}
+#undef  TARGET_HANDLE_C_OPTION
+#define TARGET_HANDLE_C_OPTION handle_c_option
+#undef  TARGET_OBJC_CONSTRUCT_STRING_OBJECT
+#define TARGET_OBJC_CONSTRUCT_STRING_OBJECT darwin_objc_construct_string
+#undef  TARGET_OBJC_DECLARE_UNRESOLVED_CLASS_REFERENCE
+#define TARGET_OBJC_DECLARE_UNRESOLVED_CLASS_REFERENCE \
+	darwin_objc_declare_unresolved_class_reference
+#undef  TARGET_OBJC_DECLARE_CLASS_DEFINITION
+#define TARGET_OBJC_DECLARE_CLASS_DEFINITION \
+	darwin_objc_declare_class_definition
+#undef  TARGET_STRING_OBJECT_REF_TYPE_P
+#define TARGET_STRING_OBJECT_REF_TYPE_P darwin_cfstring_ref_p
+#undef TARGET_CHECK_STRING_OBJECT_FORMAT_ARG
+#define TARGET_CHECK_STRING_OBJECT_FORMAT_ARG darwin_check_cfstring_format_arg
+struct gcc_targetcm targetcm = TARGETCM_INITIALIZER;

Mercurial > hg > CbC > CbC_gcc

comparison gcc/config/darwin-c.c @ 111:04ced10e8804