Skip to content

Commit 737d124

Browse files
fix the cabs* fix for m68k. now actually builds.
1 parent 7d3321a commit 737d124

2 files changed

Lines changed: 14 additions & 3 deletions

File tree

external/gpl3/gcc/dist/gcc/config/m68k/m68k.cc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ static bool m68k_legitimate_address_p (machine_mode, rtx, bool,
162162
code_helper = ERROR_MARK);
163163
static void m68k_option_override (void);
164164
static void m68k_override_options_after_change (void);
165+
static void m68k_init_builtins (void);
165166
static rtx find_addr_reg (rtx);
166167
static const char *singlemove_string (rtx *);
167168
static void m68k_output_mi_thunk (FILE *, tree, HOST_WIDE_INT,
@@ -271,6 +272,9 @@ static HARD_REG_SET m68k_zero_call_used_regs (HARD_REG_SET);
271272
#undef TARGET_OPTION_OVERRIDE
272273
#define TARGET_OPTION_OVERRIDE m68k_option_override
273274

275+
#undef TARGET_INIT_BUILTINS
276+
#define TARGET_INIT_BUILTINS m68k_init_builtins
277+
274278
#undef TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE
275279
#define TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE m68k_override_options_after_change
276280

@@ -718,6 +722,16 @@ m68k_option_override (void)
718722
}
719723
}
720724

725+
/* Implement TARGET_INIT_BUILTINS. */
726+
727+
static void
728+
m68k_init_builtins (void)
729+
{
730+
#ifdef SUBTARGET_INIT_BUILTINS
731+
SUBTARGET_INIT_BUILTINS;
732+
#endif
733+
}
734+
721735
/* Implement TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE. */
722736

723737
static void

external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ along with GCC; see the file COPYING3. If not see
5353
} \
5454
}
5555

56-
/* GCC m68k has no TARGET_INIT_BUILTINS, so simply use it. */
57-
#define TARGET_INIT_BUILTINS SUBTARGET_INIT_BUILTINS
58-
5956
/* Provide a CPP_SPEC appropriate for NetBSD m68k targets. Currently we
6057
deal with the GCC option '-posix', as well as an indication as to
6158
whether or not use of the FPU is allowed. */

0 commit comments

Comments
 (0)