diff options
| author | Nick Clifton <nickc@redhat.com> | 2016-01-11 11:06:56 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2016-01-11 11:06:56 +0000 |
| commit | 4849dfd8f454b9c595e6ee7477f6b7b25c31a499 (patch) | |
| tree | 4d5110ecdae985a3c259c377a750d4f38fd8180b /include | |
| parent | 34ac507d94ea4af59f931b26e66e7721c967f55c (diff) | |
| download | gdb-4849dfd8f454b9c595e6ee7477f6b7b25c31a499.zip gdb-4849dfd8f454b9c595e6ee7477f6b7b25c31a499.tar.gz gdb-4849dfd8f454b9c595e6ee7477f6b7b25c31a499.tar.bz2 | |
Import changes made to files shared with the FSF GCC project.
Import the following changes from the GCC mainline:
2015-11-13 Tsvetkova Alexandra <aleksandra.tsvetkova@intel.com>
* configure.ac: Enable libmpx by default.
* configure: Regenerated.
2015-11-19 Martin Liska <mliska@suse.cz>
* .gitignore: Add .clang-format to ignored files.
* Makefile.tpl: Add clang-format.
* Makefile.in: Regenerate.
2015-12-01 Andreas Tobler <andreast@gcc.gnu.org>
PR libffi/65726
* Makefile.def (lang_env_dependencies): Make libffi depend
on cxx.
* Makefile.in: Regenerate.
2015-12-02 Ian Lance Taylor <iant@google.com>
PR go/66147
* Makefile.tpl (HOST_EXPORTS): Add XGCC_FLAGS_FOR_TARGET.
* Makefile.in: Regenerate.
2015-12-17 Nathan Sidwell <nathan@acm.org>
* config/isl.m4 (ISL_CHECK_VERSION): Add gmp libs.
* configure: Regenerate.
2015-12-17 Sebastian Pop <s.pop@samsung.com>
* Makefile.in: Replace ISL with isl.
* Makefile.tpl: Same.
* config/isl.m4: Same.
* configure.ac: Same.
* contrib/download_prerequisites: Same.
* configure: Regenerate.
2016-01-01 Ben Elliston <bje@gnu.org>
* config.guess: Import version 2016-01-01.
* config.sub: Likewise.
include 2016-01-07 Mike Frysinger <vapier@gentoo.org>
* longlong.h: Change !__SHMEDIA__ to
(!defined (__SHMEDIA__) || !__SHMEDIA__).
Change __SHMEDIA__ to defined (__SHMEDIA__) && __SHMEDIA__.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 10 | ||||
| -rw-r--r-- | include/longlong.h | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 3c7b3cb..80fc4a8 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,13 @@ +2016-01-11 Nick Clifton <nickc@redhat.com> + + Import this change from GCC mainline: + + 2016-01-07 Mike Frysinger <vapier@gentoo.org> + + * longlong.h: Change !__SHMEDIA__ to + (!defined (__SHMEDIA__) || !__SHMEDIA__). + Change __SHMEDIA__ to defined (__SHMEDIA__) && __SHMEDIA__. + 2016-01-06 Maciej W. Rozycki <macro@imgtec.com> * opcode/mips.h: Add a summary of MIPS16 operand codes. diff --git a/include/longlong.h b/include/longlong.h index 4c8d131..5cbc410 100644 --- a/include/longlong.h +++ b/include/longlong.h @@ -1086,7 +1086,7 @@ extern UDItype __umulsidi3 (USItype, USItype); } while (0) #endif -#if defined(__sh__) && !__SHMEDIA__ && W_TYPE_SIZE == 32 +#if defined(__sh__) && (!defined (__SHMEDIA__) || !__SHMEDIA__) && W_TYPE_SIZE == 32 #ifndef __sh1__ #define umul_ppmm(w1, w0, u, v) \ __asm__ ( \ @@ -1159,7 +1159,7 @@ extern UDItype __umulsidi3 (USItype, USItype); #endif /* __sh__ */ -#if defined (__SH5__) && __SHMEDIA__ && W_TYPE_SIZE == 32 +#if defined (__SH5__) && defined (__SHMEDIA__) && __SHMEDIA__ && W_TYPE_SIZE == 32 #define __umulsidi3(u,v) ((UDItype)(USItype)u*(USItype)v) #define count_leading_zeros(count, x) \ do \ |