diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-04-04 13:28:27 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-04-04 13:28:27 +0000 |
| commit | faf8a5f7f39235b059c7fe7994dc909b1ad856bd (patch) | |
| tree | 5cd1d9847625ae6fa60e392483a1ca0f224b8bd3 /gcc/config.gcc | |
| parent | c486bd8cad61831663994e24c0e8fe205369a810 (diff) | |
| download | gcc-faf8a5f7f39235b059c7fe7994dc909b1ad856bd.tar.gz | |
2012-04-04 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 186135 using svnmerge
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@186137 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config.gcc')
| -rw-r--r-- | gcc/config.gcc | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/gcc/config.gcc b/gcc/config.gcc index 1f2baeec05a..3eb2c7002df 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -488,6 +488,10 @@ fi case ${target} in i[34567]86-*-*) + if test "x$with_abi" != x; then + echo "This target does not support --with-abi." + exit 1 + fi if test "x$enable_cld" = xyes; then tm_defines="${tm_defines} USE_IX86_CLD=1" fi @@ -497,7 +501,24 @@ i[34567]86-*-*) tm_file="vxworks-dummy.h ${tm_file}" ;; x86_64-*-*) - tm_file="i386/biarch64.h ${tm_file}" + case ${with_abi} in + "") + if test "x$with_multilib_list" = xmx32; then + tm_file="i386/biarchx32.h ${tm_file}" + else + tm_file="i386/biarch64.h ${tm_file}" + fi + ;; + 64 | m64) + tm_file="i386/biarch64.h ${tm_file}" + ;; + x32 | mx32) + tm_file="i386/biarchx32.h ${tm_file}" + ;; + *) + echo "Unknown ABI used in --with-abi=$with_abi" + exit 1 + esac if test "x$enable_cld" = xyes; then tm_defines="${tm_defines} USE_IX86_CLD=1" fi @@ -740,6 +761,7 @@ case ${target} in xm_file="vms/xm-vms.h" c_target_objs="vms-c.o" cxx_target_objs="vms-c.o" + fortran_target_objs="vms-f.o" use_gcc_stdint=provide tm_file="${tm_file} vms/vms-stdint.h" if test x$gnu_ld != xyes; then @@ -3137,7 +3159,7 @@ case "${target}" in ;; i[34567]86-*-* | x86_64-*-*) - supported_defaults="arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64" + supported_defaults="abi arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64" for which in arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64; do eval "val=\$with_$which" case ${val} in |