Compilation fixes for changes about machine/console.h in 5-current.

Merge patch-bd to patch-aa.

2 files changed, 55 insertions, 42 deletions

diff --git a/japanese/kon2-16dot/files/patch-aa b/japanese/kon2-16dot/files/patch-aa
index db9410127742..4ac5f7f2daa4 100644
--- a/japanese/kon2-16dot/files/patch-aa
+++ b/japanese/kon2-16dot/files/patch-aa
@@ -1,6 +1,56 @@
---- src/vc.c.orig	Sat Jan 25 00:06:23 1997
-+++ src/vc.c	Fri Apr 11 08:26:07 1997
-@@ -266,12 +266,23 @@
+--- src/vc.c.orig	Wed Jan 24 00:16:06 2001
++++ src/vc.c	Wed Jan 24 00:16:55 2001
+@@ -40,7 +40,13 @@
+ #include	<termio.h>
+ #elif defined(__FreeBSD__)
+ #include	<termios.h>
+-#include	<machine/console.h>
++#include        <osreldate.h>
++#if __FreeBSD_version >= 410000
++#  include      <sys/consio.h>
++#  include      <sys/kbio.h>
++#else
++#  include      <machine/console.h>
++#endif
+ #endif
+ #include	<sys/ioctl.h>
+ #ifdef linux
+@@ -95,28 +101,26 @@
+ inline	void	blatch(void *head, int n)
+ {
+ 
+-    __asm__("\t clc\n"
++    __asm__ volatile("\t clc\n"
+ 	    "1:\n"
+ 	    "\t andb %%bl, (%%eax)\n"
+ 	    "\t incl %%eax\n"
+ 	    "\t loop 1b\n"
+-	    :
+-	    : "eax" ((long)head), "bl" (0x7F), "c" (n)
+-	    : "bl", "cx" );
++	    : "=bl" (head), "=c" (n)
++	    : "eax" ((long)head), "0" (0x7F), "1" (n));
+ }
+ 
+ static
+ inline	void	llatch(void *head, int n)
+ {
+ 
+-    __asm__("\t clc\n"
++    __asm__ volatile("\t clc\n"
+ 	    "1:\n"
+ 	    "\t andl %%ebx, (%%eax)\n"
+ 	    "\t addl $4, %%eax\n"
+ 	    "\t loop 1b\n"
+-	    :
+-	    : "eax" ((long)head), "ebx" (0x7F7F7F7F), "c" (n>>2)
+-	    : "ebx", "cx" );
++	    : "=ebx" (head), "=c" (n)
++	    : "eax" ((long)head), "0" (0x7F7F7F7F), "1" (n>>2));
+ }
+ 
+ static inline u_int	TextAddress(u_int x, u_int y)
+@@ -266,12 +270,23 @@
  {
      struct vt_mode vtm;
  
@@ -24,7 +74,7 @@
      ioctl(0, VT_SETMODE, &vtm);
  #if defined(__FreeBSD__)
      ioctl(0, VT_RELDISP, 1);
-@@ -297,6 +308,9 @@
+@@ -297,6 +312,9 @@
      vtm.waitv = 0;
      vtm.relsig = SIGUSR1;
      vtm.acqsig = SIGUSR2;
@@ -34,7 +84,7 @@
      ioctl(0, VT_SETMODE, &vtm);
      vInfo.graph_mode();
      if (useHardScroll)
-@@ -830,21 +830,31 @@
+@@ -816,21 +834,31 @@
  
  static int	ConfigBeep(const char *confstr)
  {
diff --git a/japanese/kon2-16dot/files/patch-bd b/japanese/kon2-16dot/files/patch-bd
deleted file mode 100644
index fe963c1be494..000000000000
--- a/japanese/kon2-16dot/files/patch-bd
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/vc.c.orig	Fri Jun  9 04:14:43 2000
-+++ src/vc.c	Fri Jun  9 04:27:53 2000
-@@ -95,28 +95,26 @@
- inline	void	blatch(void *head, int n)
- {
- 
--    __asm__("\t clc\n"
-+    __asm__ volatile("\t clc\n"
- 	    "1:\n"
- 	    "\t andb %%bl, (%%eax)\n"
- 	    "\t incl %%eax\n"
- 	    "\t loop 1b\n"
--	    :
--	    : "eax" ((long)head), "bl" (0x7F), "c" (n)
--	    : "bl", "cx" );
-+	    : "=bl" (head), "=c" (n)
-+	    : "eax" ((long)head), "0" (0x7F), "1" (n));
- }
- 
- static
- inline	void	llatch(void *head, int n)
- {
- 
--    __asm__("\t clc\n"
-+    __asm__ volatile("\t clc\n"
- 	    "1:\n"
- 	    "\t andl %%ebx, (%%eax)\n"
- 	    "\t addl $4, %%eax\n"
- 	    "\t loop 1b\n"
--	    :
--	    : "eax" ((long)head), "ebx" (0x7F7F7F7F), "c" (n>>2)
--	    : "ebx", "cx" );
-+	    : "=ebx" (head), "=c" (n)
-+	    : "eax" ((long)head), "0" (0x7F7F7F7F), "1" (n>>2));
- }
- 
- static inline u_int	TextAddress(u_int x, u_int y)