forked from rarias/jungle
Compare commits
4 Commits
upgrade/25
...
00a7122768
| Author | SHA1 | Date | |
|---|---|---|---|
|
00a7122768
|
|||
|
bc2a44b044
|
|||
|
6daac59f83
|
|||
|
52aa76aa7e
|
@@ -19,7 +19,7 @@ in stdenv.mkDerivation {
|
|||||||
'';
|
'';
|
||||||
hardeningDisable = [ "pic" "format" ];
|
hardeningDisable = [ "pic" "format" ];
|
||||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||||
patches = [ ./makefile.patch ./hrtimer.patch ./remove-wr-rdmsrq.patch ];
|
patches = [ ./makefile.patch ./hrtimer.patch ];
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"KERNEL_VERSION=${kernel.modDirVersion}"
|
"KERNEL_VERSION=${kernel.modDirVersion}"
|
||||||
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
diff --git a/inc/PwrProfAsm.h b/inc/PwrProfAsm.h
|
|
||||||
index d77770a..c93a0e9 100644
|
|
||||||
--- a/inc/PwrProfAsm.h
|
|
||||||
+++ b/inc/PwrProfAsm.h
|
|
||||||
@@ -347,6 +347,7 @@
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/*
|
|
||||||
#define rdmsrq(msr,val1,val2,val3,val4) ({ \
|
|
||||||
__asm__ __volatile__( \
|
|
||||||
"rdmsr\n" \
|
|
||||||
@@ -362,6 +363,7 @@
|
|
||||||
:"c"(msr), "a"(val1), "d"(val2), "S"(val3), "D"(val4) \
|
|
||||||
); \
|
|
||||||
})
|
|
||||||
+*/
|
|
||||||
|
|
||||||
#define rdmsrpw(msr,val1,val2,val3,val4) ({ \
|
|
||||||
__asm__ __volatile__( \
|
|
||||||
@@ -414,13 +414,14 @@ let
|
|||||||
wrapIntel = { cc, mygcc, extraBuild ? "", extraInstall ? "" }:
|
wrapIntel = { cc, mygcc, extraBuild ? "", extraInstall ? "" }:
|
||||||
let
|
let
|
||||||
targetConfig = stdenv.targetPlatform.config;
|
targetConfig = stdenv.targetPlatform.config;
|
||||||
|
gccVersion = builtins.concatStringsSep "." (lib.take 3 (builtins.splitVersion mygcc.version));
|
||||||
in (wrapCCWith {
|
in (wrapCCWith {
|
||||||
cc = cc;
|
cc = cc;
|
||||||
extraBuildCommands = ''
|
extraBuildCommands = ''
|
||||||
echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags
|
echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags
|
||||||
echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags
|
echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags
|
||||||
|
|
||||||
echo "-L${mygcc.cc}/lib/gcc/${targetConfig}/${mygcc.version}" >> $out/nix-support/cc-ldflags
|
echo "-L${mygcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-ldflags
|
||||||
echo "-L${mygcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
|
echo "-L${mygcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
|
||||||
echo "-L${intel-compiler-shared}/lib" >> $out/nix-support/cc-ldflags
|
echo "-L${intel-compiler-shared}/lib" >> $out/nix-support/cc-ldflags
|
||||||
echo "-L${cc}/lib" >> $out/nix-support/cc-ldflags
|
echo "-L${cc}/lib" >> $out/nix-support/cc-ldflags
|
||||||
|
|||||||
Reference in New Issue
Block a user