4 files changed, 19 insertions, 3 deletions
diff --git a/newlib/libc/include/machine/_default_types.h b/newlib/libc/include/machine/_default_types.h
index e79f99399..362e07903 100644
--- a/newlib/libc/include/machine/_default_types.h
+++ b/newlib/libc/include/machine/_default_types.h
@@ -12,8 +12,7 @@ extern "C" {
 /*
  * Guess on types by examining *_MIN / *_MAX defines.
  */
-#if defined(__GNUC__) && ((__GNUC__ >= 4) || (__GNUC__ >= 3 ) \
-  && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ > 2 ))
+#if __GNUC_PREREQ (3, 3)
 /* GCC >= 3.3.0 has __<val>__ implicitly defined. */
 #define __EXP(x) __##x##__
 #else
diff --git a/newlib/libc/include/machine/ieeefp.h b/newlib/libc/include/machine/ieeefp.h
index 72c1cc542..f8795c072 100644
--- a/newlib/libc/include/machine/ieeefp.h
+++ b/newlib/libc/include/machine/ieeefp.h
@@ -69,6 +69,14 @@
 #endif
 #endif
 
+#if defined (__aarch64__)
+#if defined (__AARCH64EL__)
+#define __IEEE_LITTLE_ENDIAN
+#else
+#define __IEEE_BIG_ENDIAN
+#endif
+#endif
+
 #ifdef __epiphany__
 #define __IEEE_LITTLE_ENDIAN
 #define Sudden_Underflow 1
@@ -280,7 +288,11 @@
 #endif
 
 #ifdef __moxie__
+#ifdef __MOXIE_BIG_ENDIAN__
 #define __IEEE_BIG_ENDIAN
+#else
+#define __IEEE_LITTLE_ENDIAN
+#endif
 #endif
 
 #ifdef __ia64__
diff --git a/newlib/libc/include/machine/setjmp.h b/newlib/libc/include/machine/setjmp.h
index 78afc7bdd..48361763d 100644
--- a/newlib/libc/include/machine/setjmp.h
+++ b/newlib/libc/include/machine/setjmp.h
@@ -9,6 +9,11 @@ _BEGIN_STD_C
 #define _JBLEN 23
 #endif
 
+#if defined(__aarch64__)
+#define _JBLEN 22
+#define _JBTYPE long long
+#endif
+
 #if defined(__AVR__)
 #define _JBLEN 24
 #endif
diff --git a/newlib/libc/include/machine/time.h b/newlib/libc/include/machine/time.h
index a296857d4..06e2ccffb 100644
--- a/newlib/libc/include/machine/time.h
+++ b/newlib/libc/include/machine/time.h
@@ -4,7 +4,7 @@
 #if defined(__rtems__)
 #define _CLOCKS_PER_SEC_  sysconf(_SC_CLK_TCK)
 #else  /* !__rtems__ */
-#if defined(__arm__) || defined(__thumb__)
+#if defined(__aarch64__) || defined(__arm__) || defined(__thumb__)
 #define _CLOCKS_PER_SEC_ 100
 #endif
 #endif /* !__rtems__ */