Commit 678e6c28 authored by Jeffrey Lee's avatar Jeffrey Lee

Update to build with GCC 4

Detail:
  Makefile, c/execute, c/sed - Updated to build with GCC 4/libgnu4
Admin:
  Tested manually and with ROM + disc builds
  Requires GCC4-based BuildHost environment to build


Version 0.02. Tagged as 'sed-0_02'
parent 0871b122
......@@ -12,21 +12,26 @@ COMPONENT = GNU/sed
TARGET = Sed
include StdTools
include StdRules
include GCCRules
CFLAGS += -fa -Ospace -Wd
CINCLUDES = -IC:,^.libgnu.,@.,@.lib.
CC = gcc
LD = gcc
CFLAGS = -c -O2 -munixlib ${CINCLUDES} ${CDEFINES} -Wall
CINCLUDES = -I^.libgnu4 -I@ -Ilib
CDEFINES = -DHAVE_CONFIG_H -Dlint -DVOID=void\
"-DPACKAGE=\"sed\""\
"-DVERSION=\"4.0.7\""\
"-DSED_FEATURE_VERSION=\"4.0\""
LDFLAGS = -munixlib -static
LIBS = ^.libgnu.o.libgnu \
gccbin:arm-riscos-aof.2_95_4.apcs32.arch3.libscl.o.libgcc \
gccbin:arm-riscos-aof.2_95_4.apcs32.arch3.libscl.o.libscl
LIBS = ^.libgnu4.o.libgnu4
OBJS = o.compile o.execute o.regex o.sed o.fmt o.utils
DIRS = o._dirs
ifneq ($(THROWBACK),)
CFLAGS += -mthrowback
endif
all: ${TARGET}
@${ECHO} ${COMPONENT}: built
......@@ -42,12 +47,14 @@ clean:
${TARGET}: ${OBJS} ${LIBS} ${DIRS}
${LD} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
elf2aif $@
${DIRS}:
${MKDIR} o
${TOUCH} $@
o.utils: lib.c.utils
${CC} ${CFLAGS} -o $@ lib.c.utils
${CC} ${CFLAGS} -MD -MF !!Depend -o $@ lib.c.utils
@${PERL} Build:GCCDepend $@
# Dynamic dependencies:
/* (0.01)
/* (0.02)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.01
#define Module_MajorVersion_CMHG 0.02
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 18 Nov 2003
#define Module_Date_CMHG 30 Jul 2013
#define Module_MajorVersion "0.01"
#define Module_Version 1
#define Module_MajorVersion "0.02"
#define Module_Version 2
#define Module_MinorVersion ""
#define Module_Date "18 Nov 2003"
#define Module_Date "30 Jul 2013"
#define Module_ApplicationDate "18-Nov-03"
#define Module_ApplicationDate "30-Jul-13"
#define Module_ComponentName "sed"
#define Module_ComponentPath "RiscOS/Tools/Sources/GNU/sed"
#define Module_ComponentPath "gpl/RiscOS/Tools/Sources/GNU/sed"
#define Module_FullVersion "0.01"
#define Module_HelpVersion "0.01 (18 Nov 2003)"
#define Module_LibraryVersionInfo "0:1"
#define Module_FullVersion "0.02"
#define Module_HelpVersion "0.02 (30 Jul 2013)"
#define Module_LibraryVersionInfo "0:2"
......@@ -533,7 +533,7 @@ open_next_file(name, input)
#ifdef __riscos
/* Need to open the file such that it isn't deleted on close. */
input->in_file_name = name;
input->out_file_name = xstrdup (zp_tmpnam (NULL));
input->out_file_name = xstrdup (tmpnam (NULL));
output_file = ck_fopen (input->out_file_name, "w", FALSE);
#else
int output_fd;
......
......@@ -64,6 +64,12 @@
# define ATOI(x) strtoul(x, NULL, 0)
#endif
#ifdef __riscos
/* Disable unixlib's filename translation */
#include <unixlib/local.h>
int __riscosify_control = __RISCOSIFY_NO_PROCESS | __RISCOSIFY_NO_REVERSE_SUFFIX;
#endif
int extended_regexp_flags = 0;
/* If set, fflush(stdout) on every line output. */
......
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