From 6439aba2d932f987aa2783faf0f0dc5baec546b2 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Wed, 9 Sep 2015 16:22:08 +1000
Subject: [PATCH] libc: More int32_t fixes to not expect 'long'

libc built from projectgus/newlib-xtensa@45ed90066
---
 libc/xtensa-lx106-elf/include/sys/_intsup.h |  20 ++------------------
 libc/xtensa-lx106-elf/lib/libc.a            | Bin 5105508 -> 5105508 bytes
 libc/xtensa-lx106-elf/lib/libg.a            | Bin 5105508 -> 5105508 bytes
 libc/xtensa-lx106-elf/lib/libm.a            | Bin 2241938 -> 2241938 bytes
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/libc/xtensa-lx106-elf/include/sys/_intsup.h b/libc/xtensa-lx106-elf/include/sys/_intsup.h
index 7c3bc01..fa78426 100644
--- a/libc/xtensa-lx106-elf/include/sys/_intsup.h
+++ b/libc/xtensa-lx106-elf/include/sys/_intsup.h
@@ -4,6 +4,8 @@
  *
  * Permission to use, copy, modify, and distribute this software
  * is freely granted, provided that this notice is preserved.
+ *
+ * Modified for xtensa arch & non-long int32_t, removes automatic setting of __have_long32.
  */
 
 #ifndef _SYS__INTSUP_H
@@ -11,26 +13,8 @@
 
 #include <sys/features.h>
 
-#if __GNUC_PREREQ (3, 2)
-/* gcc > 3.2 implicitly defines the values we are interested */
 #define __STDINT_EXP(x) __##x##__
-#else
-#define __STDINT_EXP(x) x
-#include <limits.h>
-#endif
 
-/* Check if "long long" is 64bit wide */
-/* Modern GCCs provide __LONG_LONG_MAX__, SUSv3 wants LLONG_MAX */
-#if ( defined(__LONG_LONG_MAX__) && (__LONG_LONG_MAX__ > 0x7fffffff) ) \
-  || ( defined(LLONG_MAX) && (LLONG_MAX > 0x7fffffff) )
 #define __have_longlong64 1
-#endif
-
-/* Check if "long" is 64bit or 32bit wide */
-#if __STDINT_EXP(LONG_MAX) > 0x7fffffff
-#define __have_long64 1
-#elif __STDINT_EXP(LONG_MAX) == 0x7fffffff && !defined(__SPU__)
-#define __have_long32 1
-#endif
 
 #endif /* _SYS__INTSUP_H */
diff --git a/libc/xtensa-lx106-elf/lib/libc.a b/libc/xtensa-lx106-elf/lib/libc.a
index 596e9f61e44bee4456c22f75a2e9a37a2211a733..33cfced655688d52c43010ecc882d3c052c4d5c9 100644
GIT binary patch
delta 251
zcmWN~Syn*-0D$3>XdWd^h`-E3T{onnlG0>RJ^b%&#<2^la8BFE!}t8nXVb`h;Wr)Y
zblXArgDgozmL)1NS&>y)lXcmUP1%xd*^yn@lYNQHfh6Qml5!-+aw4a4CMiivM$RQG
zIaw?haw&N!NKr~smWouRCUt4Zm0U|8O$p^jTGEz|+)7vO<X#@6Cw+O8CwZ2EyvR^q
T<xNKNE+6tKU-CU+Jox(u*m*{U

delta 251
zcmWN~TQ))g06@_t3PpL9sFdTa;@-HTDCL!CP<@<#ld;UAQM6Xm(8vDX)5%|KI`>nG
zM_~{&$H;=jWKotRE(uwd6<L*}q-0IjB`q1*kWJZ=ZP}5m<YZU!vM2jekfN02K*~~)
zLzyo}ax5ouDra&o7jh|8sYzX~<XQp=r6D(RE0NquQ|{$KTGEzBd6JHF<ym^tmlt`J
TH+h#28OWy$<x9SQ8TDuX%uq&n

diff --git a/libc/xtensa-lx106-elf/lib/libg.a b/libc/xtensa-lx106-elf/lib/libg.a
index 596e9f61e44bee4456c22f75a2e9a37a2211a733..33cfced655688d52c43010ecc882d3c052c4d5c9 100644
GIT binary patch
delta 251
zcmWN~Syn*-0D$3>XdWd^h`-E3T{onnlG0>RJ^b%&#<2^la8BFE!}t8nXVb`h;Wr)Y
zblXArgDgozmL)1NS&>y)lXcmUP1%xd*^yn@lYNQHfh6Qml5!-+aw4a4CMiivM$RQG
zIaw?haw&N!NKr~smWouRCUt4Zm0U|8O$p^jTGEz|+)7vO<X#@6Cw+O8CwZ2EyvR^q
T<xNKNE+6tKU-CU+Jox(u*m*{U

delta 251
zcmWN~TQ))g06@_t3PpL9sFdTa;@-HTDCL!CP<@<#ld;UAQM6Xm(8vDX)5%|KI`>nG
zM_~{&$H;=jWKotRE(uwd6<L*}q-0IjB`q1*kWJZ=ZP}5m<YZU!vM2jekfN02K*~~)
zLzyo}ax5ouDra&o7jh|8sYzX~<XQp=r6D(RE0NquQ|{$KTGEzBd6JHF<ym^tmlt`J
TH+h#28OWy$<x9SQ8TDuX%uq&n

diff --git a/libc/xtensa-lx106-elf/lib/libm.a b/libc/xtensa-lx106-elf/lib/libm.a
index 697d2abbabf92cd861d9a667855c38f1e991c493..7a2455ba0b555a2d92a8cd7ab668ab9feab3ee93 100644
GIT binary patch
delta 122
zcmWN=$qj-4006<D;t2{K;05S*KnxnYvIQQS@HF&dRW_lMO#khI{{LNskLSI<wMZZX
x8OlgP8OubbGLyM1B$8N`vXVqnS<6PYvXe}5*~>wWa+0$YQc5Kkxqjf)`~dJuAHo0t

delta 122
zcmWN=$qj-4006<D;DHyYh^Po|1@IuYMGHPQ@oDJAs%SzdnPGef!~ds@y0&SaFC>tO
wOeK^^W-^zBEG3qetYsrx*-0X)?ByUw$>b!toTZS9T;(RE+@+FQ9$)CYAL_0jwEzGB