boot-132.tar.gz

[apple/boot.git] / i386 / boot2 / Makefile

diff --git a/i386/boot2/Makefile b/i386/boot2/Makefile
index 7995505e83d6457b7b7a465089bea17352499ce6..48d3c679ff73368c0cebb638f6c1834a27b720b5 100644 (file)
--- a/i386/boot2/Makefile
+++ b/i386/boot2/Makefile
@@ -5,11 +5,11 @@
 DIR = boot2
 include ../MakePaths.dir
 
-OPTIM = -Os
+OPTIM = -Os -Oz
 CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost -Werror \
           -fno-builtin -DSAIO_INTERNAL_USER -static \
          -fomit-frame-pointer -mpreferred-stack-boundary=2 \
-         -fno-align-functions
+         -fno-align-functions -mno-sse2 -mfpmath=387
 DEFINES=
 CONFIG = hd
 SYMDIR = $(SYMROOT)
@@ -23,10 +23,10 @@ else
   MKDIRS = /bin/mkdir -p
 endif
 AS = as
-LD = ld
+LD = gcc
 # LIBS= -lc_static
-LIBS= -L$(SYMDIR) -lsaio -lsa -lrcz 
-LIBDEP= $(SYMDIR)/libsaio.a $(SYMDIR)/libsa.a $(SYMDIR)/librcz.a
+LIBS= -L$(SYMDIR) -lsaio -lsa
+LIBDEP= $(SYMDIR)/libsaio.a $(SYMDIR)/libsa.a
 
 OTHER_FILES =
 
@@ -52,8 +52,9 @@ MAXBOOTSIZE = 65024
 all: $(DIRS_NEEDED) boot
 
 boot: machOconv $(OBJS) $(LIBDEP)
-       $(LD) -static -preload -segaddr __TEXT $(BOOT2ADDR) -segalign 20 \
-               -o $(SYMROOT)/boot.sys $(OBJS) $(LIBS) -lcc_kext
+       $(LD) -static -Wl,-preload -Wl,-segaddr,__TEXT,$(BOOT2ADDR) \
+               -nostdlib -arch i386 -Wl,-segalign,20 \
+               -o $(SYMROOT)/boot.sys $(filter %.o,$^) $(LIBS) -lcc_kext
        machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
        size $(SYMROOT)/boot.sys
        ls -l $(SYMROOT)/boot
@@ -75,7 +76,7 @@ install_i386:: all $(INSTALLDIR)
        cd $(INSTALLDIR); chmod u+w boot $(OTHER_FILES)
 
 clean::
-       rm -f $(SYMROOT)/boot.sys $(SYMROOT)/boot
+       rm -f $(SYMROOT)/boot.sys $(SYMROOT)/boot $(SYMROOT)/vers.h
 
 include ../MakeInc.dir