Ticket #64316: patch-darwin21-support.diff

File patch-darwin21-support.diff, 2.1 KB (added by i0ntempest, 2 years ago)

  • gcc/config/darwin-c.c 

    diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
index 951a998775f83e16ed6c11963e6e9eb1286c51a7..62d28fcea501bbcb9eb403c74793af45eb91ca7f 100644
    old new macosx_version_as_macro (void) 
    691691  if (!version_array)
    692692    goto fail;
    693693
    694   if (version_array[MAJOR] < 10 || version_array[MAJOR] > 11)
     694  if (version_array[MAJOR] < 10 || version_array[MAJOR] > 12)
    695695    goto fail;
    696696
    697697  if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)

  • gcc/config/darwin-driver.c 

    diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
index 0b86bb6faf7ca246afd23d43f716242f3d802123..3e02d003cd19dabc9518e21655586768feae6756 100644
    old new validate_macosx_version_min (const char *version_str) 
    6464
    6565  major = strtoul (version_str, &end, 10);
    6666
    67   if (major < 10 || major > 11 ) /* MacOS 10 and 11 are known. */
     67  if (major < 10 || major > 12 ) /* macOS 10, 11, and 12 are known. */
    6868    return NULL;
    6969
    7070  /* Skip a separating period, if there's one.  */
    7171  version_str = end + ((*end == '.') ? 1 : 0);
    7272
    73   if (major == 11 && *end != '\0' && !ISDIGIT (version_str[0]))
    74      /* For MacOS 11, we allow just the major number, but if the minor is
     73  if (major > 10 && *end != '\0' && !ISDIGIT (version_str[0]))
     74     /* For macOS 11+, we allow just the major number, but if the minor is
    7575        there it must be numeric.  */
    7676    return NULL;
    77   else if (major == 11 && *end == '\0')
     77  else if (major > 10 && *end == '\0')
    7878    /* We will rewrite 11 =>  11.0.0.  */
    7979    need_rewrite = true;
    8080  else if (major == 10 && (*end == '\0' || !ISDIGIT (version_str[0])))
    … … darwin_find_version_from_kernel (void) 
    172172      if (minor_vers > 0)
    173173        minor_vers -= 1; /* Kernel 20.3 => macOS 11.2.  */
    174174      /* It's not yet clear whether patch level will be considered.  */
    175       asprintf (&new_flag, "11.%02d.00", minor_vers);
     175      asprintf (&new_flag, "%d.%02d.00", major_vers - 9, minor_vers);
    176176    }
    177177  else if (major_vers - 4 <= 4)
    178178    /* On 10.4 and earlier, the old linker is used which does not