Changeset b55081a in rtems-libbsd

Timestamp:

03/08/12 21:54:05 (11 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

0d436c7

Parents:

287453d

Message:

kern/kern_subr.c added for hashinit

More undefined symbols resulted.

Files:

• Changes (modified) (1 diff)
• Makefile (modified) (1 diff)
• freebsd-to-rtems.py (modified) (6 diffs)
• freebsd/kern/kern_subr.c (added)
• freebsd/sys/mutex.h (modified) (2 diffs)

Changes

@@ -14 +14 @@
   - Support config.inc
   - Fix for loop line too long on install stanza
+
++ kern_subr.c
+  - had to add #include <sys/uio.h>
+
++ RTEMS does not have 
+  - any thread td_ structure elements
+  - sys/mutex.h - stubbed thread_lock and friends
+
++ Include Files to ifdef include out
+    #include <sys/vnode.h>
+    #include <vm/vm.h>
+    #include <vm/vm_extern.h>
+    #include <vm/vm_kern.h>
+    #include <vm/vm_page.h>
+

Makefile

@@ -272 +272 @@
         freebsd/kern/kern_mbuf.c \
         freebsd/kern/kern_module.c \
+        freebsd/kern/kern_subr.c \
         freebsd/kern/kern_sysctl.c \
         freebsd/kern/subr_bus.c \

freebsd-to-rtems.py

@@ -153 +153 @@
 # generate an empty file as a place holder
 def installEmptyFile(src):
+        global tempFile
         dst = RTEMS_DIR + '/' + PREFIX + '/' + src.replace('rtems/', '')
-        if isVerbose == True:
-                print "Install empty - " + dst
         if isDryRun == True:
+                if isVerbose == True:
+                        print "Install empty - " + dst
                 return
         try:
@@ -162 +163 @@
         except OSError:
                 pass
-        out = open(dst, 'w')
+        out = open(tempFile, 'w')
         out.write('/* EMPTY */\n')
         out.close()
+        if copyIfDifferent(tempFile, dst) == True:
+                if isVerbose == True:
+                        print "Install empty - " + dst
 
 # fix include paths inside a C or .h file
@@ -982 +986 @@
                 'kern/kern_mbuf.c',
                 'kern/kern_module.c',
+                'kern/kern_subr.c',
                 'kern/kern_sysctl.c',
                 'kern/subr_bus.c',
@@ -1658 +1663 @@
                 'machine/sf_buf.h',
                 #'machine/vmparam.h',
-                'net/vnet.h',
                 'security/audit/audit.h',
-                'security/mac/mac_framework.h',
                 'sys/bio.h',
                 'sys/copyright.h',
                 'sys/cpuset.h',
-                'sys/errno.h',
                 'sys/exec.h',
                 'sys/fail.h',
@@ -1671 +1673 @@
                 'sys/_pthreadtypes.h',
                 #'sys/resourcevar.h',
-                'sys/sbuf.h',
                 'sys/sched.h',
                 'sys/select.h',
@@ -1679 +1680 @@
                 'sys/sysproto.h',
                 'sys/stat.h',
-                'sys/taskqueue.h',
                 #'sys/time.h',
                 'time.h',

freebsd/sys/mutex.h

@@ -132 +132 @@
 void    _thread_lock_flags(struct thread *, int, const char *, int);
 
+#ifndef __rtems__
 #define thread_lock(tdp)                                                \
     _thread_lock_flags((tdp), 0, __FILE__, __LINE__)
@@ -138 +139 @@
 #define thread_unlock(tdp)                                              \
        mtx_unlock_spin((tdp)->td_lock)
+#else
+#define thread_lock(tdp)
+#define thread_lock_flags(tdp, opt)
+#define thread_unlock(tdp)
+#endif
 
 #define mtx_recurse     lock_object.lo_data