Changeset 214

Timestamp:

May 22, 2003, 12:34:46 AM (22 years ago)

Author:

zap

Message:

o Moved ldstub.bin to src/ld and added the appropiate build rules.
o Removed -fomit-frame-pointer from optimization options since

a) it is incompatible with -pg (profiling), and
b) -fomit-frame-pointer is broken in every second gcc release.

Location:

trunk/src/emx

Files:

• Makefile (modified) (3 diffs, 1 prop)
• src/ld/ld.smak (modified) (1 diff, 1 prop)
• src/ld/ldstub.asm (added)
• src/ld/ldstub.def (added)
• src/ldstub.asm (deleted)
• src/ldstub.c (deleted)
• src/ldstub.def (deleted)

trunk/src/emx/Makefile

@@ -52 +52 @@
 CFLAGS = -Wall -mstack-arg-probe -Zmt $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
 # The additional C compiler flags for different build modes
-CFLAGS.opt = -s -O3 -fomit-frame-pointer
+CFLAGS.opt = -s -O3
 CFLAGS.dbg = -g
 CFLAGS.aout =
@@ -78 +78 @@
 LDFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(LDFLAGS.$x))
 # How to link a .exe file
-DO.LINK.exe = $(LD) $(strip $(LDFLAGS) $(filter-out -l%,$1)) -o $@ $(^O) $(^LIB) $(filter -l%,$1)
+DO.LINK.exe = $(LD) $(strip $(LDFLAGS) $(filter-out -l%,$1)) -o $@ $(^O) $(^DEF) $(^LIB) $(filter -l%,$1)
 # How to link a .dll file
 DO.LINK.dll = $(LD) $(strip $(LDFLAGS.DLL) $(filter-out -l%,$1)) -o $@ $(^O) $(^DEF) $(^LIB) $(filter -l%,$1)
@@ -133 +133 @@
 ^DEF = $(filter %.def,$^)
 # How to filter the libraries from $^
-^LIB = $(filter %.$(if $(findstring omf,$(.TKIND)),lib,a),$^)
+^LIB = $(strip $(filter %.a,$^) $(filter %.lib,$^))
 # This function finds a tool: if it has been already built, prefer it
 FINDTOOL = $(firstword $(wildcard $.$(TOOLFMT)/$1$E) $(wildcard $(OUT)dbg/aout/$1$E) $1)

trunk/src/emx/src/ld/ld.smak

@@ -13 +13 @@
 .TLDF   := -liberty
 include mkexe.smak
+
+.TARGET := ldstub.bin
+.TKIND  := omf
+.TSRC.386 := src/ld/ldstub.asm
+.TSRC   := $(.TSRC.$(CPU))
+.TAF.src/ld/ldstub.asm = -DMICRO
+.TDEP   := @O@os2$A src/ld/ldstub.def
+.TLDF   := -nostdlib
+include mkexe.smak