diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-27 00:52:48 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-02-27 00:52:48 +0000 |
| commit | b1b7266aa3d2e7023ad1b55ee7edc6a93f87ea53 (patch) | |
| tree | 20ffb7b6e7f7e4a2a999787b54ea1ac69403e141 /pkgs/development | |
| parent | 72edd547411be0c074e40ab83f7ecb5bf4344923 (diff) | |
| download | nixlib-b1b7266aa3d2e7023ad1b55ee7edc6a93f87ea53.tar nixlib-b1b7266aa3d2e7023ad1b55ee7edc6a93f87ea53.tar.gz nixlib-b1b7266aa3d2e7023ad1b55ee7edc6a93f87ea53.tar.bz2 nixlib-b1b7266aa3d2e7023ad1b55ee7edc6a93f87ea53.tar.lz nixlib-b1b7266aa3d2e7023ad1b55ee7edc6a93f87ea53.tar.xz nixlib-b1b7266aa3d2e7023ad1b55ee7edc6a93f87ea53.tar.zst nixlib-b1b7266aa3d2e7023ad1b55ee7edc6a93f87ea53.zip | |
After some testing with an ultrasparc cross-compiler:
Updating the cross-build expressions, adding some flexibility.
Updated the linux headers used cross building, as 2.6.28 had bugs on endianness in
sparc64.
There were, as usual some bugs in gcc. Maybe not many make a cross compiler to
ultrasparc.
For the record, I could build an ultrasparc kernel with this base nix:
import /etc/nixos/nixpkgs/default.nix # The root nixpkgs default.nix
{
crossSystem = {
config = "sparc64-unknown-linux";
bigEndian = true;
arch = "sparc64";
float = "soft";
withTLS = true;
cpu = "ultrasparc";
};
config = pkgs: {
packageOverrides = pkgs : {
platform = {
name = "sparc64";
kernelHeadersBaseConfig = "sparc64_defconfig";
kernelBaseConfig = "sparc64_defconfig";
kernelArch = "sparc";
kernelAutoModules = false;
kernelTarget = "zImage";
uboot = null;
};
};
};
}
Although it did not boot directly in qemu-system-sparc64:
[sparc64] Kernel already loaded
Unhandled Exception 0x0000000000000020
PC = 0x0000000000404000 NPC = 0x0000000000404004
svn path=/nixpkgs/trunk/; revision=20269
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.4/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc-2.11/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc-2.11/default.nix | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc-4.4/default.nix b/pkgs/development/compilers/gcc-4.4/default.nix index 3ae45592fd53..358e52124072 100644 --- a/pkgs/development/compilers/gcc-4.4/default.nix +++ b/pkgs/development/compilers/gcc-4.4/default.nix @@ -57,8 +57,11 @@ let version = "4.4.3"; javaAwtGtk = langJava && gtk != null; + withCPU = if cross ? cpu then " --with-cpu=${cross.cpu}" else ""; + crossConfigureFlags = "--target=${cross.config}" + + withCPU + (if crossStageStatic then " --disable-libssp --disable-nls" + " --without-headers" + diff --git a/pkgs/development/libraries/glibc-2.11/common.nix b/pkgs/development/libraries/glibc-2.11/common.nix index 2fd3fbcbab9c..77a89f744908 100644 --- a/pkgs/development/libraries/glibc-2.11/common.nix +++ b/pkgs/development/libraries/glibc-2.11/common.nix @@ -67,9 +67,9 @@ stdenv.mkDerivation ({ then "--enable-profile" else "--disable-profile") ] ++ stdenv.lib.optionals (cross != null) [ - "--with-tls" + (if cross.withTLS then "--with-tls" else "--without-tls") + (if cross.float == "float" then "--without-fp" else "--with-fp") "--enable-kernel=2.6.0" - "--without-fp" "--with-__thread" ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [ "--host=arm-linux-gnueabi" diff --git a/pkgs/development/libraries/glibc-2.11/default.nix b/pkgs/development/libraries/glibc-2.11/default.nix index c638e0bcf702..32c37aaac34e 100644 --- a/pkgs/development/libraries/glibc-2.11/default.nix +++ b/pkgs/development/libraries/glibc-2.11/default.nix @@ -46,6 +46,8 @@ in libc_cv_forced_unwind=yes libc_cv_c_cleanup=yes libc_cv_gnu89_inline=yes + # Only due to a problem in gcc configure scripts: + libc_cv_sparc64_tls=${if cross.withTLS then "yes" else "no"} EOF export BUILD_CC=gcc export CC="$crossConfig-gcc" |