Commit 180b3d50 by Bruce Korb Committed by Bruce Korb

ISCTRL fix and dgux patch

From-SVN: r27577
parent 2c8ec431
Thu Jun 17 15:07 1999 Bruce Korb <ddsinc09@ix.netcom.com>
* fixincludes: ISCNTL patch
* fixinc/inclhack.def (ioctl_fix_ctrl): Fix the definition of [_]*ISCTRL().
(dgux_int_varargs): new for DG/UX
* fixinc/{fixincl.x,inclhack.sh}: Regenerated.
Thu Jun 17 21:34:24 1999 J"orn Rennecke <amylaar@cygnus.co.uk> Thu Jun 17 21:34:24 1999 J"orn Rennecke <amylaar@cygnus.co.uk>
* loop.c (strength_reduce): When doing biv->giv conversion, update * loop.c (strength_reduce): When doing biv->giv conversion, update
......
...@@ -262,54 +262,79 @@ fix = { ...@@ -262,54 +262,79 @@ fix = {
}; };
#ifdef no_more
/* /*
* And also with the HP-UX 10 and HP-UX 11 sys/pci.h file * Completely replace &lt;_int_varargs.h&gt; with a file that includes gcc's
* stdarg.h or varargs.h files as appropriate on DG/UX
*/ */
fix = { fix = {
hackname = cxx_cmnt_hpux; hackname = dgux_int_varargs;
files = sys/pci.h; files = _int_varargs.h;
select = "System Private Structures"; shell = "cat > /dev/null\ncat << '_EOF_'
sed = "s|//.*$||g"; \#ifndef __INT_VARARGS_H
}; \#define __INT_VARARGS_H
/************************************************************************/
/* _INT_VARARGS.H - Define the common stuff for varargs/stdarg/stdio. */
/************************************************************************/
/* /*
* Turning // comments into normal comments trashes this IRIX 4.0.1 ** This file is a DG internal header. Never include this
* header file, which embeds // comments inside multi-line ** file directly.
* comments. If this looks like the IRIX header file, we refix it by */
* just throwing away the // comments.
*/
fix = {
hackname = cxx_cmnt_irix;
files = fam.h;
select = indigo.esd;
sed = "s|//.*$||g";
};
\#ifndef ___int_features_h
\#include &lt;sys/_int_features.h&gt;
\#endif
/* \#if !(defined(_VA_LIST) || defined(_VA_LIST_))
* Same problem with a file from SunOS 4.1.3 : a header file containing \#define _VA_LIST
* the string "//" embedded in "/ * * /" \#define _VA_LIST_
*/
fix = {
hackname = cxx_cmnt_sunos;
files = sbusdev/audiovar.h;
files = sys/audiovar.h;
sed = "s|//.*$||g";
};
\#ifdef __LINT__
/* \#ifdef __STDC__
* There is a similar problem with the VxWorks drv/netif/if_med.h file. typedef void * va_list;
*/ \#else
fix = { typedef char * va_list;
hackname = cxx_cmnt_vxworks; \#endif
files = drv/netif/if_med.h;
select = "Wind River"; \#else
sed = "s|//.*$||g"; \#if _M88K_ANY
\#if defined(__DCC__)
typedef struct {
int next_arg;
int *mem_ptr;
int *reg_ptr;
} va_list;
\#else /* ! defined(__DCC__) */
typedef struct {
int __va_arg; /* argument number */
int *__va_stk; /* start of args passed on stack */
int *__va_reg; /* start of args passed in regs */
} va_list;
\#endif /* ! defined(__DCC__) */
\#elif _IX86_ANY
\#if defined(__GNUC__) || defined(__STDC__)
typedef void * va_list;
\#else
typedef char * va_list;
\#endif
\#endif /* _IX86_ANY */
\#endif /* __LINT__ */
\#endif /* !(defined(_VA_LIST) || defined(_VA_LIST_)) */
\#endif /* #ifndef __INT_VARARGS_H */
_EOF_";
}; };
#endif
/* /*
* Remove the double-slash comments * Remove the double-slash comments
...@@ -334,7 +359,7 @@ fix = { ...@@ -334,7 +359,7 @@ fix = {
* Now that we delete the // comments instead of converting them to / * * /, * Now that we delete the // comments instead of converting them to / * * /,
* traditional hacks like irix_bogus_cxx_cmnt, no longer work (which * traditional hacks like irix_bogus_cxx_cmnt, no longer work (which
* strangely enough was also used on alpha-dec-osf4.0d). If we skip the * strangely enough was also used on alpha-dec-osf4.0d). If we skip the
* hack whenever we see ``"//"'', then the need for the secondary hack * hack whenever we see ``"//"' ', then the need for the secondary hack
* disappears. Note: it is painful to ensure that the first quote * disappears. Note: it is painful to ensure that the first quote
* exists, so we just check for the trailing quote directly abutting * exists, so we just check for the trailing quote directly abutting
* the //. Note: We should never touch a line that has // completely * the //. Note: We should never touch a line that has // completely
...@@ -600,7 +625,7 @@ fix = { ...@@ -600,7 +625,7 @@ fix = {
* ANSI macro substitution rules prohibit looking inside quoted strings * ANSI macro substitution rules prohibit looking inside quoted strings
* for the substitution names. A side effect is that the quotes are * for the substitution names. A side effect is that the quotes are
* inserted in the definitions of those macros as well. So, the last * inserted in the definitions of those macros as well. So, the last
* three sed expressions are supposed to clean up the definitions, as * several sed expressions are supposed to clean up the definitions, as
* long as those definitions are using "c", "g" or "x" as the macro * long as those definitions are using "c", "g" or "x" as the macro
* argument :). Yuck. * argument :). Yuck.
*/ */
...@@ -622,6 +647,9 @@ fix = { ...@@ -622,6 +647,9 @@ fix = {
sed = "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/" sed = "/#[ \t]*define[ \t]*[ \t]BSD43_CTRL/"
"s/'\\([cgx]\\)'/\\1/g"; "s/'\\([cgx]\\)'/\\1/g";
sed = "/#[ \t]*define[ \t]*[ \t][_]*ISCTRL/"
"s/'\\([cgx]\\)'/\\1/g";
}; };
...@@ -2450,5 +2478,4 @@ fix = { ...@@ -2450,5 +2478,4 @@ fix = {
"cat > /dev/null"; "cat > /dev/null";
}; };
/*EOF*/ /*EOF*/
...@@ -338,6 +338,7 @@ while [ $# != 0 ]; do ...@@ -338,6 +338,7 @@ while [ $# != 0 ]; do
/#[ ]*define[ ]*[ ]CTRL/ s/'\''\([cgx]\)'\''/\1/g /#[ ]*define[ ]*[ ]CTRL/ s/'\''\([cgx]\)'\''/\1/g
/#[ ]*define[ ]*[ ]_CTRL/ s/'\''\([cgx]\)'\''/\1/g /#[ ]*define[ ]*[ ]_CTRL/ s/'\''\([cgx]\)'\''/\1/g
/#[ ]*define.BSD43_CTRL/ s/'\''\([cgx]\)'\''/\1/g /#[ ]*define.BSD43_CTRL/ s/'\''\([cgx]\)'\''/\1/g
/#[ ]*define[ ]*[ ][_]*ISCTRL/ s/'\''\([cgx]\)'\''/\1/g
/#[ ]*[el]*if/{ /#[ ]*[el]*if/{
s/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g s/[a-zA-Z0-9_][a-zA-Z0-9_]*/ & /g
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment