Changeset 2f18089 in rtems-libbsd

Timestamp:

05/17/12 13:37:48 (11 years ago)

Author:

Jennifer Averett <jennifer.averett@…>

Branches:

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

Children:

4bc83af

Parents:

60554e6

Message:

Resolved issues with pc386 build.

Files:

• contrib/altq/freebsd/altq/altq_subr.c (modified) (5 diffs)
• freebsd-to-rtems.py (modified) (1 diff)
• freebsd/dev/pci/pci.c (modified) (1 diff)
• freebsd/i386/include/freebsd/machine/md_var.h (added)
• freebsd/i386/include/freebsd/machine/specialreg.h (added)
• freebsd/opencrypto/crypto.c (modified) (1 diff)

contrib/altq/freebsd/altq/altq_subr.c

@@ -913 +913 @@
 #endif /* __alpha__ */
 
+#ifndef __rtems__
 #if (__FreeBSD_version >= 700035)
 /* Update TSC freq with the value indicated by the caller. */
@@ -934 +935 @@
     EVENTHANDLER_PRI_LAST);
 #endif /* __FreeBSD_version >= 700035 */
+#endif /* __rtems__ */
 
 static void
@@ -954 +956 @@
 #endif
 #ifdef __i386__
+#ifndef __rtems__
         /* check if TSC is available */
         if (machclk_usepcc == 1 && ((cpu_feature & CPUID_TSC) == 0 ||
             tsc_is_broken))
+#else   /* __rtems__ */
+        /* check if TSC is available */
+        if (machclk_usepcc == 1 && ((cpu_feature & CPUID_TSC) == 0 ||
+            !(x86_has_tsc()) ))
+#endif /* __rtems__ */
                 machclk_usepcc = 0;
 #endif
@@ -986 +994 @@
          * accessible, just use it.
          */
+#ifndef __rtems__
 #ifdef __i386__
 #ifdef __FreeBSD__
@@ -1005 +1014 @@
 #endif
 #endif /* __alpha__ */
+#endif /* __rtems__ */
 
         /*

freebsd-to-rtems.py

@@ -1198 +1198 @@
         ]
 )
+
+devNic.addCPUDependentHeaderFiles(
+        [
+                'i386/include/specialreg.h',
+                'i386/include/md_var.h',
+        ]
+)
+
 devNic.addSourceFiles(
         [

freebsd/dev/pci/pci.c

@@ -58 +58 @@
 #include <freebsd/machine/stdarg.h>
 
+#ifndef __rtems__
 #if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
 #include <freebsd/machine/intr_machdep.h>
 #endif
+#endif /* __rtems__ */
 
 #include <freebsd/sys/pciio.h>

freebsd/opencrypto/crypto.c

@@ -1248 +1248 @@
         int result, hint;
 
+#ifndef __rtems__
 #if defined(__i386__) || defined(__amd64__)
         fpu_kern_thread(FPU_KERN_NORMAL);
 #endif
+#endif /* __rtems__ */
 
         CRYPTO_Q_LOCK();