diff options
| author | John Ericson <git@JohnEricson.me> | 2019-03-29 16:11:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-29 16:11:22 -0400 |
| commit | 842b14ba98e037ff954eefe7f2bb60b7707735e9 (patch) | |
| tree | 6c8ef00653e664843c343b6b02d1df3e48be0311 /lib | |
| parent | b46e9ad84b96ffce579ae5132f311b28b6d78506 (diff) | |
| parent | c17cf32a3724bf6c23cb3146acb639c414c8edd8 (diff) | |
| download | nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar.gz nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar.bz2 nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar.lz nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar.xz nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.tar.zst nixpkgs-842b14ba98e037ff954eefe7f2bb60b7707735e9.zip | |
Merge pull request #58330 from AerialX/msp430
TI MSP430 cross compiling
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/systems/default.nix | 1 | ||||
| -rw-r--r-- | lib/systems/examples.nix | 5 | ||||
| -rw-r--r-- | lib/systems/inspect.nix | 1 | ||||
| -rw-r--r-- | lib/systems/parse.nix | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index b3f7363fe61..9c6b51400dc 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -34,6 +34,7 @@ rec { else if final.isUClibc then "uclibc" else if final.isAndroid then "bionic" else if final.isLinux /* default */ then "glibc" + else if final.isMsp430 then "newlib" else if final.isAvr then "avrlibc" # TODO(@Ericson2314) think more about other operating systems else "native/impure"; diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ac1633a1a15..27a32181df8 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -102,6 +102,11 @@ rec { riscv64 = riscv "64"; riscv32 = riscv "32"; + msp430 = { + config = "msp430-elf"; + libc = "newlib"; + }; + avr = { config = "avr"; }; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 932f8fd1e53..f8d5ca84d7a 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -20,6 +20,7 @@ rec { isRiscV = { cpu = { family = "riscv"; }; }; isSparc = { cpu = { family = "sparc"; }; }; isWasm = { cpu = { family = "wasm"; }; }; + isMsp430 = { cpu = { family = "msp430"; }; }; isAvr = { cpu = { family = "avr"; }; }; isAlpha = { cpu = { family = "alpha"; }; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index fab50bc0ebd..8cc7d3ae271 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -109,6 +109,7 @@ rec { alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; }; + msp430 = { bits = 16; significantByte = littleEndian; family = "msp430"; }; avr = { bits = 8; family = "avr"; }; }; |