diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-04-09 10:00:49 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-04-09 10:01:37 +0200 |
| commit | 86a6a4731a01f421af2cb883dcf96899169a5802 (patch) | |
| tree | 6a1d23866de34d759945d1874273a6e36b56050e | |
| parent | abafe559044ad3f64c44228b7b6f7f5d64fb0a28 (diff) | |
| download | OSELAS.Toolchain-86a6a4731a01f421af2cb883dcf96899169a5802.tar.gz OSELAS.Toolchain-86a6a4731a01f421af2cb883dcf96899169a5802.tar.xz | |
fixup_ptxconfigs.sh: never set '--with-arch=' in combination with '--with-cpu='
This basically reverts commit ee41ecb45afe7bd1bc032f430ba55177812003bc.
If '--with-arch=' is set, then '--with-cpu=' is ignored.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rwxr-xr-x | fixup_ptxconfigs.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fixup_ptxconfigs.sh b/fixup_ptxconfigs.sh index 1ff241c..90a33e2 100755 --- a/fixup_ptxconfigs.sh +++ b/fixup_ptxconfigs.sh @@ -139,12 +139,12 @@ fixup() case "${PTXCONF_GNU_TARGET}" in # softfp, vfp arm-1136jfs-linux-gnueabi) - PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=softfp --with-fpu=vfp --with-cpu=arm1136jf-s --with-arch=armv6j" + PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=softfp --with-fpu=vfp --with-cpu=arm1136jf-s" ;; # hard, vfp arm-1136jfs-linux-gnueabihf) - PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=vfp --with-cpu=arm1136jf-s --with-arch=armv6j" + PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=vfp --with-cpu=arm1136jf-s" ;; # softfp, neon @@ -159,13 +159,13 @@ fixup() # softfp, neon arm-cortexa8-linux-gnueabi) - PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=softfp --with-fpu=neon --with-cpu=cortex-a8 --with-arch=armv7-a --with-mode=thumb" + PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=softfp --with-fpu=neon --with-cpu=cortex-a8 --with-mode=thumb" PTXCONF_GLIBC_CONFIG_EXTRA="--disable-multi-arch" ;; # hard, neon arm-cortexa8-linux-gnueabihf) - PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=neon --with-cpu=cortex-a8 --with-arch=armv7-a --with-mode=thumb" + PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=neon --with-cpu=cortex-a8 --with-mode=thumb" PTXCONF_GLIBC_CONFIG_EXTRA="--disable-multi-arch" ;; @@ -175,19 +175,19 @@ fixup() PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp" ;; arm-v5te-linux-gnueabi) - PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=arm926ej-s --with-arch=armv5te" + PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=arm926ej-s" PTXCONF_GLIBC_CONFIG_EXTRA="--without-fp" ;; arm-cortexm3-uclinuxeabi) - PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=cortex-m3 --with-arch=armv7-m --with-mode=thumb" + PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=cortex-m3 --with-mode=thumb" ;; arm-cortexm3-eabi) - PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=cortex-m3 --with-arch=armv7-m --with-mode=thumb" + PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=soft --with-fpu=vfp --with-cpu=cortex-m3 --with-mode=thumb" ;; # hard, vfp arm-cortexm4-eabihf) - PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=fpv4-sp-d16 --with-cpu=cortex-m4 --with-arch=armv7-m --with-mode=thumb" + PTXCONF_CROSS_GCC_CONFIG_EXTRA="--with-float=hard --with-fpu=fpv4-sp-d16 --with-cpu=cortex-m4 --with-mode=thumb" ;; i486-unknown-linux-gnu) |