* move sysnr.inc to a rtl/linux/sparcgen dir

* adapt makefiles to reflect this

git-svn-id: trunk@36411 -

.gitattributes

@@ -9336,7 +9336,7 @@ rtl/linux/sparc/sighndh.inc svneol=native#text/plain
 rtl/linux/sparc/stat.inc svneol=native#text/plain
 rtl/linux/sparc/syscall.inc svneol=native#text/plain
 rtl/linux/sparc/syscallh.inc svneol=native#text/plain
-rtl/linux/sparc/sysnr.inc svneol=native#text/plain
+rtl/linux/sparcgen/sysnr.inc svneol=native#text/plain
 rtl/linux/suuid.inc svneol=native#text/plain
 rtl/linux/sysnr-gen.inc svneol=native#text/plain
 rtl/linux/sysos.inc svneol=native#text/plain

rtl/linux/Makefile

@@ -365,6 +365,12 @@ ifeq ($(ARCH),arm)
 override LOADERS+=ucprt0
 CPU_UNITS=cpu
 endif
+ifeq ($(ARCH),sparc)
+  override FPCOPT+=-Fisparcgen
+endif
+ifeq ($(ARCH),sparc64)
+  override FPCOPT+=-Fisparcgen
+endif
 SYSTEMUNIT=system
 ifdef RELEASE
 override FPCOPT+=-Ur
@@ -3663,6 +3669,7 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
 include $(PROCINC)/makefile.cpu
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
+SYSNRINC=$(ARCH)/sysnr.inc
 ifneq ($(findstring -Cg ,$(COMPILER)),)
   PIC_OPT=1
 endif
@@ -3700,12 +3707,14 @@ ifeq ($(ARCH),sparc)
     ASTARGET+=-K PIC --defsym PIC=1
   endif
   ASTARGET+=-32
+  SYSNRINC=sparcgen/sysnr.inc
 endif
 ifeq ($(ARCH),sparc64)
   ifeq ($(PIC_OPT),1)
     ASTARGET+=-K PIC --defsym PIC=1
   endif
   ASTARGET+=-64
+  SYSNRINC=sparcgen/sysnr.inc
 endif
 ifeq ($(ARCH),arm)
   ifeq ($(SUBARCH),armv6m)
@@ -3749,19 +3758,19 @@ ifndef ARMTHUMB
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)$@ $<
 endif
-si_prc$(PPUEXT) : si_prc.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_prc.inc $(SYSTEMUNIT)$(PPUEXT)
+si_prc$(PPUEXT) : si_prc.pp si_intf.inc $(SYSNRINC) $(ARCH)/si_prc.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_prc.pp
-si_c21g$(PPUEXT) : si_c21g.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_c21.inc $(SYSTEMUNIT)$(PPUEXT)
+si_c21g$(PPUEXT) : si_c21g.pp si_intf.inc $(SYSNRINC) $(ARCH)/si_c21.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_c21g.pp
-si_c21$(PPUEXT) : si_c21.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_c21.inc $(SYSTEMUNIT)$(PPUEXT)
+si_c21$(PPUEXT) : si_c21.pp si_intf.inc $(SYSNRINC)  $(ARCH)/si_c21.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_c21.pp
-si_c$(PPUEXT) : si_c.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_c.inc $(SYSTEMUNIT)$(PPUEXT)
+si_c$(PPUEXT) : si_c.pp si_intf.inc $(SYSNRINC)  $(ARCH)/si_c.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_c.pp
-si_dll$(PPUEXT) : si_dll.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_dll.inc $(SYSTEMUNIT)$(PPUEXT)
+si_dll$(PPUEXT) : si_dll.pp si_intf.inc $(SYSNRINC)  $(ARCH)/si_dll.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_dll.pp
-si_uc$(PPUEXT) : si_uc.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_uc.inc $(SYSTEMUNIT)$(PPUEXT)
+si_uc$(PPUEXT) : si_uc.pp si_intf.inc $(SYSNRINC)  $(ARCH)/si_uc.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_uc.pp
-si_g$(PPUEXT) : si_g.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_g.inc $(SYSTEMUNIT)$(PPUEXT)
+si_g$(PPUEXT) : si_g.pp si_intf.inc $(SYSNRINC) $(ARCH)/si_g.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_g.pp
 $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
 	$(COMPILER) -Us -Sg $(SYSTEMUNIT).pp
@@ -3777,7 +3786,7 @@ unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) baseunix$(PPUEXT) $(INC)/tex
 		 unxconst.inc $(UNIXINC)/timezone.inc $(SYSTEMUNIT)$(PPUEXT) unixutil$(PPUEXT) \
 		 unxfunc.inc
 	$(COMPILER) $(UNIXINC)/unix.pp
