diff options
| author | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-12-16 18:42:01 +0000 |
|---|---|---|
| committer | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-12-16 18:42:01 +0000 |
| commit | 7fa0478e0eb2d5b03525ba85e9204a0a7ec558c0 (patch) | |
| tree | 9bfebda93f801f95535eb83e404bb70afff64039 /gcc/mkconfig.sh | |
| parent | a2d59721df971e46cbf5db0d62a6b7fc9555e0c9 (diff) | |
| download | gcc-7fa0478e0eb2d5b03525ba85e9204a0a7ec558c0.tar.gz | |
Resolve some more soft merge conflicts.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@206024 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/mkconfig.sh')
| -rw-r--r-- | gcc/mkconfig.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh index 2fb215a991b..9fc76ea1790 100644 --- a/gcc/mkconfig.sh +++ b/gcc/mkconfig.sh @@ -100,8 +100,8 @@ case $output in #if defined IN_GCC && !defined GENERATOR_FILE # include "insn-modes.h" #endif -#if defined IN_GCC && defined GENERATOR_FILE -# define BITS_PER_UNIT 8 +#if defined IN_GCC && defined GENERATOR_FILE && !defined BITS_PER_UNIT +#include "machmode.h" #endif EOF ;; |