View | Details | Raw Unified | Return to bug 233018 | Differences between
and this patch

Collapse All | Expand All

(-)files/patch-kernel_OS_FreeBSD_wrapper_bsddefs.h (+13 lines)
Line 0 Link Here
1 
--- kernel/OS/FreeBSD/wrapper/bsddefs.h.orig	2019-01-06 18:38:02 UTC
2 
+++ kernel/OS/FreeBSD/wrapper/bsddefs.h
3 
@@ -91,7 +91,10 @@ typedef int ddi_iblock_cookie_t;
4 
 extern void oss_udelay (unsigned long t);
5
6 
 #ifdef _KERNEL
7 
+#ifdef memset
8 
+#undef memset
9 
 #define memset oss_memset
10 
+#endif
11 
 extern void *oss_memset (void *t, int val, int l);
12 
 #endif
13
(-)files/patch-setup_FreeBSD_build.sh (-2 / +2 lines)
Lines 9-15 Link Here
9 
    TXT2MAN=./txt2man
 9 
    TXT2MAN=./txt2man
10 
 fi
 10 
 fi
11
11
12 
@@ -38,7 +38,7 @@ echo "OSSLIBDIR=$OSSLIBDIR" > prototype/
 12 
@@ -38,7 +38,7 @@ echo "OSSLIBDIR=$OSSLIBDIR" > prototype/etc/oss.conf
13
13
14 
 # Regenerating the config file templates
 14 
 # Regenerating the config file templates
15 
 rm -f /tmp/confgen
 15 
 rm -f /tmp/confgen
Lines 18-24 Link Here
18 
 then
 18 
 then
19 
         echo Building confgen failed
 19 
         echo Building confgen failed
20 
         exit 1
 20 
         exit 1
21 
@@ -146,7 +146,7 @@ cp .version prototype/$OSSLIBDIR/version
 21 
@@ -146,7 +146,7 @@ cp .version prototype/$OSSLIBDIR/version.dat
22 
 # Licensing stuff
 22 
 # Licensing stuff
23 
 if test -f $SRCDIR/4front-private/osslic.c
 23 
 if test -f $SRCDIR/4front-private/osslic.c
24 
 then
 24 
 then
(-)files/patch-setup_FreeBSD_oss_build_install.sh (-3 / +4 lines)
Lines 13-22 Link Here
13
13
14 
 rm -f osscore_mainline.o
 14 
 rm -f osscore_mainline.o
15 
 ln -s osscore.lib osscore_mainline.o
 15 
 ln -s osscore.lib osscore_mainline.o
16 
@@ -59,17 +54,4 @@ do
 16 
@@ -58,18 +53,5 @@ do
17 
 	make clean > /dev/null 2>&1
17 
 	rm -f Makefile
 18 
 	rm -f Makefile
18 
 done
 19 
 done
19
20 
-
20 
-if ! test -f $OSSLIBDIR/etc/installed_drivers
 21 
-if ! test -f $OSSLIBDIR/etc/installed_drivers
21 
-then
 22 
-then
22 
-   echo "-----------------------------"
 23 
-   echo "-----------------------------"
Lines 29-33 Link Here
29 
-then
 30 
-then
30 
-  echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs
 31 
-  echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs
31 
-fi
 32 
-fi
32 
-
 33
33 
 exit 0
 34 
 exit 0
(-)files/patch-setup_srcconf__freebsd.inc (-1 / +1 lines)
Lines 5-10 Link Here
5 
 # if defined(__x86_64__)
 5 
 # if defined(__x86_64__)
6 
   fprintf (f,
 6 
   fprintf (f,
7 
-	     "CFLAGS += -O3 -fno-common  -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding\n");
 7 
-	     "CFLAGS += -O3 -fno-common  -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding\n");
8 
+	     "CFLAGS += -O3 -fno-common  -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding -mno-sse\n");
 8 
+	     "CFLAGS += -O3 -fno-common  -DKLD_MODULE -mcmodel=kernel -mno-red-zone  -fno-asynchronous-unwind-tables -ffreestanding -mno-sse\n");
9 
 # endif
 9 
 # endif
10 
 }
 10 
 }

Return to bug 233018