Add cosmopolitan support using 'make-cosmo'.

Author: ghaerr

Makefile

@@ -20,6 +20,7 @@ elks:
 
 clean:
 	rm -f *.o *.a memopad smallpad huffc fixhelp memopad.hlp
+	rm -f memopad.com smallpad.com huffc.com fixhelp.com
 
 ifeq ($(SMALL),y)
 BUILDOPTS = -DBUILD_SMALL_DFLAT
@@ -35,10 +36,16 @@ CFLAGS += -g
 CFLAGS += -Wno-pointer-sign
 CFLAGS += -Wno-compare-distinct-pointer-types
 CFLAGS += -Wno-invalid-source-encoding
+ifneq ($(COSMO),)
+CFLAGS += -DCOSMO=1
+endif
 
 OBJS = memopad.o dialogs.o menus.o
 memopad: $(OBJS) $(LIBS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) -L. -ldflat
+ifneq ($(COSMO),)
+	$(OBJCOPY) -S -O binary $@ [email protected]
+endif
 
 SMALLOBJS = smallpad.o
 smallpad: $(SMALLOBJS) $(LIBS)
@@ -91,14 +98,23 @@ DFLATOBJS += \
 $(LIBS): $(DFLATOBJS)
 	$(AR) rcs $(LIBS) $(DFLATOBJS)
 
