Commit 9a4ca44b authored by Ben Avison's avatar Ben Avison
Browse files

Tweak binaries

* All C binaries are now built with stack limit checking and embedded
  function names both enabled.
* Libraries are linked in a consistent order (makes no difference to
  functionality, but makes it easier to compare binaries).
* Remove useless instructions from transient utilities. This is a partial
  revert of commit 429ec503. Those `ENTRY` lines were not orphaned 'aasm'
  function-entry macros, since nothing ever pulled the return address back
  off the USR mode stack (and note that the contemporary Makefile was already
  using `objasm`). Instead, I believe they were intended to indicate the
  binary entry point, so an `ENTRY` directive was the correct thing to use.
* Use the `-util` option to `link` to insert headers and fiiters on to
  transient utilities.
* ShowStat now gets its version information from the main VersionNum file.
parent ed562522
......@@ -26,8 +26,8 @@ CFLAGS= -wp -I$(INCLUDES) -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET}
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -27,7 +27,7 @@ SQUEEZE = squeeze
DEFINES = -DRISCOS_TWEAK
AFLAGS = -depend !Depend -Stamp -quit
CFLAGS = -c -depend !Depend -ffah -Wp -zps1 ${INCLUDES} ${DEFINES} ${DFLAGS}
CFLAGS = -c -depend !Depend -fah -Wp ${INCLUDES} ${DEFINES} ${DFLAGS}
CPFLAGS = ~cfr~v
WFLAGS = ~c~v
......@@ -36,8 +36,8 @@ WFLAGS = ~c~v
#
CLIB = CLIB:o.stubs
NET5LIBS = \
TCPIPLibs:o.inetlib \
TCPIPLibs:o.unixlib \
TCPIPLibs:o.inetlib \
#
# Include files
......
......@@ -26,7 +26,7 @@ WIPE = x wipe
DEFINES = -DRISCOS_TWEAK -Dlint
AFLAGS = -depend !Depend -Stamp -quit
CFLAGS = -c -depend !Depend -ffah -Wp -zps1 ${INCLUDES} ${DEFINES} ${DFLAGS}
CFLAGS = -c -depend !Depend -fah -Wp ${INCLUDES} ${DEFINES} ${DFLAGS}
CPFLAGS = ~cfr~v
WFLAGS = ~c~v
......@@ -35,8 +35,8 @@ WFLAGS = ~c~v
#
CLIB = CLIB:o.stubs
NET5LIBS = \
TCPIPLibs:o.inetlib \
TCPIPLibs:o.unixlib \
TCPIPLibs:o.inetlib \
TCPIPLibs:o.socklib \
#
......
......@@ -26,8 +26,8 @@ CFLAGS= -wp -I$(INCLUDES) -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET}
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -26,8 +26,8 @@ CFLAGS= -wp -I$(INCLUDES) -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET}
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -27,8 +27,8 @@ CFLAGS= -wp -I$(INCLUDES) -Dlint -c ${THROWBACK} -depend !Depend
OBJS= o.main o.inet o.if o.route o.mroute
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -26,8 +26,8 @@ CFLAGS= -I$(INCLUDES) -c ${THROWBACK} -depend !Depend -wp
OBJS= o.${TARGET}
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -26,8 +26,8 @@ CFLAGS= -Wp -I$(INCLUDES) -DGRAPHLET -Dlint -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET} o.igmp o.inet o.kern
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -34,6 +34,7 @@ OBJS = md5 md5c mdXhl
LIBS = ${UNIXLIB}
CINCLUDES = -ITCPIPLibs:,C:
CDEFINES = -DRISCOS_TWEAK
CAPPFLAGS = ${C_FNAMES}
include CApp
......
......@@ -26,8 +26,8 @@ CFLAGS= -Wp -I$(INCLUDES) -Dlint -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET} o.igmp o.inet o.kern
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -26,8 +26,8 @@ CFLAGS= -Wp -I$(INCLUDES) -Dlint -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET}
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -26,8 +26,8 @@ CFLAGS= -wp -I$(INCLUDES) -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET}
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -26,8 +26,8 @@ CFLAGS= -wp -I$(INCLUDES) -Dlint -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET}
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -26,8 +26,8 @@ CFLAGS= -wp -I$(INCLUDES) -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET}
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -28,8 +28,8 @@ CFLAGS= -I$(INCLUDES) -c ${THROWBACK} -depend !Depend -Wpan
OBJS= o.main o.msgs
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
/* (0.03)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 0.03
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 30 Sep 2019
#define Module_MajorVersion "0.03"
#define Module_Version 3
#define Module_MinorVersion ""
#define Module_Date "30 Sep 2019"
#define Module_ApplicationDate "30-Sep-19"
#define Module_ComponentName "showstat"
#define Module_ComponentPath "RiscOS/Sources/SystemRes/Internet/Sources/showstat"
#define Module_FullVersion "0.03"
#define Module_HelpVersion "0.03 (30 Sep 2019)"
#define Module_LibraryVersionInfo "0:3"
......@@ -29,7 +29,7 @@
#include "msgs.h"
/* Pull in the strings */
#include "VersionNum"
#include "../../VersionNum"
#include "LocalRes:Strings"
......
......@@ -26,8 +26,8 @@ CFLAGS= -wp -I$(INCLUDES) -Dlint -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET}
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
......@@ -34,6 +34,7 @@ OBJS = main tftp tftpsubs
LIBS = ${NET5LIBS}
CINCLUDES = -ITCPIPLibs:,C:
CDEFINES = -DRISCOS_TWEAK -D__P(A)=A -Dlint
CAPPFLAGS = ${C_FNAMES}
include CApp
......
......@@ -26,8 +26,8 @@ CFLAGS= -wp -I$(INCLUDES) -c ${THROWBACK} -depend !Depend
OBJS= o.${TARGET}
LIBS= C:o.Stubs TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5
LIBS= TCPIPLibs:o.Unixlib TCPIPLibs:o.Inetlib \
TCPIPLibs:o.Socklib5 C:o.Stubs
.SUFFIXES: .c .o
.c.o:; $(CC) $(CFLAGS) -o $@ $<
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment