Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dscho committed Mar 11, 2015
2 parents 0dd0506 + db76629 commit eb1d093
Show file tree
Hide file tree
Showing 27 changed files with 485 additions and 81 deletions.
14 changes: 14 additions & 0 deletions include/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
2015-03-02 Markus Trippelsdorf <markus@trippelsdorf.de>

PR target/65261
* ansidecl.h (ATTRIBUTE_NO_SANITIZE_UNDEFINED): New macro.

2015-02-19 Pedro Alves <palves@redhat.com>

* floatformat.h [__cplusplus]: Wrap in extern "C".

2015-02-04 Jakub Jelinek <jakub@redhat.com>

* dwarf2.h (enum dwarf_source_language): Add DW_LANG_Fortran03
and DW_LANG_Fortran08.

2015-01-15 Thomas Schwinge <thomas@codesourcery.com>
Julian Brown <julian@codesourcery.com>
James Norris <jnorris@codesourcery.com>
Expand Down
9 changes: 9 additions & 0 deletions include/ansidecl.h
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,15 @@ So instead we use the macro below and test it against specific values. */
# endif /* GNUC >= 4.3 */
#endif /* ATTRIBUTE_HOT */

/* Attribute 'no_sanitize_undefined' was valid as of gcc 4.9. */
#ifndef ATTRIBUTE_NO_SANITIZE_UNDEFINED
# if (GCC_VERSION >= 4009)
# define ATTRIBUTE_NO_SANITIZE_UNDEFINED __attribute__ ((no_sanitize_undefined))
# else
# define ATTRIBUTE_NO_SANITIZE_UNDEFINED
# endif /* GNUC >= 4.9 */
#endif /* ATTRIBUTE_NO_SANITIZE_UNDEFINED */

/* We use __extension__ in some places to suppress -pedantic warnings
about GCC extensions. This feature didn't work properly before
gcc 2.8. */
Expand Down
2 changes: 2 additions & 0 deletions include/dwarf2.h
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,8 @@ enum dwarf_source_language
DW_LANG_C_plus_plus_11 = 0x001a, /* dwarf5.20141029.pdf DRAFT */
DW_LANG_C11 = 0x001d,
DW_LANG_C_plus_plus_14 = 0x0021,
DW_LANG_Fortran03 = 0x0022,
DW_LANG_Fortran08 = 0x0023,

DW_LANG_lo_user = 0x8000, /* Implementation-defined range start. */
DW_LANG_hi_user = 0xffff, /* Implementation-defined range start. */
Expand Down
8 changes: 8 additions & 0 deletions include/floatformat.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.

#include "ansidecl.h"

#ifdef __cplusplus
extern "C" {
#endif

/* A floatformat consists of a sign bit, an exponent and a mantissa. Once the
bytes are concatenated according to the byteorder flag, then each of those
fields is contiguous. We number the bits with 0 being the most significant
Expand Down Expand Up @@ -149,4 +153,8 @@ floatformat_from_double (const struct floatformat *, const double *, void *);
extern int
floatformat_is_valid (const struct floatformat *fmt, const void *from);

#ifdef __cplusplus
}
#endif

#endif /* defined (FLOATFORMAT_H) */
17 changes: 17 additions & 0 deletions newlib/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
2015-03-05 Craig Howland <howland@LGSInnovations.com>

* libc/include/stdio.h (FILE): Protect typedef from redefinition.
* libc/include/wchar.h: Ditto.

2015-02-25 Gedare Bloom <gedare@rtems.org>

* libc/include/machine/time.h (_CLOCKS_PER_SEC_): redefine for RTEMS.

2015-03-03 Steve Ellcey <sellcey@imgtec.com>

* libc/machine/mips/memset.S: Add support for mips32r6/mips64r6.

2015-03-03 Steve Ellcey <sellcey@imgtec.com>

* libc/machine/mips/memcpy.S: Add support for mips32r6/mips64r6.

2015-02-26 Steve Ellcey <sellcey@imgtec.com>

* libc/machine/mips/memcpy.S: Fix macro indentation and typos in
Expand Down
6 changes: 2 additions & 4 deletions newlib/libc/include/machine/time.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
#ifndef _MACHTIME_H_
#define _MACHTIME_H_

#if defined(__rtems__)
#define _CLOCKS_PER_SEC_ sysconf(_SC_CLK_TCK)
#if defined(__rtems__) || defined(__VISIUM__)
#define _CLOCKS_PER_SEC_ 1000000
#elif defined(__aarch64__) || defined(__arm__) || defined(__thumb__)
#define _CLOCKS_PER_SEC_ 100
#elif defined (__VISIUM__)
#define _CLOCKS_PER_SEC_ 1000000
#endif

#ifdef __SPU__
Expand Down
3 changes: 3 additions & 0 deletions newlib/libc/include/stdio.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@

_BEGIN_STD_C

#if !defined(__FILE_defined)
typedef __FILE FILE;
# define __FILE_defined
#endif

#ifdef __CYGWIN__
typedef _fpos64_t fpos_t;
Expand Down
3 changes: 3 additions & 0 deletions newlib/libc/include/wchar.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@
_BEGIN_STD_C

/* As in stdio.h, <sys/reent.h> defines __FILE. */
#if !defined(__FILE_defined)
typedef __FILE FILE;
# define __FILE_defined
#endif

/* As required by POSIX.1-2008, declare tm as incomplete type.
The actual definition is in time.h. */
Expand Down

0 comments on commit eb1d093

Please sign in to comment.