-syscall$(PPUEXT) : $(UNIXINC)/syscall.pp $(ARCH)/syscallh.inc $(ARCH)/sysnr.inc $(SYSTEMUNIT)$(PPUEXT)
+syscall$(PPUEXT) : $(UNIXINC)/syscall.pp $(ARCH)/syscallh.inc $(SYSNRINC)  $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(UNIXINC)/syscall.pp
 unixutil$(PPUEXT) : $(UNIXINC)/unixutil.pp $(INC)/textrec.inc $(INC)/filerec.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(UNIXINC)/unixutil.pp
@@ -3785,7 +3794,7 @@ unixtype$(PPUEXT) : $(UNIXINC)/unixtype.pp ptypes.inc $(UNIXINC)/ctypes.inc $(SY
 	$(COMPILER) $(UNIXINC)/unixtype.pp
 baseunix$(PPUEXT) : unixtype$(PPUEXT) errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \
   $(UNIXINC)/bunxh.inc \
-  bunxsysc.inc $(ARCH)/syscallh.inc $(ARCH)/sysnr.inc \
+  bunxsysc.inc $(ARCH)/syscallh.inc $(SYSNRINC)  \
   ostypes.inc osmacro.inc $(UNIXINC)/gensigset.inc \
   $(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(UNIXINC)/baseunix.pp

rtl/linux/Makefile.fpc

@@ -96,6 +96,15 @@ override LOADERS+=ucprt0
 CPU_UNITS=cpu
 endif
 
+ifeq ($(ARCH),sparc)
+  override FPCOPT+=-Fisparcgen
+endif
+
+ifeq ($(ARCH),sparc64)
+  override FPCOPT+=-Fisparcgen
+endif
+
+
 SYSTEMUNIT=system
 
 # Causes release PPU files not to be recompiled
@@ -122,6 +131,8 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 # Put $(SYSTEMUNIT) unit dependencies together.
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 
+SYSNRINC=$(ARCH)/sysnr.inc
+
 # Set PIC_OPT to 1 if -Cg or -fPIC is used
 ifneq ($(findstring -Cg ,$(COMPILER)),)
   PIC_OPT=1
@@ -164,6 +175,7 @@ ifeq ($(ARCH),sparc)
     ASTARGET+=-K PIC --defsym PIC=1
   endif
   ASTARGET+=-32
+  SYSNRINC=sparcgen/sysnr.inc
 endif
 
 ifeq ($(ARCH),sparc64)
@@ -171,6 +183,7 @@ ifeq ($(ARCH),sparc64)
     ASTARGET+=-K PIC --defsym PIC=1
   endif
   ASTARGET+=-64
+  SYSNRINC=sparcgen/sysnr.inc
 endif
 
 ifeq ($(ARCH),arm)
@@ -237,25 +250,25 @@ endif
 #
 # $(SYSINIT_UNITS) Units
 #
-si_prc$(PPUEXT) : si_prc.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_prc.inc $(SYSTEMUNIT)$(PPUEXT)
+si_prc$(PPUEXT) : si_prc.pp si_intf.inc $(SYSNRINC) $(ARCH)/si_prc.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_prc.pp
 
-si_c21g$(PPUEXT) : si_c21g.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_c21.inc $(SYSTEMUNIT)$(PPUEXT)
+si_c21g$(PPUEXT) : si_c21g.pp si_intf.inc $(SYSNRINC) $(ARCH)/si_c21.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_c21g.pp
 
-si_c21$(PPUEXT) : si_c21.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_c21.inc $(SYSTEMUNIT)$(PPUEXT)
+si_c21$(PPUEXT) : si_c21.pp si_intf.inc $(SYSNRINC)  $(ARCH)/si_c21.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_c21.pp
 
-si_c$(PPUEXT) : si_c.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_c.inc $(SYSTEMUNIT)$(PPUEXT)
+si_c$(PPUEXT) : si_c.pp si_intf.inc $(SYSNRINC)  $(ARCH)/si_c.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_c.pp
 
-si_dll$(PPUEXT) : si_dll.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_dll.inc $(SYSTEMUNIT)$(PPUEXT)
+si_dll$(PPUEXT) : si_dll.pp si_intf.inc $(SYSNRINC)  $(ARCH)/si_dll.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_dll.pp
 
-si_uc$(PPUEXT) : si_uc.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_uc.inc $(SYSTEMUNIT)$(PPUEXT)
+si_uc$(PPUEXT) : si_uc.pp si_intf.inc $(SYSNRINC)  $(ARCH)/si_uc.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_uc.pp
 
-si_g$(PPUEXT) : si_g.pp si_intf.inc $(ARCH)/sysnr.inc $(ARCH)/si_g.inc $(SYSTEMUNIT)$(PPUEXT)
+si_g$(PPUEXT) : si_g.pp si_intf.inc $(SYSNRINC) $(ARCH)/si_g.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) si_g.pp
 
 
@@ -286,7 +299,7 @@ unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) baseunix$(PPUEXT) $(INC)/tex
                  unxfunc.inc
 	$(COMPILER) $(UNIXINC)/unix.pp
 
