--- Merging r20124 into '.':

U    rtl/netbsd/Makefile.fpc
U    rtl/netbsd/i386/prt0.as
C    rtl/netbsd/Makefile
Summary of conflicts:
  Text conflicts: 1

# revisions: 20124
------------------------------------------------------------------------
r20124 | pierre | 2012-01-20 17:39:57 +0100 (Fri, 20 Jan 2012) | 1 line
Changed paths:
   M /trunk/rtl/netbsd/Makefile
   M /trunk/rtl/netbsd/Makefile.fpc
   M /trunk/rtl/netbsd/i386/prt0.as

 Fix cross rtl compilation problems
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@20170 -

rtl/netbsd/Makefile

@@ -2658,8 +2658,8 @@ errors$(PPUEXT) : $(UNIXINC)/errors.pp strings$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 ipc$(PPUEXT) : $(UNIXINC)/ipc.pp unix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 terminfo$(PPUEXT) : terminfo.pp unix$(PPUEXT)
 callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)
-sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT)
-syscall$(PPUEXT) : $(UNIXINC)/syscall.pp
+sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) syscall$(PPUEXT)
+syscall$(PPUEXT) : $(UNIXINC)/syscall.pp $(SYSTEMUNIT)$(PPUEXT)
 sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(OBJPASDIR)/sysconst.pp
 sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)

rtl/netbsd/Makefile.fpc

@@ -248,9 +248,9 @@ terminfo$(PPUEXT) : terminfo.pp unix$(PPUEXT)
 
 callspec$(PPUEXT) : $(INC)/callspec.pp $(SYSTEMUNIT)$(PPUEXT)
 
-sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT)
+sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) syscall$(PPUEXT)
 
-syscall$(PPUEXT) : $(UNIXINC)/syscall.pp
+syscall$(PPUEXT) : $(UNIXINC)/syscall.pp $(SYSTEMUNIT)$(PPUEXT)
 
 sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
         $(COMPILER) $(OBJPASDIR)/sysconst.pp

rtl/netbsd/i386/prt0.as

@@ -161,3 +161,8 @@ _actualsyscall:
 .long 1
 .ascii "NetBSD\0\0"
 .long 199905
+
+        .comm operatingsystem_parameter_envp,4
+        .comm operatingsystem_parameter_argc,4
+        .comm operatingsystem_parameter_argv,4
+