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 | |
| 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
| -rw-r--r-- | gcc/ChangeLog.wide-int | 4 | ||||
| -rw-r--r-- | gcc/gencheck.c | 3 | ||||
| -rw-r--r-- | gcc/mkconfig.sh | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ChangeLog.wide-int b/gcc/ChangeLog.wide-int index cbd34c940b4..6af7c408d45 100644 --- a/gcc/ChangeLog.wide-int +++ b/gcc/ChangeLog.wide-int @@ -869,7 +869,9 @@ (output_constructor_bitfield): Likewise. * var-tracking.c (loc_cmp): Handle CONST_WIDE_INT. - * mkconfig.sh: Define BITS_PER_UNIT for GENERATOR_FILEs. + * mkconfig.sh: Include machmode.h to pick up BITS_PER_UNIT for + GENERATOR_FILEs. + * gencheck.c: Define BITS_PER_UNIT. * wide-int.cc: New. * wide-int.h: New. * wide-int-print.cc: New. diff --git a/gcc/gencheck.c b/gcc/gencheck.c index a25553081cc..6e8a29f41c5 100644 --- a/gcc/gencheck.c +++ b/gcc/gencheck.c @@ -17,6 +17,9 @@ You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ +/* We don't have insn-modes.h, but we include tm.h. */ +#define BITS_PER_UNIT 8 + #include "bconfig.h" #include "system.h" #include "coretypes.h" 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 ;; |