diff options
| author | steven <steven@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-02 22:05:45 +0000 |
|---|---|---|
| committer | steven <steven@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-06-02 22:05:45 +0000 |
| commit | e754ed1d5b8ff0c9f434249ce3ea49590d896d96 (patch) | |
| tree | c1c77f65435de36762d2a4bc8d60a37fd1060319 /gcc/mkconfig.sh | |
| parent | 0d161571656953de78af5b3e512b6bc3da21e7b9 (diff) | |
| download | gcc-e754ed1d5b8ff0c9f434249ce3ea49590d896d96.tar.gz | |
* mkconfig.sh: Include insn-flags.h and insn-constants.h before
defaults.h.
* except.h: Move MUST_USE_SJLJ_EXCEPTIONS and USING_SJLJ_EXCEPTIONS
to defaults.h
* expr.h (BRANCH_COST, MOVE_RATIO, CLEAR_RATIO, SET_RATIO,
DEFAULT_FUNCTION_ARG_PADDING, FUNCTION_ARG_PADDING,
FUNCTION_ARG_BOUNDARY, STACK_SAVEAREA_MODE, STACK_SIZE_MODE,
STACK_CHECK_BUILTIN, STACK_CHECK_STATIC_BUILTIN,
STACK_CHECK_PROBE_INTERVAL_EXP, STACK_CHECK_MOVING_SP,
STACK_OLD_CHECK_PROTECT, STACK_CHECK_PROTECT,
STACK_CHECK_MAX_FRAME_SIZE, STACK_CHECK_FIXED_FRAME_SIZE,
STACK_CHECK_MAX_VAR_SIZE): Move target macro defaults to defaults.h.
* defaults.h: Updated for above mentioned changes.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160195 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/mkconfig.sh')
| -rw-r--r-- | gcc/mkconfig.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh index 9647ad7ec16..c9d35cce2a6 100644 --- a/gcc/mkconfig.sh +++ b/gcc/mkconfig.sh @@ -63,6 +63,10 @@ done # The first entry in HEADERS may be auto-FOO.h ; # it wants to be included even when not -DIN_GCC. +# Postpone including defaults.h until after the insn-* +# headers, so that the HAVE_* flags are available +# when defaults.h gets included. +postpone_defaults_h="no" if [ -n "$HEADERS" ]; then set $HEADERS case "$1" in auto-* ) @@ -73,7 +77,11 @@ if [ -n "$HEADERS" ]; then if [ $# -ge 1 ]; then echo '#ifdef IN_GCC' >> ${output}T for file in "$@"; do - echo "# include \"$file\"" >> ${output}T + if test x"$file" = x"defaults.h"; then + postpone_defaults_h="yes" + else + echo "# include \"$file\"" >> ${output}T + fi done echo '#endif' >> ${output}T fi @@ -94,6 +102,11 @@ EOF ;; esac +# If we postponed including defaults.h, add the #include now. +if test x"$postpone_defaults_h" = x"yes"; then + echo "# include \"defaults.h\"" >> ${output}T +fi + # Add multiple inclusion protection guard, part two. echo "#endif /* ${header_guard} */" >> ${output}T |