-syscall$(PPUEXT) : $(UNIXINC)/syscall.pp $(ARCH)/syscallh.inc $(ARCH)/sysnr.inc $(SYSTEMUNIT)$(PPUEXT)
+syscall$(PPUEXT) : $(UNIXINC)/syscall.pp $(ARCH)/syscallh.inc $(SYSNRINC)  $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(UNIXINC)/syscall.pp
 
 unixutil$(PPUEXT) : $(UNIXINC)/unixutil.pp $(INC)/textrec.inc $(INC)/filerec.inc $(SYSTEMUNIT)$(PPUEXT)
@@ -297,7 +310,7 @@ unixtype$(PPUEXT) : $(UNIXINC)/unixtype.pp ptypes.inc $(UNIXINC)/ctypes.inc $(SY
 
 baseunix$(PPUEXT) : unixtype$(PPUEXT) errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \
   $(UNIXINC)/bunxh.inc \
-  bunxsysc.inc $(ARCH)/syscallh.inc $(ARCH)/sysnr.inc \
+  bunxsysc.inc $(ARCH)/syscallh.inc $(SYSNRINC)  \
   ostypes.inc osmacro.inc $(UNIXINC)/gensigset.inc \
   $(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(UNIXINC)/baseunix.pp

rtl/linux/sparc/sysnr.inc → rtl/linux/sparcgen/sysnr.inc

@@ -335,4 +335,49 @@ Const
       syscall_nr_timerfd           = 312;
       syscall_nr_eventfd           = 313;
       syscall_nr_fallocate         = 314;
-
+      syscall_nr_timerfd_settime   = 315;
+      syscall_nr_timerfd_gettime   = 316;
+      syscall_nr_signalfd4         = 317;
+      syscall_nr_eventfd2          = 318;
+      syscall_nr_epoll_create1     = 319;
+      syscall_nr_dup3              = 320;
+      syscall_nr_pipe2             = 321;
+      syscall_nr_inotify_init1     = 322;
+      syscall_nr_accept4           = 323;
+      syscall_nr_preadv            = 324;
+      syscall_nr_pwritev           = 325;
+      syscall_nr_rt_tgsigqueueinfo = 326;
+      syscall_nr_perf_event_open   = 327;
+      syscall_nr_recvmmsg          = 328;
+      syscall_nr_fanotify_init     = 329;
+      syscall_nr_fanotify_mark     = 330;
+      syscall_nr_prlimit64         = 331;
+      syscall_nr_name_to_handle_at = 332;
+      syscall_nr_open_by_handle_at = 333;
+      syscall_nr_clock_adjtime     = 334;
+      syscall_nr_syncfs            = 335;
+      syscall_nr_sendmmsg          = 336;
+      syscall_nr_setns             = 337;
+      syscall_nr_process_vm_readv  = 338;
+      syscall_nr_process_vm_writev = 339;
+      syscall_nr_kern_features     = 340;
+      syscall_nr_kcmp              = 341;
+      syscall_nr_finit_module      = 342;
+      syscall_nr_sched_setattr     = 343;
+      syscall_nr_sched_getattr     = 344;
+      syscall_nr_renameat2         = 345;
+      syscall_nr_seccomp           = 346;
+      syscall_nr_getrandom         = 347;
+      syscall_nr_memfd_create      = 348;
+      syscall_nr_bpf               = 349;
+      syscall_nr_execveat          = 350;
+      syscall_nr_membarrier        = 351;
+      syscall_nr_userfaultfd       = 352;
+      syscall_nr_bind              = 353;
+      syscall_nr_listen            = 354;
+      syscall_nr_setsockopt        = 355;
+      syscall_nr_mlock2            = 356;
+      syscall_nr_copy_file_range   = 357;
+      syscall_nr_preadv2           = 358;
+      syscall_nr_pwritev2          = 359;
+      syscall_nr_statx             = 360;