Skip to content

Commit 32167ff

Browse files
Blackhexeukarpov
authored andcommitted
Fix x86_64-pc-linux-gnu and aarch64-pc-linux-gnu build (#8)
* * fix undefined references in libgfortran * * fix internal compiler error in gfortran * Revert "* fix internal compiler error in gfortran" This reverts commit 4c81782. * * revert changes for undefined references in gfortran * Fix build on x86_64-pc-linux-gnu when host is aarch64-w64-mingw32 (#6) * Fix x86_64-pc-linux-gnu and aarch64-pc-linux-gnu build --------- Co-authored-by: Evgeny Karpov <[email protected]>
1 parent cd17c97 commit 32167ff

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

gcc/common/config/aarch64/aarch64-common.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,8 @@ aarch64_rewrite_mcpu (int argc, const char **argv)
446446
return aarch64_rewrite_selected_cpu (argv[argc - 1]);
447447
}
448448

449+
#if TARGET_AARCH64_MS_ABI
450+
449451
/* Implement TARGET_EXCEPT_UNWIND_INFO. */
450452

451453
static enum unwind_info_type
@@ -472,6 +474,8 @@ aarch64_except_unwind_info (struct gcc_options *opts)
472474
#undef TARGET_EXCEPT_UNWIND_INFO
473475
#define TARGET_EXCEPT_UNWIND_INFO aarch64_except_unwind_info
474476

477+
#endif // TARGET_AARCH64_MS_ABI
478+
475479
struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
476480

477481
#undef AARCH64_CPU_NAME_LENGTH

gcc/config/aarch64/aarch64.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18391,8 +18391,10 @@ aarch64_override_options_after_change_1 (struct gcc_options *opts)
1839118391
flag_mrecip_low_precision_sqrt = true;
1839218392

1839318393
/* Enable unwind tables for MS */
18394-
if (TARGET_64BIT_MS_ABI && opts->x_flag_unwind_tables == 0)
18394+
#if defined(TARGET_AARCH64_MS_ABI)
18395+
if (opts->x_flag_unwind_tables == 0)
1839518396
opts->x_flag_unwind_tables = 1;
18397+
#endif // TARGET_AARCH64_MS_ABI
1839618398
}
1839718399

1839818400
/* 'Unpack' up the internal tuning structs and update the options

0 commit comments

Comments
 (0)