mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-03 04:12:10 +08:00
ba307cddcf
Currently, the sim-config module will abort if alignment settings
haven't been specified by the port's configure.ac. This is a bit
weird when we've allowed SIM_AC_OPTION_ALIGNMENT to seem like it's
optional to use. Thus everyone invokes it.
There are 4 alignment settings, but really only 2 matters: strict
and nonstrict. The "mixed" setting is just the default ("unset"),
and "forced" isn't used directly by anyone (it's available as a
runtime option for some ports).
The m4 macro has 2 args: the "wire" settings (which represents the
hardwired port behavior), and the default settings (which are used
if nothing else is specified). If none are specified, then the
build won't work (see above as if SIM_AC_OPTION_ALIGNMENT wasn't
called). If default settings are provided, then that is used, but
we allow the user to override at runtime. Otherwise, the "wire"
settings are used and user runtime options to change are ignored.
Most ports specify a default, or set the "wire" to nonstrict. A
few set "wire" to strict, but it's not clear that's necessary as
it doesn't make the code behavior, by default, any different. It
might make things a little faster, but we should provide the user
the choice of the compromises to make: force a specific mode at
compile time for faster runtime, or allow the choice at runtime.
More likely it seems like an oversight when these ports were
initially created, and/or copied & pasted from existing ports.
With all that backstory, let's get to what this commit does.
First kill off the idea of a compile-time default alignment and
set it to nonstrict in the common code. For any ports that want
strict alignment by default, that code is moved to sim_open while
initializing the sim. That means WITH_DEFAULT_ALIGNMENT can be
completely removed.
Moving the default alignment to the runtime also allows removal
of setting the "wire" settings at configure time. Which allows
removing of all arguments to SIM_AC_OPTION_ALIGNMENT and moving
that call to common code.
The macro logic can be reworked to not pass WITH_ALIGNMENT as -D
CPPFLAG and instead move it to config.h.
All of these taken together mean we can hoist the macro up to the
top level and share it among all sims so behavior is consistent
among all the ports.
121 lines
4.6 KiB
Plaintext
121 lines
4.6 KiB
Plaintext
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
|
|
|
|
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
|
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
# PARTICULAR PURPOSE.
|
|
|
|
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
|
|
# AM_CONDITIONAL -*- Autoconf -*-
|
|
|
|
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
|
|
# -------------------------------------
|
|
# Define a conditional.
|
|
AC_DEFUN([AM_CONDITIONAL],
|
|
[AC_PREREQ([2.52])dnl
|
|
m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
|
|
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
|
|
AC_SUBST([$1_TRUE])dnl
|
|
AC_SUBST([$1_FALSE])dnl
|
|
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
|
|
_AM_SUBST_NOTMAKE([$1_FALSE])dnl
|
|
m4_define([_AM_COND_VALUE_$1], [$2])dnl
|
|
if $2; then
|
|
$1_TRUE=
|
|
$1_FALSE='#'
|
|
else
|
|
$1_TRUE='#'
|
|
$1_FALSE=
|
|
fi
|
|
AC_CONFIG_COMMANDS_PRE(
|
|
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
|
|
AC_MSG_ERROR([[conditional "$1" was never defined.
|
|
Usually this means the macro was only invoked conditionally.]])
|
|
fi])])
|
|
|
|
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
|
|
# From Jim Meyering
|
|
|
|
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
# AM_MAINTAINER_MODE([DEFAULT-MODE])
|
|
# ----------------------------------
|
|
# Control maintainer-specific portions of Makefiles.
|
|
# Default is to disable them, unless 'enable' is passed literally.
|
|
# For symmetry, 'disable' may be passed as well. Anyway, the user
|
|
# can override the default with the --enable/--disable switch.
|
|
AC_DEFUN([AM_MAINTAINER_MODE],
|
|
[m4_case(m4_default([$1], [disable]),
|
|
[enable], [m4_define([am_maintainer_other], [disable])],
|
|
[disable], [m4_define([am_maintainer_other], [enable])],
|
|
[m4_define([am_maintainer_other], [enable])
|
|
m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
|
|
AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
|
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
|
|
AC_ARG_ENABLE([maintainer-mode],
|
|
[AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
|
|
am_maintainer_other[ make rules and dependencies not useful
|
|
(and sometimes confusing) to the casual installer])],
|
|
[USE_MAINTAINER_MODE=$enableval],
|
|
[USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
|
|
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
|
|
AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
|
|
MAINT=$MAINTAINER_MODE_TRUE
|
|
AC_SUBST([MAINT])dnl
|
|
]
|
|
)
|
|
|
|
# Copyright (C) 2006-2017 Free Software Foundation, Inc.
|
|
#
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
# _AM_SUBST_NOTMAKE(VARIABLE)
|
|
# ---------------------------
|
|
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
|
|
# This macro is traced by Automake.
|
|
AC_DEFUN([_AM_SUBST_NOTMAKE])
|
|
|
|
# AM_SUBST_NOTMAKE(VARIABLE)
|
|
# --------------------------
|
|
# Public sister of _AM_SUBST_NOTMAKE.
|
|
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
|
|
|
|
m4_include([../../config/depstand.m4])
|
|
m4_include([../../config/gettext-sister.m4])
|
|
m4_include([../../config/lead-dot.m4])
|
|
m4_include([../../config/override.m4])
|
|
m4_include([../../config/plugins.m4])
|
|
m4_include([../../config/zlib.m4])
|
|
m4_include([../../libtool.m4])
|
|
m4_include([../../ltoptions.m4])
|
|
m4_include([../../ltsugar.m4])
|
|
m4_include([../../ltversion.m4])
|
|
m4_include([../../lt~obsolete.m4])
|
|
m4_include([../m4/sim_ac_common.m4])
|
|
m4_include([../m4/sim_ac_option_bitsize.m4])
|
|
m4_include([../m4/sim_ac_option_endian.m4])
|
|
m4_include([../m4/sim_ac_option_hardware.m4])
|
|
m4_include([../m4/sim_ac_option_inline.m4])
|
|
m4_include([../m4/sim_ac_option_reserved_bits.m4])
|
|
m4_include([../m4/sim_ac_option_warnings.m4])
|
|
m4_include([../m4/sim_ac_output.m4])
|
|
m4_include([../m4/sim_ac_toolchain.m4])
|