-HUFFOBJS = huffc.o htree.o
-huffc: $(HUFFOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(HUFFOBJS)
+huffc: huffc.o htree.o
+	$(CC) $(LDFLAGS) -o $@ $^
+ifneq ($(COSMO),)
+	$(OBJCOPY) -S -O binary $@ [email protected]
+endif
 
-FIXHOBJS = fixhelp.o decomp.o
-fixhelp: $(FIXHOBJS)
-	$(CC) $(LDFLAGS) -o $@ $(FIXHOBJS)
+fixhelp: fixhelp.o decomp.o
+	$(CC) $(LDFLAGS) -o $@ $^
+ifneq ($(COSMO),)
+	$(OBJCOPY) -S -O binary $@ [email protected]
+endif
 
 memopad.hlp: memopad.txt huffc fixhelp
+ifeq ($(COSMO),)
 	./huffc memopad.txt memopad.hlp
 	./fixhelp memopad
+else
+	./huffc.com memopad.txt memopad.hlp
+	./fixhelp.com memopad
+endif

cosmoc++

@@ -0,0 +1,72 @@
+#!/bin/sh
+# replacement for c++ command
+#
+# we assume you run the following beforehand
+#
+#     sudo chmod 1777 /opt
+#     cd /opt
+#     git clone https://github.com/jart/cosmopolitan cosmo
+#     cd cosmo
+#     make -j
+#
+# you can then use it to build open source projects, e.g.
+#
+#     export CC=cosmocc
+#     export CXX=cosmoc++
+#     export LD=cosmoc++
+#     ./configure --prefix=/opt/cosmos
+#     make -j
+#     make install
+#
+
+if [ "$1" = "--version" ]; then
+cat <<'EOF'
+x86_64-unknown-cosmo-g++ (GCC) 9.2.0
+Copyright (C) 2019 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+EOF
+exit 0
+fi
+
+COSMO="/Users/greg/net/cosmopolitan"
+CXX="x86_64-linux-musl-g++"
+CCFLAGS="-O2 -fno-omit-frame-pointer -fdata-sections -ffunction-sections -fno-pie -pg -mnop-mcount -mno-tls-direct-seg-refs"
+CXXFLAGS="-fno-exceptions -fuse-cxa-atexit -fno-threadsafe-statics"
+CPPFLAGS="-DNDEBUG -nostdinc -iquote $COSMO -isystem $COSMO/include -isystem $COSMO/libc/isystem -include libc/integral/normalize.inc"
+LDFLAGS="-static -no-pie -nostdlib -fuse-ld=bfd -Wl,--gc-sections -L$COSMO/lib -Wl,-T,$COSMO/o/ape/public/ape.lds $COSMO/o/ape/ape-no-modify-self.o $COSMO/o/libc/crt/crt.o"
+LDLIBS="$COSMO/o/third_party/libcxx/libcxx.a $COSMO/o/cosmopolitan.a"
+
+HAS_C=0
+HAS_O=0
+HAS_E=0
+FIRST=1
+for x; do
+  if [ $FIRST -eq 1 ]; then
+    set --
+    FIRST=0
+  fi
+  if [ "$x" = "-c" ]; then
+    HAS_C=1
+  fi
+  if [ "$x" = "-E" ]; then
+    HAS_E=1
+  fi
+  if [ "$x" = "-o" ] || [ "${x#-o}" != "$x" ]; then
+    HAS_O=1
+  fi
+  set -- "$@" "$x"
+done
+
+if [ "$HAS_E" = "1" ]; then
+  set -- $CPPFLAGS "$@"
+elif [ "$HAS_C" = "1" ]; then
+  set -- $CCFLAGS $CXXFLAGS $CPPFLAGS "$@"
+else
+  set -- $LDFLAGS $CPPFLAGS "$@" $LDLIBS
+fi
+
+set -- "$CXX" "$@"
+printf '(cd %s; %s)\n' "$PWD" "$*" >>/tmp/build.log
+echo "$@"
+exec "$@"

cosmocc

@@ -0,0 +1,70 @@
+#!/bin/sh
+# replacement for cc command
+#
+# we assume you run the following beforehand
+#
+#     sudo chmod 1777 /opt
+#     cd /opt
+#     git clone https://github.com/jart/cosmopolitan cosmo
+#     cd cosmo
+#     make -j
+#
+# you can then use it to build open source projects, e.g.
+#
+#     export CC=cosmocc
+#     export CXX=cosmoc++
+#     export LD=cosmoc++
+#     ./configure --prefix=/opt/cosmos
+#     make -j
+#     make install
+#
+
+if [ "$1" = "--version" ]; then
+cat <<'EOF'
+x86_64-unknown-cosmo-gcc (GCC) 9.2.0
+Copyright (C) 2019 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+EOF
+exit 0
+fi
+
+COSMO="/Users/greg/net/cosmopolitan"
+CC="x86_64-linux-musl-gcc"
+CFLAGS="-O2 -fno-omit-frame-pointer -fdata-sections -ffunction-sections -fno-pie -pg -mnop-mcount -mno-tls-direct-seg-refs"
+CPPFLAGS="-DNDEBUG -nostdinc -iquote $COSMO -isystem $COSMO/include -isystem $COSMO/libc/isystem -include libc/integral/normalize.inc"
+LDFLAGS="-static -no-pie -nostdlib -fuse-ld=bfd -Wl,--gc-sections -L$COSMO/lib -Wl,-T,$COSMO/o/ape/public/ape.lds $COSMO/o/ape/ape-no-modify-self.o $COSMO/o/libc/crt/crt.o"
+LDLIBS="$COSMO/o/cosmopolitan.a"
+
+HAS_C=0
+HAS_O=0
+HAS_E=0
+FIRST=1
+for x; do
+  if [ $FIRST -eq 1 ]; then
+    set --
+    FIRST=0
+  fi
+  if [ "$x" = "-c" ]; then
+    HAS_C=1
+  fi
+  if [ "$x" = "-E" ]; then
+    HAS_E=1
+  fi
+  if [ "$x" = "-o" ] || [ "${x#-o}" != "$x" ]; then
+    HAS_O=1
+  fi
+  set -- "$@" "$x"
+done
+
+if [ "$HAS_E" = "1" ]; then
+  set -- $CPPFLAGS "$@"
+elif [ "$HAS_C" = "1" ]; then
+  set -- $CFLAGS $CPPFLAGS "$@"
+else
+  set -- $LDFLAGS $CPPFLAGS "$@" $LDLIBS
+fi
+
+set -- "$CC" "$@"
+printf '(cd %s; %s)\n' "$PWD" "$*" >>/tmp/build.log
+exec "$@"

make-cosmo

@@ -0,0 +1,3 @@
+#make CC=./cosmocc CXX=./cosmoc++ LD=./cosmoc++ AR=/Users/greg/net/cosmopolitan/build/bootstrap/ar.com
+
+make COSMO=1 CC=./cosmocc LD=./cosmoc++ AR=x86_64-linux-musl-ar OBJCOPY=x86_64-linux-musl-objcopy

memopad.c

@@ -202,7 +202,7 @@ static void OpenPadWindow(WINDOW wnd, char *FileName)
     wndpos += 2;
     if (wndpos == 20)
         wndpos = 2;
-    wnd1 = CreateWindow(EDITOR,
+    wnd1 = CreateWindow(EDITBOX,
                 Fname,
                 (wndpos-1)*2, wndpos, 10, 40,
                 NULL, wnd, OurEditorProc,

runshell.c

@@ -6,6 +6,10 @@
 typedef void (*sighandler_t) (int);
 #endif
 
+#ifdef COSMO
+extern void _exit(int);
+#endif
+
 int
 runshell(void)
 {

tty-cp437.c

@@ -77,8 +77,6 @@ static int elks_displayable(int c)
 /* convert CP 437 byte to string + NUL, depending on platform */
 int cp437tostr(char *s, int c)
 {
-    extern unsigned short kCp437[256];
-
 #if ELKS
     if (iselksconsole) {
         if (!elks_displayable(c & 255))

unikey.c

@@ -16,7 +16,6 @@
 #define CHECK_MOUSE     1       /* =1 to validate ANSI mouse sequences */
 #define DEBUG           1       /* =1 for keyname() */
 #define ESC             27
-#define unreachable
 
 static char scroll_reverse = 0; /* report reversed scroll wheel direction */
 int kDoubleClickTime = 200;
@@ -277,11 +276,9 @@ int stream_to_rune(unsigned int ch)
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-//#include "libc/calls/calls.h"
-//#include "libc/calls/internal.h"
-//#include "libc/str/thompike.h"
-//#include "libc/sysv/errfuns.h"
 
+#ifndef COSMO
+#define unreachable
 /**
  * Reads single keystroke or control sequence from character device.
  *
@@ -539,6 +536,7 @@ static int startswith(const char *s, const char *prefix) {
     if (*s++ != *prefix++) return 0;
   }
 }
+#endif
 
 static int getparm(char *buf, int n)
 {

unikey.h

@@ -27,6 +27,9 @@ extern int iselksconsole;
 char *tty_allocate_screen(int cols, int lines);
 void tty_output_screen(int flush);
 void tty_setfgpalette(const int *pal16, const int *pal256);
+#ifndef COSMO
+extern unsigned short kCp437[256];
+#endif
 
 /* unikey.c - recognize ANSI input */
 
@@ -47,8 +50,10 @@ char *unikeyname(int k);
 /* state machine conversion of UTF-8 byte sequence to Rune */
 int stream_to_rune(unsigned int ch);
 
+#ifndef COSMO
 /* Reads single keystroke or control sequence from character device */
 int readansi(int fd, char *p, int n);
+#endif
 
 #define bsr(x)  ((x)? (__builtin_clz(x) ^ ((sizeof(int) * 8) -1)): 0)
 #if 0

video.h

@@ -13,7 +13,6 @@
 #define far
 #define poke(a,o,w)     (*((unsigned short *)((char *)(a)+(o))) = (w))
 #define peek(a,o)       (*((unsigned short *)((char *)(a)+(o))))
-extern unsigned short kCp437[256];
 void convert_screen_to_ansi(void);
 #endif