Skip to content

GitLab

Source
...
Target
Commits (2)
  • Cameron Cawley's avatar
    Rewrite makefile to use CApp, and support building for Unix · be706d9f
    Cameron Cawley authored 
    Version 6.24. Tagged as 'defmod-6_24'
    be706d9f
  • Ben Avison's avatar
    Permit selectable assembler backend · dd4cecde
    Ben Avison authored 
    The name of the assembler binary used to generate object outputs was
defined by the preprocessor macro ASMCMD: for native builds, it was
"ObjAsm" and for cross-compilation builds, it was "armasm". Extend this
so that the name of the assembler can be overridden at run time by the
environment variable also called ASMCMD. This permits the tool to generate
ELF format object files for use with GCCSDK.

Version 6.25. Tagged as 'defmod-6_25'
    dd4cecde
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 247 deletions
.gitignore 0 → 100644
View file @ dd4cecde
/sources/c/defmod
/o/
/objs/
/Makefile.d
/defmod,ff8
/defmod-D,fd3
Makefile
View file @ dd4cecde
# Makefile for GNU defmod # Makefile for GNU defmod
#
# ***********************************
# *** C h a n g e L i s t ***
# ***********************************
# Date Name Description
# ---- ---- -----------
# 16-Nov-99 SNB Created.
#
# COMPONENT ?= defmod
# Paths
#
VPATH = @ sources oslib support
# ASMINCLUDES = -Ioslib
# Generic options: CINCLUDES = -Ioslib -Isources -Isupport
# CDEFINES = -DPACE_BUILD -DTRACE=0
MKDIR = do mkdir -p CFLAGS += ${C_NOWARN_NON_ANSI_INCLUDES}
AS = objasm
CP = copy
CC = cc
CM = cmhg
RM = remove
LD = link
LB = libfile
TOUCH = create
SQZ = squeeze
WIPE = x wipe
YACC = GNU.bison
DEFINES = -DRISCOS -DEXECUTE_ON_RISCOS -DPACE_BUILD
CCFLAGS = -c -depend !Depend -ffa ${INCLUDES} ${DEFINES} ${THROWBACK} -DTRACE=0 -Wp
YACCDEFS= -DYYDEBUG=0 -DYYMAXDEPTH=0
ASFLAGS = -depend !Depend -Stamp -quit ${THROWBACK} ${ASMINC}
CPFLAGS = ~cfr~v
LBFLAGS = -c
WFLAGS = ~CFR~V
SQZFLAGS = -f
YACCFLAGS = -y YACCFLAGS = -y
OBJS = asmhelp cheader chelp cstrong def defmod hdr \
objasm realloc lookup x
VPATH = sources oslib support
# SOURCES_TO_SYMLINK = $(wildcard sources/c/*)
# Libraries SOURCES_TO_SYMLINK += $(wildcard sources/h/*)
# SOURCES_TO_SYMLINK += $(wildcard sources/y/*)
CLIB = CLIB:o.stubs SOURCES_TO_SYMLINK += $(wildcard oslib/h/*)
SOURCES_TO_SYMLINK += $(wildcard oslib/Hdr/*)
DIRS=o._dirs SOURCES_TO_SYMLINK += $(wildcard support/c/*)
SOURCES_TO_SYMLINK += $(wildcard support/h/*)
# SOURCES_TO_SYMLINK += $(wildcard support/s/*)
# Include files SOURCES_TO_SYMLINK += $(wildcard unix/h/*)
#
INCLUDES = -J@.,oslib.,support.,C: -Ioslib -Isources -Isupport -IC:
ASMINC = -Ioslib -Isources -Isupport
#
# Program specific options:
#
COMPONENT = defmod
ICOMPONENT = !Run
TARGET = ${COMPONENT}
SOURCE =
EXPORTS =
OBJS=o.asmhelp o.callback o.chelp o.def o.defmod o.cheader o.hdr o.x \
o.lookup o.objasm o.realloc o.resource o.riscos o.riscosa o.cstrong
LIBS=${CLIB}
#
# Rule patterns
#
.SUFFIXES:
.SUFFIXES: .o .c .y .s
.c.o:
${CC} ${CCFLAGS} -o $@ $<
.s.o:
${AS} ${ASFLAGS} -o $@ $<
c.defmod: sources.y.defmod
${YACC} ${YACCFLAGS} -o c.defmod sources.y.defmod
o.defmod: c.defmod
${CC} ${CCFLAGS} ${YACCDEFS} -o $@ c.defmod
#
# build defmod
#
all: ${TARGET}
@|
install: all ifneq (Host,${APCS})
${MKDIR} ${INSTDIR}.DefMod CDEFINES += -DRISCOS -DEXECUTE_ON_RISCOS -DYYDEBUG=0 -DYYMAXDEPTH=0
${CP} ${TARGET} ${INSTDIR}.DefMod.!Run ${CPFLAGS} OBJS += callback resource riscos riscosa
@echo Installation of tool ${COMPONENT} complete else
CINCLUDES += -Iunix
CDEFINES += -DUNIX -DEXECUTE_ON_UNIX
OBJS += unix
endif
# include CApp
# RISC OS ROM build rules:
#
rom: ${TARGET}
@echo ${COMPONENT}: rom module built
export: export_${PHASE} ifeq (,${MAKE_VERSION})
install_rom: ${TARGET} sources.c.defmod: sources.y.defmod
@echo ${COMPONENT}: rom module installed ${YACC} ${YACCFLAGS} -o $@ sources.y.defmod
clean: o.defmod: sources.c.defmod
${WIPE} c ${WFLAGS} ${CC} ${CFLAGS} -o $@ sources.c.defmod
${WIPE} o ${WFLAGS}
${RM} ${COMPONENT}
@echo ${COMPONENT}: cleaned
export_hdrs: clean::
@echo ${COMPONENT}: export complete (hdrs) ${RM} sources.c.defmod
export_libs: else
@echo ${COMPONENT}: export complete (libs)
${DIRS}: .y.c:
${MKDIR} c ${YACC} ${YACCFLAGS} -o $@ $<
${MKDIR} o
${TOUCH} $@
# endif
# Final link
#
${TARGET}: ${OBJS} ${LIBS} ${DIRS}
${LD} ${LDFLAGS} -o ${COMPONENT} ${OBJS} ${LIBS}
${SQZ} ${SQZFLAGS} $@
# Dynamic dependencies: # Dynamic dependencies:
VersionNum
View file @ dd4cecde
/* (6.23) /* (6.25)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 6.23 #define Module_MajorVersion_CMHG 6.25
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 14 Jan 2012 #define Module_Date_CMHG 20 Aug 2022
#define Module_MajorVersion "6.23" #define Module_MajorVersion "6.25"
#define Module_Version 623 #define Module_Version 625
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "14 Jan 2012" #define Module_Date "20 Aug 2022"
#define Module_ApplicationDate "14-Jan-12" #define Module_ApplicationDate "20-Aug-22"
#define Module_ComponentName "defmod" #define Module_ComponentName "defmod"
#define Module_ComponentPath "gpl/RiscOS/Tools/Sources/GNU/defmod"
#define Module_FullVersion "6.23" #define Module_FullVersion "6.25"
#define Module_HelpVersion "6.23 (14 Jan 2012)" #define Module_HelpVersion "6.25 (20 Aug 2022)"
#define Module_LibraryVersionInfo "6:23" #define Module_LibraryVersionInfo "6:25"
ports/solaris/.cvsignore deleted 100644 → 0
View file @ ba4644a1
defmod
defmod.c
defs
*.o
ports/solaris/.gitignore deleted 100644 → 0
View file @ ba4644a1
defmod
defmod.c
defs
*.o
ports/solaris/Makefile deleted 100644 → 0
View file @ ba4644a1
#
# Makefile for defmod for UNIX.
#
.SUFFIXES:
.SUFFIXES: .o .c
CC = gcc
CFLAGS = -I. -DPACE_BUILD -DUNIX -DEXECUTE_ON_UNIX
LD = gcc
LDFLAGS =
YACC = bison
YFLAGS =
OBJS = defmod.o lookup.o asmhelp.o chelp.o def.o cheader.o \
objasm.o realloc.o hdr.o unix.o cstrong.o x.o
defmod: ${OBJS}
${LD} ${LDFLAGS} -o $@ ${OBJS}
.c.o:
${CC} ${CFLAGS} -o $@ -c $<
defmod.o: defmod.c
defmod.c: defmod.y
${YACC} -y defmod.y -o defmod.c
clean:
rm -f *.o defmod defmod.c
realclean:
rm -f *.o defmod defmod.c
find . -type l -exec rm -f {} \;
links:
./mklinks
ports/solaris/mklinks deleted 100644 → 0
View file @ ba4644a1
#!/usr/local/bin/bash
# usage: wantlink source dest
wantlink()
{
dir=$1
ext=$2
file=$3
source="../../$dir/$ext/$file";
dest="$file.$ext";
if [ ! -L $dest ];
then
echo ln -s $source $dest
ln -s $source $dest
fi
}
if [ ! -L VersionNum ];
then
echo ln -s ../../VersionNum VersionNum
ln -s ../../VersionNum VersionNum
fi
if [ ! -L oslib ];
then
echo ln -s . oslib
ln -s . oslib
fi
wantlink sources y defmod
wantlink sources h asmhelp
wantlink sources h cheader
wantlink sources h chelp
wantlink sources h cstrong
wantlink sources h def
wantlink sources h defmod_tb
wantlink sources h hdr
wantlink sources h main
wantlink sources h objasm
wantlink sources c asmhelp
wantlink sources c cheader
wantlink sources c chelp
wantlink sources c cstrong
wantlink sources c def
wantlink sources c hdr
wantlink sources c objasm
wantlink support h hostfs
wantlink support h lookup
wantlink support h trace
wantlink support h realloc
wantlink support h m
wantlink support h riscos
wantlink support h x
wantlink support c lookup
wantlink support c realloc
wantlink support c riscos
wantlink support c unix
wantlink support c x
wantlink oslib h os
wantlink oslib h fileswitch
wantlink oslib h osfind
wantlink oslib h osfile
wantlink oslib h macros
wantlink oslib h types
wantlink oslib h territory
wantlink oslib h messagetrans
sources/c/objasm
View file @ dd4cecde
...@@ -907,6 +907,12 @@ os_error *objasm_output ...@@ -907,6 +907,12 @@ os_error *objasm_output
needs = needs, consts = consts, types = types; needs = needs, consts = consts, types = types;
#ifdef EXECUTE_ON_UNIX
char *asmcmd = getenv("ASMCMD");
if (asmcmd == NULL)
asmcmd = ASMCMD;
#endif
if (!separate) if (!separate)
{ {
if ((rc = Emit_Header (file, title, author)) < 0) if ((rc = Emit_Header (file, title, author)) < 0)
...@@ -1115,10 +1121,16 @@ os_error *objasm_output ...@@ -1115,10 +1121,16 @@ os_error *objasm_output
name1, prefix_dir, name2, apcs32 ? 32 : 26)) name1, prefix_dir, name2, apcs32 ? 32 : 26))
< 0) < 0)
goto finish; goto finish;
#else
#ifdef EXECUTE_ON_UNIX
if ((rc = sprintf (cmd, "%s -from %s -to %s "
"-stamp -quit -apcs 3/%dbit/SWstackcheck",
asmcmd, name1, name2, apcs32 ? 32 : 26)) < 0)
#else #else
if ((rc = sprintf (cmd, ASMCMD " -from %s -to %s " if ((rc = sprintf (cmd, ASMCMD " -from %s -to %s "
"-stamp -quit -apcs 3/%dbit/SWstackcheck", "-stamp -quit -apcs 3/%dbit/SWstackcheck",
name1, name2, apcs32 ? 32 : 26)) < 0) name1, name2, apcs32 ? 32 : 26)) < 0)
#endif
goto finish; goto finish;
#endif #endif
......
ports/solaris/kernel.h → unix/h/kernel
View file @ dd4cecde
File moved
ports/solaris/swis.h → unix/h/swis
View file @ dd4cecde
File moved