Incorporate feedback

Author: kleisauke

system/lib/libc/musl/arch/emscripten/bits/alltypes.h

@@ -9,21 +9,11 @@
 #define __BYTE_ORDER 1234
 #define __LONG_MAX __LONG_MAX__
 
-#ifndef __cplusplus
-#ifdef __WCHAR_TYPE__
 #if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
 typedef __WCHAR_TYPE__ wchar_t;
 #define __DEFINED_wchar_t
 #endif
 
-#else
-#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
-typedef long wchar_t;
-#define __DEFINED_wchar_t
-#endif
-
-#endif
-#endif
 #if defined(__NEED_wint_t) && !defined(__DEFINED_wint_t)
 typedef __WINT_TYPE__ wint_t;
 #define __DEFINED_wint_t
@@ -72,7 +62,6 @@ typedef unsigned int wctype_t;
 #endif
 
 
-#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 0
 #if defined(__NEED_float_t) && !defined(__DEFINED_float_t)
 typedef float float_t;
 #define __DEFINED_float_t
@@ -83,18 +72,6 @@ typedef double double_t;
 #define __DEFINED_double_t
 #endif
 
-#else
-#if defined(__NEED_float_t) && !defined(__DEFINED_float_t)
-typedef long double float_t;
-#define __DEFINED_float_t
-#endif
-
-#if defined(__NEED_double_t) && !defined(__DEFINED_double_t)
-typedef long double double_t;
-#define __DEFINED_double_t
-#endif
-
-#endif
 
 #ifndef __cplusplus
 #if defined(__NEED_max_align_t) && !defined(__DEFINED_max_align_t)

system/lib/libc/musl/arch/emscripten/bits/alltypes.h.in

@@ -9,13 +9,7 @@
 #define __BYTE_ORDER 1234
 #define __LONG_MAX __LONG_MAX__
 
-#ifndef __cplusplus
-#ifdef __WCHAR_TYPE__
 TYPEDEF __WCHAR_TYPE__ wchar_t;
-#else
-TYPEDEF long wchar_t;
-#endif
-#endif
 TYPEDEF __WINT_TYPE__ wint_t;
 
 // XXX EMSCRIPTEN: ensure it's always 32-bits even in wasm64
@@ -28,13 +22,8 @@ TYPEDEF int suseconds_t;
 TYPEDEF unsigned int fsfilcnt_t;
 TYPEDEF unsigned int wctype_t;
 
-#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 0
 TYPEDEF float float_t;
 TYPEDEF double double_t;
-#else
-TYPEDEF long double float_t;
-TYPEDEF long double double_t;
-#endif
 
 #ifndef __cplusplus
 TYPEDEF struct { _Alignas(8) long long __ll; long double __ld; } max_align_t;

system/lib/libc/musl/arch/emscripten/bits/update_alltypes.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+# This script updates alltypes.h based on the contents of alltypes.h.in.
+# In upstream this must be done by the top level Makefile.
+
+musl_srcdir="$PWD/musl"
+musl_includedir="$musl_srcdir/include"
+emscripten_dir="$musl_srcdir/arch/emscripten/bits"
+sed -f $musl_srcdir/tools/mkalltypes.sed \
+  $emscripten_dir/alltypes.h.in \
+  $musl_includedir/alltypes.h.in > $emscripten_dir/alltypes.h