Unverified Commit 313e70eb authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #309788 from trofi/gcc-14-init 

gcc14, gfortran14, gnat14, gccgo14: init at 14.1.0
parents 5710852b 10a53797

pkgs/development/compilers/gcc/common/dependencies.nix

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
, libucontext ? null

, libxcrypt ? null

, cloog ? null

, darwin ? null

, isl ? null

, zlib ? null

, gnat-bootstrap ? null
@@ -85,6 +86,7 @@ in 
  ++ optionals langJava [ boehmgc zip unzip ]

  ++ optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)

  ++ optionals (langGo && stdenv.hostPlatform.isMusl) [ libucontext ]

  ++ optionals (lib.versionAtLeast version "14" && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.CoreServices ]

  ;



  # threadsCross.package after gcc6 so i assume its okay for 4.8 and 4.9 too

pkgs/development/compilers/gcc/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ let 
  version = gccVersions.fromMajorMinor majorMinorVersion;



  majorVersion = versions.major version;

  atLeast14 = versionAtLeast version "14";

  atLeast13 = versionAtLeast version "13";

  atLeast12 = versionAtLeast version "12";

  atLeast11 = versionAtLeast version "11";
@@ -79,6 +80,7 @@ let 
  atLeast7  = versionAtLeast version  "7";

  atLeast6  = versionAtLeast version  "6";

  atLeast49 = versionAtLeast version  "4.9";

  is14 = majorVersion == "14";

  is13 = majorVersion == "13";

  is12 = majorVersion == "12";

  is11 = majorVersion == "11";
@@ -127,6 +129,7 @@ let 
        buildPackages

        cloog

        withoutTargetLibc

        darwin

        disableBootstrap

        disableGdbPlugin

        enableLTO

pkgs/development/compilers/gcc/patches/14/gcc-darwin-remove-coreservices.patch

0 → 100644
+39 −0
Original line number Diff line number Diff line 
diff --git a/config/intlmacosx.m4 b/config/intlmacosx.m4

index 3141bf8c5..7a31862b9 100644

--- a/config/intlmacosx.m4

+++ b/config/intlmacosx.m4

@@ -63,7 +63,7 @@ AC_DEFUN([gt_INTL_MACOSX],

     dnl and we have to link it in explicitly, otherwise an exception

     dnl NSInvalidArgumentException "unrecognized selector sent to instance"

     dnl occurs.

-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"

+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"

   fi

   AC_SUBST([INTL_MACOSX_LIBS])

 ])

diff --git a/gcc/configure b/gcc/configure

index 23da7d55d..8bd09364d 100755

--- a/gcc/configure

+++ b/gcc/configure

@@ -13932,7 +13932,7 @@ $as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h

   INTL_MACOSX_LIBS=

   if test $gt_cv_func_CFPreferencesCopyAppValue = yes \

      || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then

-                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"

+                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"

   fi

 

 

diff --git a/libcpp/configure b/libcpp/configure

index 32d6aaa30..592c33881 100755

--- a/libcpp/configure

+++ b/libcpp/configure

@@ -7570,7 +7570,7 @@ $as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h

   INTL_MACOSX_LIBS=

   if test $gt_cv_func_CFPreferencesCopyAppValue = yes \

      || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then

-                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"

+                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"

   fi

pkgs/development/compilers/gcc/patches/14/gnat-darwin-dylib-install-name-14.patch

0 → 100644
+21 −0
Original line number Diff line number Diff line 
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in

index 0666fc00b..0e2d53eb8 100644

--- a/gcc/ada/gcc-interface/Makefile.in

+++ b/gcc/ada/gcc-interface/Makefile.in

@@ -793,14 +793,14 @@ gnatlib-shared-darwin:

 		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \

 		$(SO_OPTS) \

-		-Wl,-install_name,@rpath/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

+		-Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		-nodefaultrpaths -Wl,-rpath,@loader_path/,-rpath,@loader_path/.. \

 		-Wl,-rpath,@loader_path/../../../../ $(MISCLIB)

 	cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -dynamiclib $(PICFLAG_FOR_TARGET) \

 		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		$(GNATRTL_TASKING_OBJS) \

 		$(SO_OPTS) \

-		-Wl,-install_name,@rpath/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

+		-Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

 		-nodefaultrpaths -Wl,-rpath,@loader_path/,-rpath,@loader_path/.. \

 		-Wl,-rpath,@loader_path/../../../../ \

 		$(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)

pkgs/development/compilers/gcc/patches/14/libgcc-darwin-detection.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
diff -u a/libgcc/config.host b/libgcc/config.host

--- a/libgcc/config.host	2023-11-05 11:01:55.778638446 -0500

+++ b/libgcc/config.host	2023-11-05 11:07:29.405103979 -0500

@@ -227,7 +227,7 @@

   tmake_file="$tmake_file t-slibgcc-darwin"

   # newer toolsets produce warnings when building for unsupported versions.

   case ${host} in

-    *-*-darwin1[89]* | *-*-darwin2* )

+    *-*-darwin1[89]* | *-*-darwin2* | *-*-darwin)

       tmake_file="t-darwin-min-8 $tmake_file"

       ;;

     *-*-darwin9* | *-*-darwin1[0-7]*)