diff options
| author | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-12-13 18:31:10 +0000 |
|---|---|---|
| committer | mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-12-13 18:31:10 +0000 |
| commit | 08e1fa5017a3d946522bf0ba9f30c6967e9120ac (patch) | |
| tree | 89c155fd1417a34d0e12d125a396cc66127443f3 /gcc/ChangeLog.wide-int | |
| parent | 3dd775fb895cffb77ac74098a74e9fca28edaf79 (diff) | |
| download | gcc-08e1fa5017a3d946522bf0ba9f30c6967e9120ac.tar.gz | |
Resolve soft merge conflict.
Premerge a typo fix to trunk.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@205968 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ChangeLog.wide-int')
| -rw-r--r-- | gcc/ChangeLog.wide-int | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gcc/ChangeLog.wide-int b/gcc/ChangeLog.wide-int index b5f88b2c5b0..df90c297622 100644 --- a/gcc/ChangeLog.wide-int +++ b/gcc/ChangeLog.wide-int @@ -367,8 +367,6 @@ * lto-streamer-out.c (hash_tree): Use wide-int interfaces. (output_cfg): Likewise. - * machmode.def - (MAX_BITS_PER_UNIT): New. * Makefile.in (RTL_H, CFGLOOP_H, C_COMMON_H, TREE_FLOW_H): Add wide-int.h. (REAL_H): Add signop.h. |