gcc: add langJit option for gcclangjit

This option can be used to set the “jit” language which enable the
libgccjit functionality. Also adds a “libgccjit” attr which is gcc
built with just jit enabled.
This commit is contained in:
Matthew Bauer 2020-05-05 22:26:01 -05:00
parent 9c4fbf9cb1
commit fe1955588a
8 changed files with 30 additions and 10 deletions

View File

@ -5,6 +5,7 @@
, langJava ? false , langJava ? false
, langGo ? false , langGo ? false
, profiledCompiler ? false , profiledCompiler ? false
, langJit ? false
, staticCompiler ? false , staticCompiler ? false
, enableShared ? true , enableShared ? true
, enableLTO ? true , enableLTO ? true
@ -212,6 +213,7 @@ stdenv.mkDerivation ({
langGo langGo
langObjC langObjC
langObjCpp langObjCpp
langJit
; ;
}; };

View File

@ -5,6 +5,7 @@
, langJava ? false , langJava ? false
, langGo ? false , langGo ? false
, profiledCompiler ? false , profiledCompiler ? false
, langJit ? false
, staticCompiler ? false , staticCompiler ? false
, enableShared ? true , enableShared ? true
, enableLTO ? true , enableLTO ? true
@ -224,6 +225,7 @@ stdenv.mkDerivation ({
langGo langGo
langObjC langObjC
langObjCpp langObjCpp
langJit
; ;
}; };

View File

@ -6,6 +6,7 @@
, langJava ? false , langJava ? false
, langGo ? false , langGo ? false
, profiledCompiler ? false , profiledCompiler ? false
, langJit ? false
, staticCompiler ? false , staticCompiler ? false
, enableShared ? true , enableShared ? true
, enableLTO ? true , enableLTO ? true
@ -126,7 +127,7 @@ stdenv.mkDerivation ({
inherit patches; inherit patches;
outputs = if langJava || langGo then ["out" "man" "info"] outputs = if langJava || langGo || langJit then ["out" "man" "info"]
else [ "out" "lib" "man" "info" ]; else [ "out" "lib" "man" "info" ];
setOutputFlags = false; setOutputFlags = false;
NIX_NO_SELF_RPATH = true; NIX_NO_SELF_RPATH = true;
@ -136,13 +137,9 @@ stdenv.mkDerivation ({
hardeningDisable = [ "format" "pie" ]; hardeningDisable = [ "format" "pie" ];
prePatch = prePatch =
(stdenv.lib.optionalString (langJava || langGo) ''
export lib=$out
'')
# This should kill all the stdinc frameworks that gcc and friends like to # This should kill all the stdinc frameworks that gcc and friends like to
# insert into default search paths. # insert into default search paths.
+ stdenv.lib.optionalString hostPlatform.isDarwin '' stdenv.lib.optionalString hostPlatform.isDarwin ''
substituteInPlace gcc/config/darwin-c.c \ substituteInPlace gcc/config/darwin-c.c \
--replace 'if (stdinc)' 'if (0)' --replace 'if (stdinc)' 'if (0)'
@ -244,6 +241,7 @@ stdenv.mkDerivation ({
langGo langGo
langObjC langObjC
langObjCpp langObjCpp
langJit
; ;
}; };

View File

@ -4,6 +4,7 @@
, langObjCpp ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin
, langGo ? false , langGo ? false
, profiledCompiler ? false , profiledCompiler ? false
, langJit ? false
, staticCompiler ? false , staticCompiler ? false
, enableShared ? true , enableShared ? true
, enableLTO ? true , enableLTO ? true
@ -90,7 +91,7 @@ stdenv.mkDerivation ({
inherit patches; inherit patches;
outputs = [ "out" "lib" "man" "info" ]; outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
setOutputFlags = false; setOutputFlags = false;
NIX_NO_SELF_RPATH = true; NIX_NO_SELF_RPATH = true;
@ -206,6 +207,7 @@ stdenv.mkDerivation ({
langGo langGo
langObjC langObjC
langObjCpp langObjCpp
langJit
; ;
} ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" } ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
++ optional targetPlatform.isNetBSD "--disable-libcilkrts" ++ optional targetPlatform.isNetBSD "--disable-libcilkrts"

View File

@ -4,6 +4,7 @@
, langObjCpp ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin
, langGo ? false , langGo ? false
, profiledCompiler ? false , profiledCompiler ? false
, langJit ? false
, staticCompiler ? false , staticCompiler ? false
, enableShared ? true , enableShared ? true
, enableLTO ? true , enableLTO ? true
@ -82,7 +83,7 @@ stdenv.mkDerivation ({
inherit patches; inherit patches;
outputs = [ "out" "lib" "man" "info" ]; outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
setOutputFlags = false; setOutputFlags = false;
NIX_NO_SELF_RPATH = true; NIX_NO_SELF_RPATH = true;
@ -197,6 +198,7 @@ stdenv.mkDerivation ({
langGo langGo
langObjC langObjC
langObjCpp langObjCpp
langJit
; ;
}; };

View File

@ -5,6 +5,7 @@
, langObjCpp ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin
, langGo ? false , langGo ? false
, profiledCompiler ? false , profiledCompiler ? false
, langJit ? false
, staticCompiler ? false , staticCompiler ? false
, enableShared ? true , enableShared ? true
, enableLTO ? true , enableLTO ? true
@ -85,7 +86,7 @@ stdenv.mkDerivation ({
inherit patches; inherit patches;
outputs = [ "out" "man" "info" ] ++ lib.optional langJit "lib"; outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
setOutputFlags = false; setOutputFlags = false;
NIX_NO_SELF_RPATH = true; NIX_NO_SELF_RPATH = true;
@ -202,6 +203,7 @@ stdenv.mkDerivation ({
langGo langGo
langObjC langObjC
langObjCpp langObjCpp
langJit
; ;
}; };

View File

@ -20,6 +20,7 @@
, langGo , langGo
, langObjC , langObjC
, langObjCpp , langObjCpp
, langJit
}: }:
assert cloog != null -> stdenv.lib.versionOlder version "5"; assert cloog != null -> stdenv.lib.versionOlder version "5";
@ -121,6 +122,7 @@ let
++ lib.optional langObjC "objc" ++ lib.optional langObjC "objc"
++ lib.optional langObjCpp "obj-c++" ++ lib.optional langObjCpp "obj-c++"
++ lib.optionals crossDarwin [ "objc" "obj-c++" ] ++ lib.optionals crossDarwin [ "objc" "obj-c++" ]
++ lib.optional langJit "jit"
) )
) )
}" }"
@ -173,7 +175,7 @@ let
"--disable-symvers" "--disable-symvers"
"libat_cv_have_ifunc=no" "libat_cv_have_ifunc=no"
"--disable-gnu-indirect-function" "--disable-gnu-indirect-function"
] ] ++ lib.optional langJit "--enable-host-shared"
; ;
in configureFlags in configureFlags

View File

@ -8390,6 +8390,16 @@ in
profiledCompiler = false; profiledCompiler = false;
}); });
libgccjit = gcc9.cc.override {
name = "libgccjit";
langFortran = false;
langCC = false;
langC = false;
profiledCompiler = false;
langJit = true;
enableLTO = false;
};
gcj = gcj6; gcj = gcj6;
gcj6 = wrapCC (gcc6.cc.override { gcj6 = wrapCC (gcc6.cc.override {
name = "gcj"; name = "gcj";