diff options
| author | Rob Savoye <rob.savoye@linaro.org> | 2015-07-06 11:36:37 -0600 |
|---|---|---|
| committer | Rob Savoye <rob.savoye@linaro.org> | 2015-07-06 11:36:37 -0600 |
| commit | 19a51b83562c4daf41cf53ca2ea15ad8ed1f8013 (patch) | |
| tree | ef22bcf0c88dc385c174960d284d42016af1d8c8 | |
| parent | 3907e14a33415120edf116591bbb83e5ecfaaea7 (diff) | |
Don't enable multiarch for bare metal builds.
Change-Id: Ife94feb002378d64dcdfd0fc6d87e8df692eac9d
| -rw-r--r-- | config/gcc.conf | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config/gcc.conf b/config/gcc.conf index bdb46775..a6ef594e 100644 --- a/config/gcc.conf +++ b/config/gcc.conf @@ -23,8 +23,8 @@ default_configure_flags="${default_configure_flags} --with-cloog=no --with-ppl=n # nls is used for DNS default_configure_flags="${default_configure_flags} --disable-nls" -# enable multiarch -default_configure_flags="${default_configure_flags} --enable-multiarch --disable-multilib" +# enable multilib +default_configure_flags="${default_configure_flags} --disable-multilib" # C99 is the latest standard, and has improved numerics support, so we want it # http://en.wikipedia.org/wiki/C99 @@ -79,7 +79,7 @@ if test x"${build}" != x"${target}"; then if test x"${override_arch}" = x -a x"${override_cpu}" = x; then default_configure_flags="${default_configure_flags} --with-arch=armv7-a" fi - default_configure_flags="${default_configure_flags} --with-fpu=vfpv3-d16 --with-float=softfp --with-mode=thumb" + default_configure_flags="${default_configure_flags} --with-fpu=vfpv3-d16 --with-float=softfp --with-mode=thumb --enable-multiarch" ;; arm-*linux-gnueabihf) if test x"${override_cpu}" = x -a x"${override_tune}" = x; then @@ -88,7 +88,7 @@ if test x"${build}" != x"${target}"; then if test x"${override_arch}" = x -a x"${override_cpu}" = x; then default_configure_flags="${default_configure_flags} --with-arch=armv7-a" fi - default_configure_flags="${default_configure_flags} --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb" + default_configure_flags="${default_configure_flags} --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb --enable-multiarch" ;; armeb-*linux-gnueabi) if test x"${override_cpu}" = x -a x"${override_tune}" = x; then @@ -97,7 +97,7 @@ if test x"${build}" != x"${target}"; then if test x"${override_arch}" = x -a x"${override_cpu}" = x; then default_configure_flags="${default_configure_flags} --with-arch=armv7-a" fi - default_configure_flags="${default_configure_flags} --with-fpu=vfpv3-d16 --with-float=softfp --with-mode=thumb --disable-multilib" + default_configure_flags="${default_configure_flags} --with-fpu=vfpv3-d16 --with-float=softfp --with-mode=thumb --disable-multilib --enable-multiarch" ;; armeb-*linux-gnueabihf) if test x"${override_cpu}" = x -a x"${override_tune}" = x; then @@ -106,7 +106,7 @@ if test x"${build}" != x"${target}"; then if test x"${override_arch}" = x -a x"${override_cpu}" = x; then default_configure_flags="${default_configure_flags} --with-arch=armv7-a" fi - default_configure_flags="${default_configure_flags} --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb --disable-multilib" + default_configure_flags="${default_configure_flags} --with-fpu=vfpv3-d16 --with-float=hard --with-mode=thumb --disable-multilib --enable-multiarch" ;; # bare metal targets don't support threads. arm*-elf|arm*-eabi*) @@ -116,12 +116,12 @@ if test x"${build}" != x"${target}"; then if test x"${override_arch}" = x -a x"${override_cpu}" = x; then default_configure_flags="${default_configure_flags} --with-arch=armv7-a" fi - default_configure_flags="${default_configure_flags} --enable-threads=no --with-fpu=vfpv3-d16" + default_configure_flags="${default_configure_flags} --enable-threads=no --with-fpu=vfpv3-d16 --disable-multiarch" languages="c,c++,lto" ;; aarch64*-*elf) if test x"${override_arch}" = x -a x"${override_cpu}" = x; then - default_configure_flags="${default_configure_flags} --with-arch=armv8-a ${aarch64_errata}" + default_configure_flags="${default_configure_flags} --with-arch=armv8-a ${aarch64_errata} --disable-multiarch" fi # LDFLAGS_FOR_TARGET=-static # Gfortran doesn't cross configure, just native @@ -129,7 +129,7 @@ if test x"${build}" != x"${target}"; then ;; aarch64*-linux-gnu) if test x"${override_arch}" = x -a x"${override_cpu}" = x; then - default_configure_flags="${default_configure_flags} --with-arch=armv8-a ${aarch64_errata}" + default_configure_flags="${default_configure_flags} --with-arch=armv8-a ${aarch64_errata} --enable-multiarch" fi # LDFLAGS_FOR_TARGET=-static ;; |