diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 10:55:16 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 10:55:16 -0700 |
| commit | 6a14926b44504e88488e3715b5b84928d454fb49 (patch) | |
| tree | 9cf5f80773922c62ebd9ba07388a1f27354dc516 /gcc/config.gcc | |
| parent | aabd700dee5d71eb0a8180fb3626a23da9a88fdd (diff) | |
| parent | 749dea2a0549c126a0e992a6dd8e9b5eb28e1cee (diff) | |
| download | gcc-6a14926b44504e88488e3715b5b84928d454fb49.tar.gz | |
Merge remote-tracking branch 'origin/master' into hjl/x32/javahjl/x32/java
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 |