From 9ec6602c9d3c1a8801d996aa3a56c779ce1c5f70 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Thu, 11 Jul 2019 16:19:36 +0000
Subject:  bits-fmtscan refactor, part one

---
 tools/gen-bits.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'tools')

diff --git a/tools/gen-bits.sh b/tools/gen-bits.sh
index 973562d..951a7d9 100755
--- a/tools/gen-bits.sh
+++ b/tools/gen-bits.sh
@@ -1,7 +1,5 @@
 #!/bin/sh -e
 
-#!/bin/sh -e
-
 sysdeps="$1"
 bits="$2"
 dfmt="$3"
@@ -11,14 +9,18 @@ bfmt="$6"
 
 tools/gen-types-internal.sh "" "" "$bits" < src/headers/bits-header
 
-if test "$bits" = 64 && grep -qF 'uint64t: no' "$sysdeps" ; then
-  if grep -qF 'sizeofulong: 8' "$sysdeps" ; then
-    cat src/headers/uint64-ulong64
-  else
-    cat src/headers/uint64-noulong64
+if test "$bits" = 64 ; then
+  cat src/headers/uint64-defs
+  if grep -qF 'uint64t: no' "$sysdeps" ; then
+    if grep -qF 'sizeofulong: 8' "$sysdeps" ; then
+      cat src/headers/uint64-ulong64
+    else
+      cat src/headers/uint64-noulong64
+    fi
+    cat src/headers/uint64-macros
   fi
 else
-  tools/gen-types-internal.sh "" "" "$bits" < src/headers/bits-stdint
+  cat src/headers/uint64-include
 fi
 
 if grep -qF 'endianness: little' < "$sysdeps" ; then
@@ -29,6 +31,7 @@ else
   echo 'Error ! Unsupported endianness' 1>&2
   ./crash
 fi
+
 tools/gen-types-internal.sh "" "" "$bits" < src/headers/bits-${endian}endian
 tools/gen-bits-internal.sh "$bits" "$dfmt" "$ofmt" "$xfmt" "$bfmt"
 exec tools/gen-types-internal.sh "" "" "$bits" < src/headers/bits-footer
-- 
cgit v1.2.3