cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now that the system headers provide a proper definition of NULL we

Browse Source 
can remove all these NULL patches.

from Brad
ok espie@
This commit is contained in:
ajacoutot 2012-02-22 07:48:10 +00:00
parent 7279ef880c
commit 546de5306a
92 changed files with 6 additions and 3614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

245
lang/gcc/4.0/patches/patch-gcc_c-aux-info_c
View File

@ -1,245 +0,0 @@
$OpenBSD: patch-gcc_c-aux-info_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
--- gcc/c-aux-info.c.orig Tue Sep 14 08:45:13 2004
+++ gcc/c-aux-info.c Tue Sep 14 08:47:34 2004
@@ -91,14 +91,14 @@ affix_data_type (const char *param)
add a blank after the data-type of course. */
if (p == type_or_decl)
- return concat (data_type, " ", type_or_decl, NULL);
+ return concat (data_type, " ", type_or_decl, (void *)0);
saved = *p;
*p = '\0';
- qualifiers_then_data_type = concat (type_or_decl, data_type, NULL);
+ qualifiers_then_data_type = concat (type_or_decl, data_type, (void *)0);
*p = saved;
return reconcat (qualifiers_then_data_type,
- qualifiers_then_data_type, " ", p, NULL);
+ qualifiers_then_data_type, " ", p, (void *)0);
}
/* Given a tree node which represents some "function type", generate the
@@ -123,13 +123,13 @@ gen_formal_list_for_type (tree fntype, f
const char *this_type;
if (*formal_list)
- formal_list = concat (formal_list, ", ", NULL);
+ formal_list = concat (formal_list, ", ", (void *)0);
this_type = gen_type ("", TREE_VALUE (formal_type), ansi);
formal_list
= ((strlen (this_type))
- ? concat (formal_list, affix_data_type (this_type), NULL)
- : concat (formal_list, data_type, NULL));
+ ? concat (formal_list, affix_data_type (this_type), (void *)0)
+ : concat (formal_list, data_type, (void *)0));
formal_type = TREE_CHAIN (formal_type);
}
@@ -178,10 +178,10 @@ gen_formal_list_for_type (tree fntype, f
petered out to a NULL (i.e. without being terminated by a
void_type_node) then we need to tack on an ellipsis. */
if (!formal_type)
- formal_list = concat (formal_list, ", ...", NULL);
+ formal_list = concat (formal_list, ", ...", (void *)0);
}
- return concat (" (", formal_list, ")", NULL);
+ return concat (" (", formal_list, ")", (void *)0);
}
/* For the generation of an ANSI prototype for a function definition, we have
@@ -237,23 +237,23 @@ gen_formal_list_for_func_def (tree fndec
const char *this_formal;
if (*formal_list && ((style == ansi) || (style == k_and_r_names)))
- formal_list = concat (formal_list, ", ", NULL);
+ formal_list = concat (formal_list, ", ", (void *)0);
this_formal = gen_decl (formal_decl, 0, style);
if (style == k_and_r_decls)
- formal_list = concat (formal_list, this_formal, "; ", NULL);
+ formal_list = concat (formal_list, this_formal, "; ", (void *)0);
else
- formal_list = concat (formal_list, this_formal, NULL);
+ formal_list = concat (formal_list, this_formal, (void *)0);
formal_decl = TREE_CHAIN (formal_decl);
}
if (style == ansi)
{
if (!DECL_ARGUMENTS (fndecl))
- formal_list = concat (formal_list, "void", NULL);
+ formal_list = concat (formal_list, "void", (void *)0);
if (deserves_ellipsis (TREE_TYPE (fndecl)))
- formal_list = concat (formal_list, ", ...", NULL);
+ formal_list = concat (formal_list, ", ...", (void *)0);
}
if ((style == ansi) || (style == k_and_r_names))
- formal_list = concat (" (", formal_list, ")", NULL);
+ formal_list = concat (" (", formal_list, ")", (void *)0);
return formal_list;
}
@@ -312,14 +312,14 @@ gen_type (const char *ret_val, tree t, f
{
case POINTER_TYPE:
if (TYPE_READONLY (t))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
if (TYPE_VOLATILE (t))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
- ret_val = concat ("*", ret_val, NULL);
+ ret_val = concat ("*", ret_val, (void *)0);
if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE || TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
- ret_val = concat ("(", ret_val, ")", NULL);
+ ret_val = concat ("(", ret_val, ")", (void *)0);
ret_val = gen_type (ret_val, TREE_TYPE (t), style);
@@ -327,17 +327,17 @@ gen_type (const char *ret_val, tree t, f
case ARRAY_TYPE:
if (!COMPLETE_TYPE_P (t) || TREE_CODE (TYPE_SIZE (t)) != INTEGER_CST)
- ret_val = gen_type (concat (ret_val, "[]", NULL),
+ ret_val = gen_type (concat (ret_val, "[]", (void *)0),
TREE_TYPE (t), style);
else if (int_size_in_bytes (t) == 0)
- ret_val = gen_type (concat (ret_val, "[0]", NULL),
+ ret_val = gen_type (concat (ret_val, "[0]", (void *)0),
TREE_TYPE (t), style);
else
{
int size = (int_size_in_bytes (t) / int_size_in_bytes (TREE_TYPE (t)));
char buff[10];
sprintf (buff, "[%d]", size);
- ret_val = gen_type (concat (ret_val, buff, NULL),
+ ret_val = gen_type (concat (ret_val, buff, (void *)0),
TREE_TYPE (t), style);
}
break;
@@ -345,7 +345,7 @@ gen_type (const char *ret_val, tree t, f
case FUNCTION_TYPE:
ret_val = gen_type (concat (ret_val,
gen_formal_list_for_type (t, style),
- NULL),
+ (void *)0),
TREE_TYPE (t), style);
break;
@@ -374,13 +374,13 @@ gen_type (const char *ret_val, tree t, f
while (chain_p)
{
data_type = concat (data_type, gen_decl (chain_p, 0, ansi),
- NULL);
+ (void *)0);
chain_p = TREE_CHAIN (chain_p);
- data_type = concat (data_type, "; ", NULL);
+ data_type = concat (data_type, "; ", (void *)0);
}
- data_type = concat ("{ ", data_type, "}", NULL);
+ data_type = concat ("{ ", data_type, "}", (void *)0);
}
- data_type = concat ("struct ", data_type, NULL);
+ data_type = concat ("struct ", data_type, (void *)0);
break;
case UNION_TYPE:
@@ -393,13 +393,13 @@ gen_type (const char *ret_val, tree t, f
while (chain_p)
{
data_type = concat (data_type, gen_decl (chain_p, 0, ansi),
- NULL);
+ (void *)0);
chain_p = TREE_CHAIN (chain_p);
- data_type = concat (data_type, "; ", NULL);
+ data_type = concat (data_type, "; ", (void *)0);
}
- data_type = concat ("{ ", data_type, "}", NULL);
+ data_type = concat ("{ ", data_type, "}", (void *)0);
}
- data_type = concat ("union ", data_type, NULL);
+ data_type = concat ("union ", data_type, (void *)0);
break;
case ENUMERAL_TYPE:
@@ -412,14 +412,14 @@ gen_type (const char *ret_val, tree t, f
while (chain_p)
{
data_type = concat (data_type,
- IDENTIFIER_POINTER (TREE_PURPOSE (chain_p)), NULL);
+ IDENTIFIER_POINTER (TREE_PURPOSE (chain_p)), (void *)0);
chain_p = TREE_CHAIN (chain_p);
if (chain_p)
- data_type = concat (data_type, ", ", NULL);
+ data_type = concat (data_type, ", ", (void *)0);
}
- data_type = concat ("{ ", data_type, " }", NULL);
+ data_type = concat ("{ ", data_type, " }", (void *)0);
}
- data_type = concat ("enum ", data_type, NULL);
+ data_type = concat ("enum ", data_type, (void *)0);
break;
case TYPE_DECL:
@@ -431,7 +431,7 @@ gen_type (const char *ret_val, tree t, f
/* Normally, `unsigned' is part of the deal. Not so if it comes
with a type qualifier. */
if (TYPE_UNSIGNED (t) && TYPE_QUALS (t))
- data_type = concat ("unsigned ", data_type, NULL);
+ data_type = concat ("unsigned ", data_type, (void *)0);
break;
case REAL_TYPE:
@@ -451,11 +451,11 @@ gen_type (const char *ret_val, tree t, f
}
}
if (TYPE_READONLY (t))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
if (TYPE_VOLATILE (t))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
if (TYPE_RESTRICT (t))
- ret_val = concat ("restrict ", ret_val, NULL);
+ ret_val = concat ("restrict ", ret_val, (void *)0);
return ret_val;
}
@@ -494,9 +494,9 @@ gen_decl (tree decl, int is_func_definit
generate the qualifiers here. */
if (TREE_THIS_VOLATILE (decl))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
if (TREE_READONLY (decl))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
data_type = "";
@@ -515,7 +515,7 @@ gen_decl (tree decl, int is_func_definit
if (TREE_CODE (decl) == FUNCTION_DECL && is_func_definition)
{
ret_val = concat (ret_val, gen_formal_list_for_func_def (decl, ansi),
- NULL);
+ (void *)0);
/* Since we have already added in the formals list stuff, here we don't
add the whole "type" of the function we are considering (which
@@ -532,11 +532,11 @@ gen_decl (tree decl, int is_func_definit
ret_val = affix_data_type (ret_val);
if (TREE_CODE (decl) != FUNCTION_DECL && C_DECL_REGISTER (decl))
- ret_val = concat ("register ", ret_val, NULL);
+ ret_val = concat ("register ", ret_val, (void *)0);
if (TREE_PUBLIC (decl))
- ret_val = concat ("extern ", ret_val, NULL);
+ ret_val = concat ("extern ", ret_val, (void *)0);
if (TREE_CODE (decl) == FUNCTION_DECL && !TREE_PUBLIC (decl))
- ret_val = concat ("static ", ret_val, NULL);
+ ret_val = concat ("static ", ret_val, (void *)0);
return ret_val;
}

21
lang/gcc/4.0/patches/patch-gcc_c-incpath_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-gcc_c-incpath_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
--- gcc/c-incpath.c.orig Tue Sep 14 08:48:54 2004
+++ gcc/c-incpath.c Tue Sep 14 08:49:15 2004
@@ -141,7 +141,7 @@ add_standard_paths (const char *sysroot,
continue;
if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
{
- char *str = concat (iprefix, p->fname + len, NULL);
+ char *str = concat (iprefix, p->fname + len, (void *)0);
add_path (str, SYSTEM, p->cxx_aware, false);
}
}
@@ -156,7 +156,7 @@ add_standard_paths (const char *sysroot,
/* Should this directory start with the sysroot? */
if (sysroot && p->add_sysroot)
- str = concat (sysroot, p->fname, NULL);
+ str = concat (sysroot, p->fname, (void *)0);
else
str = update_path (p->fname, p->component);

85
lang/gcc/4.0/patches/patch-gcc_collect2_c
View File

@ -1,85 +0,0 @@
$OpenBSD: patch-gcc_collect2_c,v 1.5 2005/06/14 19:33:11 espie Exp $
--- gcc/collect2.c.orig Mon Jun 6 21:20:26 2005
+++ gcc/collect2.c Tue Jun 14 12:40:27 2005
@@ -779,19 +779,19 @@ main (int argc, char **argv)
qualify the program name with the target machine. */
const char *const full_ld_suffix =
- concat(target_machine, "-", ld_suffix, NULL);
+ concat(target_machine, "-", ld_suffix, (char *)0);
const char *const full_nm_suffix =
- concat (target_machine, "-", nm_suffix, NULL);
+ concat (target_machine, "-", nm_suffix, (char *)0);
const char *const full_gnm_suffix =
- concat (target_machine, "-", gnm_suffix, NULL);
+ concat (target_machine, "-", gnm_suffix, (char *)0);
#ifdef LDD_SUFFIX
const char *const full_ldd_suffix =
- concat (target_machine, "-", ldd_suffix, NULL);
+ concat (target_machine, "-", ldd_suffix, (char *)0);
#endif
const char *const full_strip_suffix =
- concat (target_machine, "-", strip_suffix, NULL);
+ concat (target_machine, "-", strip_suffix, (char *)0);
const char *const full_gstrip_suffix =
- concat (target_machine, "-", gstrip_suffix, NULL);
+ concat (target_machine, "-", gstrip_suffix, (char *)0);
#else
const char *const full_ld_suffix = ld_suffix;
const char *const full_nm_suffix = nm_suffix;
@@ -984,7 +984,7 @@ main (int argc, char **argv)
if (c_file_name == 0)
{
#ifdef CROSS_COMPILE
- c_file_name = concat (target_machine, "-gcc", NULL);
+ c_file_name = concat (target_machine, "-gcc", (char *)0);
#else
c_file_name = "gcc";
#endif
@@ -1261,7 +1261,7 @@ main (int argc, char **argv)
if (exports.first)
{
- char *buf = concat ("-bE:", export_file, NULL);
+ char *buf = concat ("-bE:", export_file, (char *)0);
*ld1++ = buf;
*ld2++ = buf;
@@ -1426,7 +1426,7 @@ main (int argc, char **argv)
/* Tell the linker that we have initializer and finalizer functions. */
#ifdef LD_INIT_SWITCH
#ifdef COLLECT_EXPORT_LIST
- *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, NULL);
+ *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, (char *)0);
#else
*ld2++ = LD_INIT_SWITCH;
*ld2++ = initname;
@@ -1441,7 +1441,7 @@ main (int argc, char **argv)
/* If we did not add export flag to link arguments before, add it to
second link phase now. No new exports should have been added. */
if (! exports.first)
- *ld2++ = concat ("-bE:", export_file, NULL);
+ *ld2++ = concat ("-bE:", export_file, (char *)0);
#ifndef LD_INIT_SWITCH
add_to_list (&exports, initname);
@@ -1593,7 +1593,7 @@ collect_execute (const char *prog, char
dup2 (redir_handle, STDERR_FILENO);
}
- pid = pexecute (argv[0], argv, argv[0], NULL, &errmsg_fmt, &errmsg_arg,
+ pid = pexecute (argv[0], argv, argv[0], (char *)0, &errmsg_fmt, &errmsg_arg,
(PEXECUTE_FIRST | PEXECUTE_LAST | PEXECUTE_SEARCH));
if (redir)
@@ -1848,8 +1848,8 @@ write_c_file_stat (FILE *stream, const c
notice ("\nwrite_c_file - output name is %s, prefix is %s\n",
output_file, prefix);
- initname = concat ("_GLOBAL__FI_", prefix, NULL);
- fininame = concat ("_GLOBAL__FD_", prefix, NULL);
+ initname = concat ("_GLOBAL__FI_", prefix, (char *)0);
+ fininame = concat ("_GLOBAL__FD_", prefix, (char *)0);
free (prefix);

12
lang/gcc/4.0/patches/patch-gcc_coverage_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_coverage_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
--- gcc/coverage.c.orig Tue Sep 14 08:58:02 2004
+++ gcc/coverage.c Tue Sep 14 08:58:09 2004
@@ -812,7 +812,7 @@ build_gcov_info (void)
fields = field;
filename = getpwd ();
filename = (filename && da_file_name[0] != '/'
- ? concat (filename, "/", da_file_name, NULL)
+ ? concat (filename, "/", da_file_name, (void *)0)
: da_file_name);
filename_len = strlen (filename);
filename_string = build_string (filename_len + 1, filename);

21
lang/gcc/4.0/patches/patch-gcc_cp_call_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-gcc_cp_call_c,v 1.8 2006/01/09 15:31:47 espie Exp $
--- gcc/cp/call.c.orig Thu Nov 3 02:30:53 2005
+++ gcc/cp/call.c Mon Jan 9 13:36:27 2006
@@ -5193,7 +5193,7 @@ name_as_c_string (tree name, tree type,
|| name == base_dtor_identifier
|| name == deleting_dtor_identifier)
{
- pretty_name = concat ("~", pretty_name, NULL);
+ pretty_name = concat ("~", pretty_name, (void *)0);
/* Remember that we need to free the memory allocated. */
*free_p = true;
}
@@ -5203,7 +5203,7 @@ name_as_c_string (tree name, tree type,
pretty_name = concat ("operator ",
type_as_string (TREE_TYPE (name),
TFF_PLAIN_IDENTIFIER),
- NULL);
+ (void *)0);
/* Remember that we need to free the memory allocated. */
*free_p = true;
}

12
lang/gcc/4.0/patches/patch-gcc_cp_parser_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_cp_parser_c,v 1.10 2006/01/09 15:31:47 espie Exp $
--- gcc/cp/parser.c.orig Wed Jan 4 19:50:07 2006
+++ gcc/cp/parser.c Mon Jan 9 13:36:27 2006
@@ -15797,7 +15797,7 @@ cp_parser_require (cp_parser* parser,
/* Output the MESSAGE -- unless we're parsing tentatively. */
if (!cp_parser_simulate_error (parser))
{
- char *message = concat ("expected ", token_desc, NULL);
+ char *message = concat ("expected ", token_desc, (void *)0);
cp_parser_error (parser, message);
free (message);
}

12
lang/gcc/4.0/patches/patch-gcc_dbxout_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_dbxout_c,v 1.5 2005/10/20 23:28:02 espie Exp $
--- gcc/dbxout.c.orig Sat Sep 10 23:11:30 2005
+++ gcc/dbxout.c Tue Oct 4 02:01:17 2005
@@ -1002,7 +1002,7 @@ dbxout_init (const char *input_file_name
if (cwd[0] == '\0')
cwd = "/";
else if (!IS_DIR_SEPARATOR (cwd[strlen (cwd) - 1]))
- cwd = concat (cwd, "/", NULL);
+ cwd = concat (cwd, "/", (void *)0);
}
#ifdef DBX_OUTPUT_MAIN_SOURCE_DIRECTORY
DBX_OUTPUT_MAIN_SOURCE_DIRECTORY (asm_out_file, cwd);

201
lang/gcc/4.0/patches/patch-gcc_gcc_c
View File

@ -1,201 +0,0 @@
$OpenBSD: patch-gcc_gcc_c,v 1.8 2006/01/09 15:31:47 espie Exp $
--- gcc/gcc.c.orig Fri Oct 21 15:10:17 2005
+++ gcc/gcc.c Mon Jan 9 13:36:28 2006
@@ -1293,7 +1293,7 @@ translate_options (int *argcp, const cha
/* Store the translation as one argv elt or as two. */
if (arg != 0 && strchr (arginfo, 'j') != 0)
newv[newindex++] = concat (option_map[j].equivalent, arg,
- NULL);
+ (void *)0);
else if (arg != 0)
{
newv[newindex++] = option_map[j].equivalent;
@@ -1609,7 +1609,7 @@ init_gcc_specs (struct obstack *obstack,
shared_name,
#endif
#endif
- "}}}", NULL);
+ "}}}", (void *)0);
obstack_grow (obstack, buf, strlen (buf));
free (buf);
@@ -1807,7 +1807,7 @@ set_spec (const char *name, const char *
old_spec = *(sl->ptr_spec);
*(sl->ptr_spec) = ((spec[0] == '+' && ISSPACE ((unsigned char)spec[1]))
- ? concat (old_spec, spec + 1, NULL)
+ ? concat (old_spec, spec + 1, (void *)0)
: xstrdup (spec));
#ifdef DEBUG_SPECS
@@ -2471,10 +2471,10 @@ find_a_file (struct path_prefix *pprefix
len += len1 > len2 ? len1 : len2;
if (multilib_dir)
multilib_name = ACONCAT ((multilib_dir, dir_separator_str, name,
- NULL));
+ (void *)0));
if (strcmp (multilib_os_dir, ".") != 0)
multilib_os_name = ACONCAT ((multilib_os_dir, dir_separator_str, name,
- NULL));
+ (void *)0));
}
temp = xmalloc (len);
@@ -2633,8 +2633,8 @@ add_sysrooted_prefix (struct path_prefix
if (target_system_root)
{
if (target_sysroot_suffix)
- prefix = concat (target_sysroot_suffix, prefix, NULL);
- prefix = concat (target_system_root, prefix, NULL);
+ prefix = concat (target_sysroot_suffix, prefix, (void *)0);
+ prefix = concat (target_system_root, prefix, (void *)0);
/* We have to override this because GCC's notion of sysroot
moves along with GCC. */
@@ -3205,7 +3205,7 @@ process_command (int argc, const char **
break;
new_argv0 = xmemdup (progname, baselen,
baselen + concat_length (new_version, new_machine,
- "-gcc-", NULL) + 1);
+ "-gcc-", (void *)0) + 1);
strcpy (new_argv0 + baselen, new_machine);
strcat (new_argv0, "-gcc-");
strcat (new_argv0, new_version);
@@ -3232,7 +3232,7 @@ process_command (int argc, const char **
standard_bindir_prefix,
standard_libexec_prefix);
if (gcc_exec_prefix)
- putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL));
+ putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, (void *)0));
}
else
gcc_libexec_prefix = make_relative_prefix (gcc_exec_prefix,
@@ -3279,7 +3279,7 @@ process_command (int argc, const char **
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3313,7 +3313,7 @@ process_command (int argc, const char **
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3346,7 +3346,7 @@ process_command (int argc, const char **
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3815,7 +3815,7 @@ warranty; not even for MERCHANTABILITY o
PREFIX_PRIORITY_LAST, 1, 0);
tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
- dir_separator_str, NULL);
+ dir_separator_str, (void *)0);
/* If tooldir is relative, base it on exec_prefixes. A relative
tooldir lets us move the installed tree as a unit.
@@ -3830,28 +3830,28 @@ warranty; not even for MERCHANTABILITY o
{
char *gcc_exec_tooldir_prefix
= concat (gcc_exec_prefix, spec_machine, dir_separator_str,
- spec_version, dir_separator_str, tooldir_prefix, NULL);
+ spec_version, dir_separator_str, tooldir_prefix, (void *)0);
add_prefix (&exec_prefixes,
concat (gcc_exec_tooldir_prefix, "bin",
- dir_separator_str, NULL),
+ dir_separator_str, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 0);
add_prefix (&startfile_prefixes,
concat (gcc_exec_tooldir_prefix, "lib",
- dir_separator_str, NULL),
+ dir_separator_str, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
}
tooldir_prefix = concat (standard_exec_prefix, spec_machine,
dir_separator_str, spec_version,
- dir_separator_str, tooldir_prefix, NULL);
+ dir_separator_str, tooldir_prefix, (void *)0);
}
add_prefix (&exec_prefixes,
- concat (tooldir_prefix, "bin", dir_separator_str, NULL),
+ concat (tooldir_prefix, "bin", dir_separator_str, (void *)0),
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 0);
add_prefix (&startfile_prefixes,
- concat (tooldir_prefix, "lib", dir_separator_str, NULL),
+ concat (tooldir_prefix, "lib", dir_separator_str, (void *)0),
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
#if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
@@ -3974,7 +3974,7 @@ warranty; not even for MERCHANTABILITY o
{ /* POSIX allows separation of -l and the lib arg;
canonicalize by concatenating -l with its arg */
infiles[n_infiles].language = "*";
- infiles[n_infiles++].name = concat ("-l", argv[++i], NULL);
+ infiles[n_infiles++].name = concat ("-l", argv[++i], (void *)0);
}
else if (strncmp (argv[i], "-l", 2) == 0)
{
@@ -5926,11 +5926,11 @@ is_directory (const char *path1, const c
if (linker
&& ((cp - path == 6
&& strcmp (path, concat (dir_separator_str, "lib",
- dir_separator_str, ".", NULL)) == 0)
+ dir_separator_str, ".", (void *)0)) == 0)
|| (cp - path == 10
&& strcmp (path, concat (dir_separator_str, "usr",
dir_separator_str, "lib",
- dir_separator_str, ".", NULL)) == 0)))
+ dir_separator_str, ".", (void *)0)) == 0)))
return 0;
return (stat (path, &st) >= 0 && S_ISDIR (st.st_mode));
@@ -6117,8 +6117,8 @@ main (int argc, const char **argv)
/* Read specs from a file if there is one. */
machine_suffix = concat (spec_machine, dir_separator_str,
- spec_version, dir_separator_str, NULL);
- just_machine_suffix = concat (spec_machine, dir_separator_str, NULL);
+ spec_version, dir_separator_str, (void *)0);
+ just_machine_suffix = concat (spec_machine, dir_separator_str, (void *)0);
specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, 0);
/* Read the specs file unless it is a default one. */
@@ -6223,12 +6223,12 @@ main (int argc, const char **argv)
if (gcc_exec_prefix)
add_prefix (&startfile_prefixes,
concat (gcc_exec_prefix, machine_suffix,
- standard_startfile_prefix, NULL),
+ standard_startfile_prefix, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
add_prefix (&startfile_prefixes,
concat (standard_exec_prefix,
machine_suffix,
- standard_startfile_prefix, NULL),
+ standard_startfile_prefix, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
}
@@ -6254,7 +6254,7 @@ main (int argc, const char **argv)
/* If we have a GCC_EXEC_PREFIX envvar, modify it for cpp's sake. */
if (gcc_exec_prefix)
gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
- spec_version, dir_separator_str, NULL);
+ spec_version, dir_separator_str, (void *)0);
/* Now we have the specs.
Set the `valid' bits for switches that match anything in any spec. */

39
lang/gcc/4.0/patches/patch-gcc_gensupport_c
View File

@ -1,39 +0,0 @@
$OpenBSD: patch-gcc_gensupport_c,v 1.2 2005/01/03 16:23:48 espie Exp $
--- gcc/gensupport.c.orig Thu Dec 16 18:31:58 2004
+++ gcc/gensupport.c Mon Jan 3 15:47:20 2005
@@ -219,7 +219,7 @@ process_include (rtx desc, int lineno)
{
static const char sep[2] = { DIR_SEPARATOR, '\0' };
- pathname = concat (stackp->fname, sep, filename, NULL);
+ pathname = concat (stackp->fname, sep, filename, (void *)0);
input_file = fopen (pathname, "r");
if (input_file != NULL)
goto success;
@@ -228,7 +228,7 @@ process_include (rtx desc, int lineno)
}
if (base_dir)
- pathname = concat (base_dir, filename, NULL);
+ pathname = concat (base_dir, filename, (void *)0);
else
pathname = xstrdup (filename);
input_file = fopen (pathname, "r");
@@ -317,7 +317,7 @@ process_rtx (rtx desc, int lineno)
insn condition to create the new split condition. */
split_cond = XSTR (desc, 4);
if (split_cond[0] == '&' && split_cond[1] == '&')
- split_cond = concat (XSTR (desc, 2), split_cond, NULL);
+ split_cond = concat (XSTR (desc, 2), split_cond, (void *)0);
XSTR (split, 1) = split_cond;
XVEC (split, 2) = XVEC (desc, 5);
XSTR (split, 3) = XSTR (desc, 6);
@@ -672,7 +672,7 @@ alter_test_for_insn (struct queue_elem *
if (!insn_test || *insn_test == '\0')
return ce_test;
- return concat ("(", ce_test, ") && (", insn_test, ")", NULL);
+ return concat ("(", ce_test, ") && (", insn_test, ")", (void *)0);
}
/* Adjust all of the operand numbers in SRC to match the shift they'll

12
lang/gcc/4.0/patches/patch-gcc_objc_objc-act_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_objc_objc-act_c,v 1.4 2005/02/22 21:27:50 espie Exp $
--- gcc/objc/objc-act.c.orig Sat Jan 29 13:16:34 2005
+++ gcc/objc/objc-act.c Tue Feb 22 19:38:42 2005
@@ -546,7 +546,7 @@ objc_init (void)
/* If gen_declaration desired, open the output file. */
if (flag_gen_declaration)
{
- register char * const dumpname = concat (dump_base_name, ".decl", NULL);
+ register char * const dumpname = concat (dump_base_name, ".decl", (void *)0);
gen_declaration_file = fopen (dumpname, "w");
if (gen_declaration_file == 0)
fatal_error ("can't open %s: %m", dumpname);

35
lang/gcc/4.0/patches/patch-gcc_prefix_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-gcc_prefix_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
--- gcc/prefix.c.orig Tue Sep 14 08:49:46 2004
+++ gcc/prefix.c Tue Sep 14 08:50:06 2004
@@ -99,7 +99,7 @@ get_key_value (char *key)
#endif
if (prefix == 0)
- prefix = getenv (temp = concat (key, "_ROOT", NULL));
+ prefix = getenv (temp = concat (key, "_ROOT", (void *)0));
if (prefix == 0)
prefix = std_prefix;
@@ -219,7 +219,7 @@ translate_name (char *name)
together. */
old_name = name;
- name = concat (prefix, &name[keylen + 1], NULL);
+ name = concat (prefix, &name[keylen + 1], (void *)0);
free (old_name);
}
@@ -257,11 +257,11 @@ update_path (const char *path, const cha
if (key[0] != '$')
{
- key = concat ("@", key, NULL);
+ key = concat ("@", key, (void *)0);
free_key = true;
}
- result = concat (key, &path[len], NULL);
+ result = concat (key, &path[len], (void *)0);
if (free_key)
free ((char *) key);
result = translate_name (result);

12
lang/gcc/4.0/patches/patch-gcc_tree-dump_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-dump_c,v 1.4 2005/10/20 23:28:02 espie Exp $
--- gcc/tree-dump.c.orig Tue Aug 23 09:39:43 2005
+++ gcc/tree-dump.c Tue Oct 4 02:01:18 2005
@@ -825,7 +825,7 @@ get_dump_file_name (enum tree_dump_index
dump_id[0] = '\0';
}
- return concat (dump_base_name, dump_id, dfi->suffix, NULL);
+ return concat (dump_base_name, dump_id, dfi->suffix, (void *)0);
}
/* Begin a tree dump for PHASE. Stores any user supplied flag in

12
lang/gcc/4.0/patches/patch-gcc_tree-mudflap_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-mudflap_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
--- gcc/tree-mudflap.c.orig Tue Sep 14 08:50:49 2004
+++ gcc/tree-mudflap.c Tue Sep 14 08:51:00 2004
@@ -232,7 +232,7 @@ mf_file_function_line_tree (location_t l
else
op = name = cp = "";
- string = concat (file, colon, line, op, name, cp, NULL);
+ string = concat (file, colon, line, op, name, cp, (void *)0);
result = mf_build_string (string);
free (string);

12
lang/gcc/4.0/patches/patch-gcc_tree-nested_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-nested_c,v 1.2 2005/01/03 16:23:48 espie Exp $
--- gcc/tree-nested.c.orig Sat Dec 18 19:59:04 2004
+++ gcc/tree-nested.c Mon Jan 3 15:47:20 2005
@@ -200,7 +200,7 @@ get_frame_type (struct nesting_info *inf
name = concat ("FRAME.",
IDENTIFIER_POINTER (DECL_NAME (info->context)),
- NULL);
+ (void *)0);
TYPE_NAME (type) = get_identifier (name);
free (name);

27
lang/gcc/4.0/patches/patch-gcc_tree-optimize_c
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-gcc_tree-optimize_c,v 1.2 2005/02/22 21:27:50 espie Exp $
--- gcc/tree-optimize.c.orig Thu Feb 17 17:19:41 2005
+++ gcc/tree-optimize.c Tue Feb 22 19:44:27 2005
@@ -221,18 +221,18 @@ register_one_dump_file (struct tree_opt_
sprintf (num, "%d", ((int) pass->static_pass_number < 0
? 1 : pass->static_pass_number));
- dot_name = concat (".", pass->name, num, NULL);
+ dot_name = concat (".", pass->name, num, (void *)0);
if (pass->properties_provided & PROP_trees)
{
- flag_name = concat ("tree-", pass->name, num, NULL);
- glob_name = concat ("tree-", pass->name, NULL);
+ flag_name = concat ("tree-", pass->name, num, (void *)0);
+ glob_name = concat ("tree-", pass->name, (void *)0);
pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
TDF_TREE, n + TDI_tree_all, 0);
}
else
{
- flag_name = concat ("rtl-", pass->name, num, NULL);
- glob_name = concat ("rtl-", pass->name, NULL);
+ flag_name = concat ("rtl-", pass->name, num, (void *)0);
+ glob_name = concat ("rtl-", pass->name, (void *)0);
pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
TDF_RTL, n, pass->letter);
}

12
lang/gcc/4.0/patches/patch-gcc_tree-vect-transform_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-vect-transform_c,v 1.1 2005/02/22 21:27:50 espie Exp $
--- gcc/tree-vect-transform.c.orig Tue Feb 22 20:36:16 2005
+++ gcc/tree-vect-transform.c Tue Feb 22 20:36:29 2005
@@ -93,7 +93,7 @@ vect_get_new_vect_var (tree type, enum v
prefix_len = strlen (prefix);
if (name)
- new_vect_var = create_tmp_var (type, concat (prefix, name, NULL));
+ new_vect_var = create_tmp_var (type, concat (prefix, name, (void *)0));
else
new_vect_var = create_tmp_var (type, prefix);

17
lang/gcc/4.0/patches/patch-gcc_tree_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-gcc_tree_c,v 1.3 2005/10/20 23:28:02 espie Exp $
--- gcc/tree.c.orig Mon Sep 12 10:01:52 2005
+++ gcc/tree.c Tue Oct 4 02:01:18 2005
@@ -5960,11 +5960,11 @@ build_common_builtin_nodes (void)
*q = TOLOWER (*p);
*q = '\0';
- built_in_names[mcode] = concat ("__mul", mode_name_buf, "3", NULL);
+ built_in_names[mcode] = concat ("__mul", mode_name_buf, "3", (void *)0);
local_define_builtin (built_in_names[mcode], ftype, mcode,
built_in_names[mcode], ECF_CONST | ECF_NOTHROW);
- built_in_names[dcode] = concat ("__div", mode_name_buf, "3", NULL);
+ built_in_names[dcode] = concat ("__div", mode_name_buf, "3", (void *)0);
local_define_builtin (built_in_names[dcode], ftype, dcode,
built_in_names[dcode], ECF_CONST | ECF_NOTHROW);
}

12
lang/gcc/4.0/patches/patch-gcc_varasm_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_varasm_c,v 1.6 2006/01/09 15:31:47 espie Exp $
--- gcc/varasm.c.orig Thu Oct 6 20:54:12 2005
+++ gcc/varasm.c Mon Jan 9 13:36:29 2006
@@ -1226,7 +1226,7 @@ assemble_start_function (tree decl, cons
unlikely_text_section_name = NULL;
unlikely_section_label = reconcat (unlikely_section_label,
- fnname, ".unlikely_section", NULL);
+ fnname, ".unlikely_section", (void *)0);
/* The following code does not need preprocessing in the assembler. */

245
lang/gcc/4.1/patches/patch-gcc_c-aux-info_c
View File

@ -1,245 +0,0 @@
$OpenBSD: patch-gcc_c-aux-info_c,v 1.2 2005/03/07 16:30:06 espie Exp $
--- gcc/c-aux-info.c.orig Tue Sep 14 08:45:13 2004
+++ gcc/c-aux-info.c Tue Sep 14 08:47:34 2004
@@ -91,14 +91,14 @@ affix_data_type (const char *param)
add a blank after the data-type of course. */
if (p == type_or_decl)
- return concat (data_type, " ", type_or_decl, NULL);
+ return concat (data_type, " ", type_or_decl, (void *)0);
saved = *p;
*p = '\0';
- qualifiers_then_data_type = concat (type_or_decl, data_type, NULL);
+ qualifiers_then_data_type = concat (type_or_decl, data_type, (void *)0);
*p = saved;
return reconcat (qualifiers_then_data_type,
- qualifiers_then_data_type, " ", p, NULL);
+ qualifiers_then_data_type, " ", p, (void *)0);
}
/* Given a tree node which represents some "function type", generate the
@@ -123,13 +123,13 @@ gen_formal_list_for_type (tree fntype, f
const char *this_type;
if (*formal_list)
- formal_list = concat (formal_list, ", ", NULL);
+ formal_list = concat (formal_list, ", ", (void *)0);
this_type = gen_type ("", TREE_VALUE (formal_type), ansi);
formal_list
= ((strlen (this_type))
- ? concat (formal_list, affix_data_type (this_type), NULL)
- : concat (formal_list, data_type, NULL));
+ ? concat (formal_list, affix_data_type (this_type), (void *)0)
+ : concat (formal_list, data_type, (void *)0));
formal_type = TREE_CHAIN (formal_type);
}
@@ -178,10 +178,10 @@ gen_formal_list_for_type (tree fntype, f
petered out to a NULL (i.e. without being terminated by a
void_type_node) then we need to tack on an ellipsis. */
if (!formal_type)
- formal_list = concat (formal_list, ", ...", NULL);
+ formal_list = concat (formal_list, ", ...", (void *)0);
}
- return concat (" (", formal_list, ")", NULL);
+ return concat (" (", formal_list, ")", (void *)0);
}
/* For the generation of an ANSI prototype for a function definition, we have
@@ -237,23 +237,23 @@ gen_formal_list_for_func_def (tree fndec
const char *this_formal;
if (*formal_list && ((style == ansi) || (style == k_and_r_names)))
- formal_list = concat (formal_list, ", ", NULL);
+ formal_list = concat (formal_list, ", ", (void *)0);
this_formal = gen_decl (formal_decl, 0, style);
if (style == k_and_r_decls)
- formal_list = concat (formal_list, this_formal, "; ", NULL);
+ formal_list = concat (formal_list, this_formal, "; ", (void *)0);
else
- formal_list = concat (formal_list, this_formal, NULL);
+ formal_list = concat (formal_list, this_formal, (void *)0);
formal_decl = TREE_CHAIN (formal_decl);
}
if (style == ansi)
{
if (!DECL_ARGUMENTS (fndecl))
- formal_list = concat (formal_list, "void", NULL);
+ formal_list = concat (formal_list, "void", (void *)0);
if (deserves_ellipsis (TREE_TYPE (fndecl)))
- formal_list = concat (formal_list, ", ...", NULL);
+ formal_list = concat (formal_list, ", ...", (void *)0);
}
if ((style == ansi) || (style == k_and_r_names))
- formal_list = concat (" (", formal_list, ")", NULL);
+ formal_list = concat (" (", formal_list, ")", (void *)0);
return formal_list;
}
@@ -312,14 +312,14 @@ gen_type (const char *ret_val, tree t, f
{
case POINTER_TYPE:
if (TYPE_READONLY (t))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
if (TYPE_VOLATILE (t))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
- ret_val = concat ("*", ret_val, NULL);
+ ret_val = concat ("*", ret_val, (void *)0);
if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE || TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
- ret_val = concat ("(", ret_val, ")", NULL);
+ ret_val = concat ("(", ret_val, ")", (void *)0);
ret_val = gen_type (ret_val, TREE_TYPE (t), style);
@@ -327,17 +327,17 @@ gen_type (const char *ret_val, tree t, f
case ARRAY_TYPE:
if (!COMPLETE_TYPE_P (t) || TREE_CODE (TYPE_SIZE (t)) != INTEGER_CST)
- ret_val = gen_type (concat (ret_val, "[]", NULL),
+ ret_val = gen_type (concat (ret_val, "[]", (void *)0),
TREE_TYPE (t), style);
else if (int_size_in_bytes (t) == 0)
- ret_val = gen_type (concat (ret_val, "[0]", NULL),
+ ret_val = gen_type (concat (ret_val, "[0]", (void *)0),
TREE_TYPE (t), style);
else
{
int size = (int_size_in_bytes (t) / int_size_in_bytes (TREE_TYPE (t)));
char buff[10];
sprintf (buff, "[%d]", size);
- ret_val = gen_type (concat (ret_val, buff, NULL),
+ ret_val = gen_type (concat (ret_val, buff, (void *)0),
TREE_TYPE (t), style);
}
break;
@@ -345,7 +345,7 @@ gen_type (const char *ret_val, tree t, f
case FUNCTION_TYPE:
ret_val = gen_type (concat (ret_val,
gen_formal_list_for_type (t, style),
- NULL),
+ (void *)0),
TREE_TYPE (t), style);
break;
@@ -374,13 +374,13 @@ gen_type (const char *ret_val, tree t, f
while (chain_p)
{
data_type = concat (data_type, gen_decl (chain_p, 0, ansi),
- NULL);
+ (void *)0);
chain_p = TREE_CHAIN (chain_p);
- data_type = concat (data_type, "; ", NULL);
+ data_type = concat (data_type, "; ", (void *)0);
}
- data_type = concat ("{ ", data_type, "}", NULL);
+ data_type = concat ("{ ", data_type, "}", (void *)0);
}
- data_type = concat ("struct ", data_type, NULL);
+ data_type = concat ("struct ", data_type, (void *)0);
break;
case UNION_TYPE:
@@ -393,13 +393,13 @@ gen_type (const char *ret_val, tree t, f
while (chain_p)
{
data_type = concat (data_type, gen_decl (chain_p, 0, ansi),
- NULL);
+ (void *)0);
chain_p = TREE_CHAIN (chain_p);
- data_type = concat (data_type, "; ", NULL);
+ data_type = concat (data_type, "; ", (void *)0);
}
- data_type = concat ("{ ", data_type, "}", NULL);
+ data_type = concat ("{ ", data_type, "}", (void *)0);
}
- data_type = concat ("union ", data_type, NULL);
+ data_type = concat ("union ", data_type, (void *)0);
break;
case ENUMERAL_TYPE:
@@ -412,14 +412,14 @@ gen_type (const char *ret_val, tree t, f
while (chain_p)
{
data_type = concat (data_type,
- IDENTIFIER_POINTER (TREE_PURPOSE (chain_p)), NULL);
+ IDENTIFIER_POINTER (TREE_PURPOSE (chain_p)), (void *)0);
chain_p = TREE_CHAIN (chain_p);
if (chain_p)
- data_type = concat (data_type, ", ", NULL);
+ data_type = concat (data_type, ", ", (void *)0);
}
- data_type = concat ("{ ", data_type, " }", NULL);
+ data_type = concat ("{ ", data_type, " }", (void *)0);
}
- data_type = concat ("enum ", data_type, NULL);
+ data_type = concat ("enum ", data_type, (void *)0);
break;
case TYPE_DECL:
@@ -431,7 +431,7 @@ gen_type (const char *ret_val, tree t, f
/* Normally, `unsigned' is part of the deal. Not so if it comes
with a type qualifier. */
if (TYPE_UNSIGNED (t) && TYPE_QUALS (t))
- data_type = concat ("unsigned ", data_type, NULL);
+ data_type = concat ("unsigned ", data_type, (void *)0);
break;
case REAL_TYPE:
@@ -451,11 +451,11 @@ gen_type (const char *ret_val, tree t, f
}
}
if (TYPE_READONLY (t))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
if (TYPE_VOLATILE (t))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
if (TYPE_RESTRICT (t))
- ret_val = concat ("restrict ", ret_val, NULL);
+ ret_val = concat ("restrict ", ret_val, (void *)0);
return ret_val;
}
@@ -494,9 +494,9 @@ gen_decl (tree decl, int is_func_definit
generate the qualifiers here. */
if (TREE_THIS_VOLATILE (decl))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
if (TREE_READONLY (decl))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
data_type = "";
@@ -515,7 +515,7 @@ gen_decl (tree decl, int is_func_definit
if (TREE_CODE (decl) == FUNCTION_DECL && is_func_definition)
{
ret_val = concat (ret_val, gen_formal_list_for_func_def (decl, ansi),
- NULL);
+ (void *)0);
/* Since we have already added in the formals list stuff, here we don't
add the whole "type" of the function we are considering (which
@@ -532,11 +532,11 @@ gen_decl (tree decl, int is_func_definit
ret_val = affix_data_type (ret_val);
if (TREE_CODE (decl) != FUNCTION_DECL && C_DECL_REGISTER (decl))
- ret_val = concat ("register ", ret_val, NULL);
+ ret_val = concat ("register ", ret_val, (void *)0);
if (TREE_PUBLIC (decl))
- ret_val = concat ("extern ", ret_val, NULL);
+ ret_val = concat ("extern ", ret_val, (void *)0);
if (TREE_CODE (decl) == FUNCTION_DECL && !TREE_PUBLIC (decl))
- ret_val = concat ("static ", ret_val, NULL);
+ ret_val = concat ("static ", ret_val, (void *)0);
return ret_val;
}

21
lang/gcc/4.1/patches/patch-gcc_c-incpath_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-gcc_c-incpath_c,v 1.2 2005/03/07 16:30:06 espie Exp $
--- gcc/c-incpath.c.orig Tue Sep 14 08:48:54 2004
+++ gcc/c-incpath.c Tue Sep 14 08:49:15 2004
@@ -141,7 +141,7 @@ add_standard_paths (const char *sysroot,
continue;
if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
{
- char *str = concat (iprefix, p->fname + len, NULL);
+ char *str = concat (iprefix, p->fname + len, (void *)0);
add_path (str, SYSTEM, p->cxx_aware, false);
}
}
@@ -156,7 +156,7 @@ add_standard_paths (const char *sysroot,
/* Should this directory start with the sysroot? */
if (sysroot && p->add_sysroot)
- str = concat (sysroot, p->fname, NULL);
+ str = concat (sysroot, p->fname, (void *)0);
else
str = update_path (p->fname, p->component);

76
lang/gcc/4.1/patches/patch-gcc_collect2_c
View File

@ -1,76 +0,0 @@
$OpenBSD: patch-gcc_collect2_c,v 1.4 2005/09/11 22:04:41 espie Exp $
--- gcc/collect2.c.orig Fri Aug 19 03:20:32 2005
+++ gcc/collect2.c Mon Sep 12 00:01:23 2005
@@ -753,19 +753,19 @@ main (int argc, char **argv)
qualify the program name with the target machine. */
const char *const full_ld_suffix =
- concat(target_machine, "-", ld_suffix, NULL);
+ concat(target_machine, "-", ld_suffix, (char *)0);
const char *const full_nm_suffix =
- concat (target_machine, "-", nm_suffix, NULL);
+ concat (target_machine, "-", nm_suffix, (char *)0);
const char *const full_gnm_suffix =
- concat (target_machine, "-", gnm_suffix, NULL);
+ concat (target_machine, "-", gnm_suffix, (char *)0);
#ifdef LDD_SUFFIX
const char *const full_ldd_suffix =
- concat (target_machine, "-", ldd_suffix, NULL);
+ concat (target_machine, "-", ldd_suffix, (char *)0);
#endif
const char *const full_strip_suffix =
- concat (target_machine, "-", strip_suffix, NULL);
+ concat (target_machine, "-", strip_suffix, (char *)0);
const char *const full_gstrip_suffix =
- concat (target_machine, "-", gstrip_suffix, NULL);
+ concat (target_machine, "-", gstrip_suffix, (char *)0);
#else
const char *const full_ld_suffix = ld_suffix;
const char *const full_nm_suffix = nm_suffix;
@@ -958,7 +958,7 @@ main (int argc, char **argv)
if (c_file_name == 0)
{
#ifdef CROSS_COMPILE
- c_file_name = concat (target_machine, "-gcc", NULL);
+ c_file_name = concat (target_machine, "-gcc", (char *)0);
#else
c_file_name = "gcc";
#endif
@@ -1236,7 +1236,7 @@ main (int argc, char **argv)
if (exports.first)
{
- char *buf = concat ("-bE:", export_file, NULL);
+ char *buf = concat ("-bE:", export_file, (char *)0);
*ld1++ = buf;
*ld2++ = buf;
@@ -1401,7 +1401,7 @@ main (int argc, char **argv)
/* Tell the linker that we have initializer and finalizer functions. */
#ifdef LD_INIT_SWITCH
#ifdef COLLECT_EXPORT_LIST
- *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, NULL);
+ *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, (char *)0);
#else
*ld2++ = LD_INIT_SWITCH;
*ld2++ = initname;
@@ -1416,7 +1416,7 @@ main (int argc, char **argv)
/* If we did not add export flag to link arguments before, add it to
second link phase now. No new exports should have been added. */
if (! exports.first)
- *ld2++ = concat ("-bE:", export_file, NULL);
+ *ld2++ = concat ("-bE:", export_file, (char *)0);
#ifndef LD_INIT_SWITCH
add_to_list (&exports, initname);
@@ -1811,8 +1811,8 @@ write_c_file_stat (FILE *stream, const c
notice ("\nwrite_c_file - output name is %s, prefix is %s\n",
output_file, prefix);
- initname = concat ("_GLOBAL__FI_", prefix, NULL);
- fininame = concat ("_GLOBAL__FD_", prefix, NULL);
+ initname = concat ("_GLOBAL__FI_", prefix, (char *)0);
+ fininame = concat ("_GLOBAL__FD_", prefix, (char *)0);
free (prefix);

12
lang/gcc/4.1/patches/patch-gcc_coverage_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_coverage_c,v 1.5 2006/03/05 22:11:15 espie Exp $
--- gcc/coverage.c.orig Mon Oct 31 19:23:44 2005
+++ gcc/coverage.c Sat Mar 4 14:34:45 2006
@@ -813,7 +813,7 @@ build_gcov_info (void)
fields = field;
filename = getpwd ();
filename = (filename && da_file_name[0] != '/'
- ? concat (filename, "/", da_file_name, NULL)
+ ? concat (filename, "/", da_file_name, (void *)0)
: da_file_name);
filename_len = strlen (filename);
filename_string = build_string (filename_len + 1, filename);

21
lang/gcc/4.1/patches/patch-gcc_cp_call_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-gcc_cp_call_c,v 1.5 2006/03/05 22:11:15 espie Exp $
--- gcc/cp/call.c.orig Tue Jan 24 22:38:56 2006
+++ gcc/cp/call.c Sat Mar 4 14:34:45 2006
@@ -5208,7 +5208,7 @@ name_as_c_string (tree name, tree type,
|| name == base_dtor_identifier
|| name == deleting_dtor_identifier)
{
- pretty_name = concat ("~", pretty_name, NULL);
+ pretty_name = concat ("~", pretty_name, (void *)0);
/* Remember that we need to free the memory allocated. */
*free_p = true;
}
@@ -5218,7 +5218,7 @@ name_as_c_string (tree name, tree type,
pretty_name = concat ("operator ",
type_as_string (TREE_TYPE (name),
TFF_PLAIN_IDENTIFIER),
- NULL);
+ (void *)0);
/* Remember that we need to free the memory allocated. */
*free_p = true;
}

12
lang/gcc/4.1/patches/patch-gcc_cp_decl2_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_cp_decl2_c,v 1.4 2006/03/05 22:11:15 espie Exp $
--- gcc/cp/decl2.c.orig Sat Feb 18 09:37:34 2006
+++ gcc/cp/decl2.c Sat Mar 4 14:34:45 2006
@@ -2767,7 +2767,7 @@ build_java_method_aliases (void)
oid = DECL_ASSEMBLER_NAME (fndecl);
oname = IDENTIFIER_POINTER (oid);
gcc_assert (oname[0] == '_' && oname[1] == 'Z');
- nname = ACONCAT (("_ZGA", oname+2, NULL));
+ nname = ACONCAT (("_ZGA", oname+2, (char *)0));
nid = get_identifier (nname);
alias = make_alias_for (fndecl, nid);

12
lang/gcc/4.1/patches/patch-gcc_cp_parser_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_cp_parser_c,v 1.7 2006/03/05 22:11:15 espie Exp $
--- gcc/cp/parser.c.orig Sat Feb 18 09:37:34 2006
+++ gcc/cp/parser.c Sat Mar 4 14:34:46 2006
@@ -16029,7 +16029,7 @@ cp_parser_require (cp_parser* parser,
/* Output the MESSAGE -- unless we're parsing tentatively. */
if (!cp_parser_simulate_error (parser))
{
- char *message = concat ("expected ", token_desc, NULL);
+ char *message = concat ("expected ", token_desc, (void *)0);
cp_parser_error (parser, message);
free (message);
}

12
lang/gcc/4.1/patches/patch-gcc_dbxout_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_dbxout_c,v 1.5 2006/03/05 22:11:15 espie Exp $
--- gcc/dbxout.c.orig Thu Oct 6 02:47:21 2005
+++ gcc/dbxout.c Sat Mar 4 14:34:46 2006
@@ -1012,7 +1012,7 @@ dbxout_init (const char *input_file_name
if (cwd[0] == '\0')
cwd = "/";
else if (!IS_DIR_SEPARATOR (cwd[strlen (cwd) - 1]))
- cwd = concat (cwd, "/", NULL);
+ cwd = concat (cwd, "/", (void *)0);
}
#ifdef DBX_OUTPUT_MAIN_SOURCE_DIRECTORY
DBX_OUTPUT_MAIN_SOURCE_DIRECTORY (asm_out_file, cwd);

12
lang/gcc/4.1/patches/patch-gcc_diagnostic_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_diagnostic_c,v 1.3 2006/03/05 22:11:15 espie Exp $
--- gcc/diagnostic.c.orig Fri Nov 4 00:08:18 2005
+++ gcc/diagnostic.c Sat Mar 4 14:34:46 2006
@@ -358,7 +358,7 @@ diagnostic_report_diagnostic (diagnostic
if (context->show_option_requested && diagnostic->option_index)
diagnostic->message.format_spec
= ACONCAT ((diagnostic->message.format_spec,
- " [", cl_options[diagnostic->option_index].opt_text, "]", NULL));
+ " [", cl_options[diagnostic->option_index].opt_text, "]", (char *)0));
diagnostic->message.locus = &diagnostic->location;
pp_format (context->printer, &diagnostic->message);

201
lang/gcc/4.1/patches/patch-gcc_gcc_c
View File

@ -1,201 +0,0 @@
$OpenBSD: patch-gcc_gcc_c,v 1.6 2006/03/05 22:11:15 espie Exp $
--- gcc/gcc.c.orig Sat Jan 21 19:29:08 2006
+++ gcc/gcc.c Sat Mar 4 14:34:46 2006
@@ -1299,7 +1299,7 @@ translate_options (int *argcp, const cha
/* Store the translation as one argv elt or as two. */
if (arg != 0 && strchr (arginfo, 'j') != 0)
newv[newindex++] = concat (option_map[j].equivalent, arg,
- NULL);
+ (void *)0);
else if (arg != 0)
{
newv[newindex++] = option_map[j].equivalent;
@@ -1618,7 +1618,7 @@ init_gcc_specs (struct obstack *obstack,
shared_name,
#endif
#endif
- "}}}", NULL);
+ "}}}", (void *)0);
obstack_grow (obstack, buf, strlen (buf));
free (buf);
@@ -1816,7 +1816,7 @@ set_spec (const char *name, const char *
old_spec = *(sl->ptr_spec);
*(sl->ptr_spec) = ((spec[0] == '+' && ISSPACE ((unsigned char)spec[1]))
- ? concat (old_spec, spec + 1, NULL)
+ ? concat (old_spec, spec + 1, (void *)0)
: xstrdup (spec));
#ifdef DEBUG_SPECS
@@ -2480,10 +2480,10 @@ find_a_file (struct path_prefix *pprefix
len += len1 > len2 ? len1 : len2;
if (multilib_dir)
multilib_name = ACONCAT ((multilib_dir, dir_separator_str, name,
- NULL));
+ (void *)0));
if (strcmp (multilib_os_dir, ".") != 0)
multilib_os_name = ACONCAT ((multilib_os_dir, dir_separator_str, name,
- NULL));
+ (void *)0));
}
temp = xmalloc (len);
@@ -2642,8 +2642,8 @@ add_sysrooted_prefix (struct path_prefix
if (target_system_root)
{
if (target_sysroot_suffix)
- prefix = concat (target_sysroot_suffix, prefix, NULL);
- prefix = concat (target_system_root, prefix, NULL);
+ prefix = concat (target_sysroot_suffix, prefix, (void *)0);
+ prefix = concat (target_system_root, prefix, (void *)0);
/* We have to override this because GCC's notion of sysroot
moves along with GCC. */
@@ -3224,7 +3224,7 @@ process_command (int argc, const char **
break;
new_argv0 = xmemdup (progname, baselen,
baselen + concat_length (new_version, new_machine,
- "-gcc-", NULL) + 1);
+ "-gcc-", (void *)0) + 1);
strcpy (new_argv0 + baselen, new_machine);
strcat (new_argv0, "-gcc-");
strcat (new_argv0, new_version);
@@ -3251,7 +3251,7 @@ process_command (int argc, const char **
standard_bindir_prefix,
standard_libexec_prefix);
if (gcc_exec_prefix)
- putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL));
+ putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, (void *)0));
}
else
gcc_libexec_prefix = make_relative_prefix (gcc_exec_prefix,
@@ -3298,7 +3298,7 @@ process_command (int argc, const char **
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3332,7 +3332,7 @@ process_command (int argc, const char **
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3365,7 +3365,7 @@ process_command (int argc, const char **
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3830,7 +3830,7 @@ warranty; not even for MERCHANTABILITY o
PREFIX_PRIORITY_LAST, 1, 0);
tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
- dir_separator_str, NULL);
+ dir_separator_str, (void *)0);
/* If tooldir is relative, base it on exec_prefixes. A relative
tooldir lets us move the installed tree as a unit.
@@ -3845,28 +3845,28 @@ warranty; not even for MERCHANTABILITY o
{
char *gcc_exec_tooldir_prefix
= concat (gcc_exec_prefix, spec_machine, dir_separator_str,
- spec_version, dir_separator_str, tooldir_prefix, NULL);
+ spec_version, dir_separator_str, tooldir_prefix, (void *)0);
add_prefix (&exec_prefixes,
concat (gcc_exec_tooldir_prefix, "bin",
- dir_separator_str, NULL),
+ dir_separator_str, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 0);
add_prefix (&startfile_prefixes,
concat (gcc_exec_tooldir_prefix, "lib",
- dir_separator_str, NULL),
+ dir_separator_str, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
}
tooldir_prefix = concat (standard_exec_prefix, spec_machine,
dir_separator_str, spec_version,
- dir_separator_str, tooldir_prefix, NULL);
+ dir_separator_str, tooldir_prefix, (void *)0);
}
add_prefix (&exec_prefixes,
- concat (tooldir_prefix, "bin", dir_separator_str, NULL),
+ concat (tooldir_prefix, "bin", dir_separator_str, (void *)0),
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 0);
add_prefix (&startfile_prefixes,
- concat (tooldir_prefix, "lib", dir_separator_str, NULL),
+ concat (tooldir_prefix, "lib", dir_separator_str, (void *)0),
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
#if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
@@ -3990,7 +3990,7 @@ warranty; not even for MERCHANTABILITY o
{ /* POSIX allows separation of -l and the lib arg;
canonicalize by concatenating -l with its arg */
infiles[n_infiles].language = "*";
- infiles[n_infiles++].name = concat ("-l", argv[++i], NULL);
+ infiles[n_infiles++].name = concat ("-l", argv[++i], (void *)0);
}
else if (strncmp (argv[i], "-l", 2) == 0)
{
@@ -5945,11 +5945,11 @@ is_directory (const char *path1, const c
if (linker
&& ((cp - path == 6
&& strcmp (path, concat (dir_separator_str, "lib",
- dir_separator_str, ".", NULL)) == 0)
+ dir_separator_str, ".", (void *)0)) == 0)
|| (cp - path == 10
&& strcmp (path, concat (dir_separator_str, "usr",
dir_separator_str, "lib",
- dir_separator_str, ".", NULL)) == 0)))
+ dir_separator_str, ".", (void *)0)) == 0)))
return 0;
return (stat (path, &st) >= 0 && S_ISDIR (st.st_mode));
@@ -6136,8 +6136,8 @@ main (int argc, const char **argv)
/* Read specs from a file if there is one. */
machine_suffix = concat (spec_machine, dir_separator_str,
- spec_version, dir_separator_str, NULL);
- just_machine_suffix = concat (spec_machine, dir_separator_str, NULL);
+ spec_version, dir_separator_str, (void *)0);
+ just_machine_suffix = concat (spec_machine, dir_separator_str, (void *)0);
specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, 0);
/* Read the specs file unless it is a default one. */
@@ -6251,12 +6251,12 @@ main (int argc, const char **argv)
if (gcc_exec_prefix)
add_prefix (&startfile_prefixes,
concat (gcc_exec_prefix, machine_suffix,
- standard_startfile_prefix, NULL),
+ standard_startfile_prefix, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
add_prefix (&startfile_prefixes,
concat (standard_exec_prefix,
machine_suffix,
- standard_startfile_prefix, NULL),
+ standard_startfile_prefix, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
}
@@ -6282,7 +6282,7 @@ main (int argc, const char **argv)
/* If we have a GCC_EXEC_PREFIX envvar, modify it for cpp's sake. */
if (gcc_exec_prefix)
gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
- spec_version, dir_separator_str, NULL);
+ spec_version, dir_separator_str, (void *)0);
/* Now we have the specs.
Set the `valid' bits for switches that match anything in any spec. */

21
lang/gcc/4.1/patches/patch-gcc_gensupport_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-gcc_gensupport_c,v 1.2 2005/03/07 16:30:06 espie Exp $
--- gcc/gensupport.c.orig Sat Mar 5 15:01:01 2005
+++ gcc/gensupport.c Mon Mar 7 15:31:39 2005
@@ -219,7 +219,7 @@ process_include (rtx desc, int lineno)
{
static const char sep[2] = { DIR_SEPARATOR, '\0' };
- pathname = concat (stackp->fname, sep, filename, NULL);
+ pathname = concat (stackp->fname, sep, filename, (void *)0);
input_file = fopen (pathname, "r");
if (input_file != NULL)
goto success;
@@ -228,7 +228,7 @@ process_include (rtx desc, int lineno)
}
if (base_dir)
- pathname = concat (base_dir, filename, NULL);
+ pathname = concat (base_dir, filename, (void *)0);
else
pathname = xstrdup (filename);
input_file = fopen (pathname, "r");

12
lang/gcc/4.1/patches/patch-gcc_objc_objc-act_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_objc_objc-act_c,v 1.4 2005/08/04 14:51:37 espie Exp $
--- gcc/objc/objc-act.c.orig Wed Jul 20 03:19:49 2005
+++ gcc/objc/objc-act.c Thu Aug 4 10:54:01 2005
@@ -495,7 +495,7 @@ objc_init (void)
/* If gen_declaration desired, open the output file. */
if (flag_gen_declaration)
{
- register char * const dumpname = concat (dump_base_name, ".decl", NULL);
+ register char * const dumpname = concat (dump_base_name, ".decl", (void *)0);
gen_declaration_file = fopen (dumpname, "w");
if (gen_declaration_file == 0)
fatal_error ("can't open %s: %m", dumpname);

37
lang/gcc/4.1/patches/patch-gcc_passes_c
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-gcc_passes_c,v 1.2 2005/09/11 22:04:41 espie Exp $
--- gcc/passes.c.orig Fri Sep 9 02:46:38 2005
+++ gcc/passes.c Mon Sep 12 00:01:24 2005
@@ -315,26 +315,26 @@ register_one_dump_file (struct tree_opt_
sprintf (num, "%d", ((int) pass->static_pass_number < 0
? 1 : pass->static_pass_number));
- dot_name = concat (".", pass->name, num, NULL);
+ dot_name = concat (".", pass->name, num, (char *)0);
if (ipa)
{
- flag_name = concat ("ipa-", pass->name, num, NULL);
- glob_name = concat ("ipa-", pass->name, NULL);
+ flag_name = concat ("ipa-", pass->name, num, (char *)0);
+ glob_name = concat ("ipa-", pass->name, (char *)0);
/* First IPA dump is cgraph that is dumped via separate channels. */
pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
TDF_IPA, n + 1, 0);
}
else if (pass->properties_provided & PROP_trees)
{
- flag_name = concat ("tree-", pass->name, num, NULL);
- glob_name = concat ("tree-", pass->name, NULL);
+ flag_name = concat ("tree-", pass->name, num, (char *)0);
+ glob_name = concat ("tree-", pass->name, (char *)0);
pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
TDF_TREE, n + TDI_tree_all, 0);
}
else
{
- flag_name = concat ("rtl-", pass->name, num, NULL);
- glob_name = concat ("rtl-", pass->name, NULL);
+ flag_name = concat ("rtl-", pass->name, num, (char *)0);
+ glob_name = concat ("rtl-", pass->name, (char *)0);
pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
TDF_RTL, n, pass->letter);
}

35
lang/gcc/4.1/patches/patch-gcc_prefix_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-gcc_prefix_c,v 1.3 2005/05/21 10:34:43 espie Exp $
--- gcc/prefix.c.orig Fri Mar 18 16:24:19 2005
+++ gcc/prefix.c Mon May 16 17:43:13 2005
@@ -99,7 +99,7 @@ get_key_value (char *key)
#endif
if (prefix == 0)
- prefix = getenv (temp = concat (key, "_ROOT", NULL));
+ prefix = getenv (temp = concat (key, "_ROOT", (void *)0));
if (prefix == 0)
prefix = std_prefix;
@@ -223,7 +223,7 @@ translate_name (char *name)
together. */
old_name = name;
- name = concat (prefix, &name[keylen + 1], NULL);
+ name = concat (prefix, &name[keylen + 1], (void *)0);
free (old_name);
}
@@ -261,11 +261,11 @@ update_path (const char *path, const cha
if (key[0] != '$')
{
- key = concat ("@", key, NULL);
+ key = concat ("@", key, (void *)0);
free_key = true;
}
- result = concat (key, &path[len], NULL);
+ result = concat (key, &path[len], (void *)0);
if (free_key)
free ((char *) key);
result = translate_name (result);

12
lang/gcc/4.1/patches/patch-gcc_read-rtl_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_read-rtl_c,v 1.3 2005/05/29 13:26:49 espie Exp $
--- gcc/read-rtl.c.orig Wed May 18 15:46:39 2005
+++ gcc/read-rtl.c Sun May 29 13:55:47 2005
@@ -781,7 +781,7 @@ join_c_conditions (const char *cond1, co
if (cond2 == 0 || cond2[0] == 0)
return cond1;
- result = concat ("(", cond1, ") && (", cond2, ")", NULL);
+ result = concat ("(", cond1, ") && (", cond2, ")", (void *)0);
obstack_ptr_grow (&joined_conditions_obstack, result);
obstack_ptr_grow (&joined_conditions_obstack, cond1);
obstack_ptr_grow (&joined_conditions_obstack, cond2);

12
lang/gcc/4.1/patches/patch-gcc_tree-complex_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-complex_c,v 1.2 2005/08/04 14:51:37 espie Exp $
--- gcc/tree-complex.c.orig Fri Jul 29 16:51:58 2005
+++ gcc/tree-complex.c Thu Aug 4 10:54:45 2005
@@ -397,7 +397,7 @@ create_one_component_var (tree type, tre
const char *name = IDENTIFIER_POINTER (DECL_NAME (orig));
tree inner_type;
- DECL_NAME (r) = get_identifier (ACONCAT ((name, suffix, NULL)));
+ DECL_NAME (r) = get_identifier (ACONCAT ((name, suffix, (char *)0)));
inner_type = TREE_TYPE (TREE_TYPE (orig));
SET_DECL_DEBUG_EXPR (r, build1 (code, type, orig));

12
lang/gcc/4.1/patches/patch-gcc_tree-dump_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-dump_c,v 1.4 2005/08/04 14:51:37 espie Exp $
--- gcc/tree-dump.c.orig Wed Jul 20 03:18:20 2005
+++ gcc/tree-dump.c Thu Aug 4 10:54:01 2005
@@ -831,7 +831,7 @@ get_dump_file_name (enum tree_dump_index
dump_id[0] = '\0';
}
- return concat (dump_base_name, dump_id, dfi->suffix, NULL);
+ return concat (dump_base_name, dump_id, dfi->suffix, (void *)0);
}
/* Begin a tree dump for PHASE. Stores any user supplied flag in

12
lang/gcc/4.1/patches/patch-gcc_tree-mudflap_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-mudflap_c,v 1.2 2005/03/07 16:30:06 espie Exp $
--- gcc/tree-mudflap.c.orig Tue Sep 14 08:50:49 2004
+++ gcc/tree-mudflap.c Tue Sep 14 08:51:00 2004
@@ -232,7 +232,7 @@ mf_file_function_line_tree (location_t l
else
op = name = cp = "";
- string = concat (file, colon, line, op, name, cp, NULL);
+ string = concat (file, colon, line, op, name, cp, (void *)0);
result = mf_build_string (string);
free (string);

12
lang/gcc/4.1/patches/patch-gcc_tree-nested_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-nested_c,v 1.3 2005/05/29 13:26:49 espie Exp $
--- gcc/tree-nested.c.orig Wed May 25 23:36:24 2005
+++ gcc/tree-nested.c Sun May 29 13:55:47 2005
@@ -214,7 +214,7 @@ get_frame_type (struct nesting_info *inf
name = concat ("FRAME.",
IDENTIFIER_POINTER (DECL_NAME (info->context)),
- NULL);
+ (void *)0);
TYPE_NAME (type) = get_identifier (name);
free (name);

12
lang/gcc/4.1/patches/patch-gcc_tree-vect-transform_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-vect-transform_c,v 1.5 2005/08/04 14:51:37 espie Exp $
--- gcc/tree-vect-transform.c.orig Mon Jul 25 14:04:50 2005
+++ gcc/tree-vect-transform.c Thu Aug 4 10:54:02 2005
@@ -104,7 +104,7 @@ vect_get_new_vect_var (tree type, enum v
}
if (name)
- new_vect_var = create_tmp_var (type, concat (prefix, name, NULL));
+ new_vect_var = create_tmp_var (type, concat (prefix, name, (void *)0));
else
new_vect_var = create_tmp_var (type, prefix);

17
lang/gcc/4.1/patches/patch-gcc_tree_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-gcc_tree_c,v 1.8 2006/03/05 22:11:15 espie Exp $
--- gcc/tree.c.orig Sun Jan 29 23:24:10 2006
+++ gcc/tree.c Sat Mar 4 14:34:46 2006
@@ -6479,11 +6479,11 @@ build_common_builtin_nodes (void)
*q = TOLOWER (*p);
*q = '\0';
- built_in_names[mcode] = concat ("__mul", mode_name_buf, "3", NULL);
+ built_in_names[mcode] = concat ("__mul", mode_name_buf, "3", (void *)0);
local_define_builtin (built_in_names[mcode], ftype, mcode,
built_in_names[mcode], ECF_CONST | ECF_NOTHROW);
- built_in_names[dcode] = concat ("__div", mode_name_buf, "3", NULL);
+ built_in_names[dcode] = concat ("__div", mode_name_buf, "3", (void *)0);
local_define_builtin (built_in_names[dcode], ftype, dcode,
built_in_names[dcode], ECF_CONST | ECF_NOTHROW);
}

12
lang/gcc/4.1/patches/patch-gcc_varasm_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_varasm_c,v 1.6 2005/08/04 14:51:37 espie Exp $
--- gcc/varasm.c.orig Wed Jul 27 23:02:55 2005
+++ gcc/varasm.c Thu Aug 4 10:54:02 2005
@@ -195,7 +195,7 @@ initialize_cold_section_name (void)
stripped_name = targetm.strip_name_encoding (name);
- buffer = ACONCAT ((stripped_name, "_unlikely", NULL));
+ buffer = ACONCAT ((stripped_name, "_unlikely", (char *)0));
cfun->unlikely_text_section_name = ggc_strdup (buffer);
}
else

100
lang/gcc/4.2/patches/keep
View File

@ -1,100 +0,0 @@
$OpenBSD: keep,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/c-format.c.orig Mon Mar 27 10:35:04 2006
+++ gcc/c-format.c Mon Mar 27 10:56:06 2006
@@ -62,6 +62,7 @@ enum format_type { printf_format_type, a
gcc_cdiag_format_type,
gcc_cxxdiag_format_type, gcc_gfc_format_type,
scanf_format_type, strftime_format_type,
+ kprintf_format_type, syslog_format_type,
strfmon_format_type, format_type_error = -1};
typedef struct function_format_info
@@ -294,6 +295,15 @@ static const format_length_info printf_l
{ NULL, 0, 0, NULL, 0, 0 }
};
+static const format_length_info kprintf_length_specs[] =
+{
+ { "h", FMT_LEN_h, STD_C89, NULL, 0, 0 },
+ { "l", FMT_LEN_l, STD_C89, "ll", FMT_LEN_ll, STD_C9L },
+ { "q", FMT_LEN_ll, STD_EXT, NULL, 0, 0 },
+ { "L", FMT_LEN_L, STD_C89, NULL, 0, 0 },
+ { NULL, 0, 0, NULL, 0, 0 }
+};
+
/* Length specifiers valid for asm_fprintf. */
static const format_length_info asm_fprintf_length_specs[] =
{
@@ -509,6 +519,24 @@ static const format_char_info print_char
{ NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
};
+static const format_char_info kprint_char_table[] =
+{
+ /* C89 conversion specifiers. */
+ { "di", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM }, "-wp0 +'I", "i", NULL },
+ { "oxX", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0#", "i", NULL },
+ { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0'I", "i", NULL },
+ { "c", 0, STD_C89, { T89_I, BADLEN, BADLEN, T94_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL },
+ { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR", NULL },
+ { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "c", NULL },
+/* Kernel bitmap formatting */
+ { "b", 1, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "", NULL },
+/* Kernel recursive format */
+ { ":", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "", NULL },
+/* Kernel debugger auto-radix printing */
+ { "nrz", 0, STD_C89, { T89_I, T89_I, T89_I, T89_L, T9L_LL, TEX_LL, BADLEN, BADLEN, BADLEN }, "-wp0# +", "", NULL },
+ { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
+};
+
static const format_char_info asm_fprintf_char_table[] =
{
/* C89 conversion specifiers. */
@@ -641,6 +669,28 @@ static const format_char_info gcc_gfc_ch
{ NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
};
+static const format_char_info syslog_char_table[] =
+{
+ /* C89 conversion specifiers. */
+ { "di", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM }, "-wp0 +'I", "i", NULL },
+ { "oxX", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0#", "i", NULL },
+ { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0'I", "i", NULL },
+ { "fgG", 0, STD_C89, { T89_D, BADLEN, BADLEN, T99_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#'", "", NULL },
+ { "eE", 0, STD_C89, { T89_D, BADLEN, BADLEN, T99_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "", NULL },
+ { "c", 0, STD_C89, { T89_I, BADLEN, BADLEN, T94_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL },
+ { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR", NULL },
+ { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "c" , NULL },
+ { "n", 1, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, BADLEN, T99_SST, T99_PD, T99_IM }, "", "W", NULL },
+ /* C99 conversion specifiers. */
+ { "F", 0, STD_C99, { T99_D, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#'", "", NULL },
+ { "aA", 0, STD_C99, { T99_D, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "", NULL },
+ /* X/Open conversion specifiers. */
+ { "C", 0, STD_EXT, { TEX_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL },
+ { "S", 1, STD_EXT, { TEX_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "R", NULL },
+ { "m", 0, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "", NULL },
+ { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
+};
+
static const format_char_info scan_char_table[] =
{
/* C89 conversion specifiers. */
@@ -698,6 +748,18 @@ static const format_char_info monetary_c
static const format_kind_info format_types_orig[] =
{
{ "printf", printf_length_specs, print_char_table, " +#0-'I", NULL,
+ printf_flag_specs, printf_flag_pairs,
+ FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
+ 'w', 0, 'p', 0, 'L',
+ &integer_type_node, &integer_type_node
+ },
+ { "kprintf", kprintf_length_specs, kprint_char_table, " +#0-'I", NULL,
+ printf_flag_specs, printf_flag_pairs,
+ FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
+ 'w', 0, 'p', 0, 'L',
+ &integer_type_node, &integer_type_node
+ },
+ { "syslog", printf_length_specs, syslog_char_table, " +#0-'I", NULL,
printf_flag_specs, printf_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
'w', 0, 'p', 0, 'L',

245
lang/gcc/4.2/patches/patch-gcc_c-aux-info_c
View File

@ -1,245 +0,0 @@
$OpenBSD: patch-gcc_c-aux-info_c,v 1.3 2009/04/16 18:36:48 espie Exp $
--- gcc/c-aux-info.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/c-aux-info.c Tue Apr 7 19:38:58 2009
@@ -90,14 +90,14 @@ affix_data_type (const char *param)
add a blank after the data-type of course. */
if (p == type_or_decl)
- return concat (data_type, " ", type_or_decl, NULL);
+ return concat (data_type, " ", type_or_decl, (void *)0);
saved = *p;
*p = '\0';
- qualifiers_then_data_type = concat (type_or_decl, data_type, NULL);
+ qualifiers_then_data_type = concat (type_or_decl, data_type, (void *)0);
*p = saved;
return reconcat (qualifiers_then_data_type,
- qualifiers_then_data_type, " ", p, NULL);
+ qualifiers_then_data_type, " ", p, (void *)0);
}
/* Given a tree node which represents some "function type", generate the
@@ -122,13 +122,13 @@ gen_formal_list_for_type (tree fntype, formals_style s
const char *this_type;
if (*formal_list)
- formal_list = concat (formal_list, ", ", NULL);
+ formal_list = concat (formal_list, ", ", (void *)0);
this_type = gen_type ("", TREE_VALUE (formal_type), ansi);
formal_list
= ((strlen (this_type))
- ? concat (formal_list, affix_data_type (this_type), NULL)
- : concat (formal_list, data_type, NULL));
+ ? concat (formal_list, affix_data_type (this_type), (void *)0)
+ : concat (formal_list, data_type, (void *)0));
formal_type = TREE_CHAIN (formal_type);
}
@@ -177,10 +177,10 @@ gen_formal_list_for_type (tree fntype, formals_style s
petered out to a NULL (i.e. without being terminated by a
void_type_node) then we need to tack on an ellipsis. */
if (!formal_type)
- formal_list = concat (formal_list, ", ...", NULL);
+ formal_list = concat (formal_list, ", ...", (void *)0);
}
- return concat (" (", formal_list, ")", NULL);
+ return concat (" (", formal_list, ")", (void *)0);
}
/* For the generation of an ANSI prototype for a function definition, we have
@@ -236,23 +236,23 @@ gen_formal_list_for_func_def (tree fndecl, formals_sty
const char *this_formal;
if (*formal_list && ((style == ansi) || (style == k_and_r_names)))
- formal_list = concat (formal_list, ", ", NULL);
+ formal_list = concat (formal_list, ", ", (void *)0);
this_formal = gen_decl (formal_decl, 0, style);
if (style == k_and_r_decls)
- formal_list = concat (formal_list, this_formal, "; ", NULL);
+ formal_list = concat (formal_list, this_formal, "; ", (void *)0);
else
- formal_list = concat (formal_list, this_formal, NULL);
+ formal_list = concat (formal_list, this_formal, (void *)0);
formal_decl = TREE_CHAIN (formal_decl);
}
if (style == ansi)
{
if (!DECL_ARGUMENTS (fndecl))
- formal_list = concat (formal_list, "void", NULL);
+ formal_list = concat (formal_list, "void", (void *)0);
if (deserves_ellipsis (TREE_TYPE (fndecl)))
- formal_list = concat (formal_list, ", ...", NULL);
+ formal_list = concat (formal_list, ", ...", (void *)0);
}
if ((style == ansi) || (style == k_and_r_names))
- formal_list = concat (" (", formal_list, ")", NULL);
+ formal_list = concat (" (", formal_list, ")", (void *)0);
return formal_list;
}
@@ -311,14 +311,14 @@ gen_type (const char *ret_val, tree t, formals_style s
{
case POINTER_TYPE:
if (TYPE_READONLY (t))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
if (TYPE_VOLATILE (t))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
- ret_val = concat ("*", ret_val, NULL);
+ ret_val = concat ("*", ret_val, (void *)0);
if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE || TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
- ret_val = concat ("(", ret_val, ")", NULL);
+ ret_val = concat ("(", ret_val, ")", (void *)0);
ret_val = gen_type (ret_val, TREE_TYPE (t), style);
@@ -326,17 +326,17 @@ gen_type (const char *ret_val, tree t, formals_style s
case ARRAY_TYPE:
if (!COMPLETE_TYPE_P (t) || TREE_CODE (TYPE_SIZE (t)) != INTEGER_CST)
- ret_val = gen_type (concat (ret_val, "[]", NULL),
+ ret_val = gen_type (concat (ret_val, "[]", (void *)0),
TREE_TYPE (t), style);
else if (int_size_in_bytes (t) == 0)
- ret_val = gen_type (concat (ret_val, "[0]", NULL),
+ ret_val = gen_type (concat (ret_val, "[0]", (void *)0),
TREE_TYPE (t), style);
else
{
int size = (int_size_in_bytes (t) / int_size_in_bytes (TREE_TYPE (t)));
char buff[10];
sprintf (buff, "[%d]", size);
- ret_val = gen_type (concat (ret_val, buff, NULL),
+ ret_val = gen_type (concat (ret_val, buff, (void *)0),
TREE_TYPE (t), style);
}
break;
@@ -344,7 +344,7 @@ gen_type (const char *ret_val, tree t, formals_style s
case FUNCTION_TYPE:
ret_val = gen_type (concat (ret_val,
gen_formal_list_for_type (t, style),
- NULL),
+ (void *)0),
TREE_TYPE (t), style);
break;
@@ -373,13 +373,13 @@ gen_type (const char *ret_val, tree t, formals_style s
while (chain_p)
{
data_type = concat (data_type, gen_decl (chain_p, 0, ansi),
- NULL);
+ (void *)0);
chain_p = TREE_CHAIN (chain_p);
- data_type = concat (data_type, "; ", NULL);
+ data_type = concat (data_type, "; ", (void *)0);
}
- data_type = concat ("{ ", data_type, "}", NULL);
+ data_type = concat ("{ ", data_type, "}", (void *)0);
}
- data_type = concat ("struct ", data_type, NULL);
+ data_type = concat ("struct ", data_type, (void *)0);
break;
case UNION_TYPE:
@@ -392,13 +392,13 @@ gen_type (const char *ret_val, tree t, formals_style s
while (chain_p)
{
data_type = concat (data_type, gen_decl (chain_p, 0, ansi),
- NULL);
+ (void *)0);
chain_p = TREE_CHAIN (chain_p);
- data_type = concat (data_type, "; ", NULL);
+ data_type = concat (data_type, "; ", (void *)0);
}
- data_type = concat ("{ ", data_type, "}", NULL);
+ data_type = concat ("{ ", data_type, "}", (void *)0);
}
- data_type = concat ("union ", data_type, NULL);
+ data_type = concat ("union ", data_type, (void *)0);
break;
case ENUMERAL_TYPE:
@@ -411,14 +411,14 @@ gen_type (const char *ret_val, tree t, formals_style s
while (chain_p)
{
data_type = concat (data_type,
- IDENTIFIER_POINTER (TREE_PURPOSE (chain_p)), NULL);
+ IDENTIFIER_POINTER (TREE_PURPOSE (chain_p)), (void *)0);
chain_p = TREE_CHAIN (chain_p);
if (chain_p)
- data_type = concat (data_type, ", ", NULL);
+ data_type = concat (data_type, ", ", (void *)0);
}
- data_type = concat ("{ ", data_type, " }", NULL);
+ data_type = concat ("{ ", data_type, " }", (void *)0);
}
- data_type = concat ("enum ", data_type, NULL);
+ data_type = concat ("enum ", data_type, (void *)0);
break;
case TYPE_DECL:
@@ -430,7 +430,7 @@ gen_type (const char *ret_val, tree t, formals_style s
/* Normally, `unsigned' is part of the deal. Not so if it comes
with a type qualifier. */
if (TYPE_UNSIGNED (t) && TYPE_QUALS (t))
- data_type = concat ("unsigned ", data_type, NULL);
+ data_type = concat ("unsigned ", data_type, (void *)0);
break;
case REAL_TYPE:
@@ -450,11 +450,11 @@ gen_type (const char *ret_val, tree t, formals_style s
}
}
if (TYPE_READONLY (t))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
if (TYPE_VOLATILE (t))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
if (TYPE_RESTRICT (t))
- ret_val = concat ("restrict ", ret_val, NULL);
+ ret_val = concat ("restrict ", ret_val, (void *)0);
return ret_val;
}
@@ -493,9 +493,9 @@ gen_decl (tree decl, int is_func_definition, formals_s
generate the qualifiers here. */
if (TREE_THIS_VOLATILE (decl))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
if (TREE_READONLY (decl))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
data_type = "";
@@ -514,7 +514,7 @@ gen_decl (tree decl, int is_func_definition, formals_s
if (TREE_CODE (decl) == FUNCTION_DECL && is_func_definition)
{
ret_val = concat (ret_val, gen_formal_list_for_func_def (decl, ansi),
- NULL);
+ (void *)0);
/* Since we have already added in the formals list stuff, here we don't
add the whole "type" of the function we are considering (which
@@ -531,11 +531,11 @@ gen_decl (tree decl, int is_func_definition, formals_s
ret_val = affix_data_type (ret_val);
if (TREE_CODE (decl) != FUNCTION_DECL && C_DECL_REGISTER (decl))
- ret_val = concat ("register ", ret_val, NULL);
+ ret_val = concat ("register ", ret_val, (void *)0);
if (TREE_PUBLIC (decl))
- ret_val = concat ("extern ", ret_val, NULL);
+ ret_val = concat ("extern ", ret_val, (void *)0);
if (TREE_CODE (decl) == FUNCTION_DECL && !TREE_PUBLIC (decl))
- ret_val = concat ("static ", ret_val, NULL);
+ ret_val = concat ("static ", ret_val, (void *)0);
return ret_val;
}

14
lang/gcc/4.2/patches/patch-gcc_c-common_c
View File

@ -1,17 +1,15 @@
$OpenBSD: patch-gcc_c-common_c,v 1.6 2009/04/16 18:36:48 espie Exp $
--- gcc/c-common.c.orig Wed Oct 10 22:46:11 2007
+++ gcc/c-common.c Tue Apr 7 19:38:58 2009
@@ -544,7 +544,9 @@ static tree handle_cleanup_attribute (tree *, tree, tr
$OpenBSD: patch-gcc_c-common_c,v 1.7 2012/02/22 07:48:10 ajacoutot Exp $
--- gcc/c-common.c.orig Wed Oct 10 16:46:11 2007
+++ gcc/c-common.c Thu Jan 5 23:06:40 2012
@@ -544,6 +544,7 @@ static tree handle_cleanup_attribute (tree *, tree, tr
static tree handle_warn_unused_result_attribute (tree *, tree, tree, int,
bool *);
static tree handle_sentinel_attribute (tree *, tree, tree, int, bool *);
+static tree handle_bounded_attribute (tree *, tree, tree, int, bool *);
+
static void check_function_nonnull (tree, tree);
static void check_nonnull_arg (void *, tree, unsigned HOST_WIDE_INT);
static bool nonnull_check_p (tree, unsigned HOST_WIDE_INT);
@@ -623,6 +625,8 @@ const struct attribute_spec c_common_attribute_table[]
@@ -623,6 +624,8 @@ const struct attribute_spec c_common_attribute_table[]
handle_deprecated_attribute },
{ "vector_size", 1, 1, false, true, false,
handle_vector_size_attribute },
@ -20,7 +18,7 @@ $OpenBSD: patch-gcc_c-common_c,v 1.6 2009/04/16 18:36:48 espie Exp $
{ "visibility", 1, 1, false, false, false,
handle_visibility_attribute },
{ "tls_model", 1, 1, true, false, false,
@@ -5634,6 +5638,15 @@ handle_warn_unused_result_attribute (tree *node, tree
@@ -5634,6 +5637,15 @@ handle_warn_unused_result_attribute (tree *node, tree
}
return NULL_TREE;

30
lang/gcc/4.2/patches/patch-gcc_c-incpath_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-gcc_c-incpath_c,v 1.4 2007/03/20 10:48:52 espie Exp $
--- gcc/c-incpath.c.orig Fri May 19 00:16:23 2006
+++ gcc/c-incpath.c Sun Mar 18 23:58:42 2007
@@ -145,9 +145,9 @@ add_standard_paths (const char *sysroot, const char *i
continue;
if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
{
- char *str = concat (iprefix, p->fname + len, NULL);
+ char *str = concat (iprefix, p->fname + len, (void *)0);
if (p->multilib && imultilib)
- str = concat (str, dir_separator_str, imultilib, NULL);
+ str = concat (str, dir_separator_str, imultilib, (void *)0);
add_path (str, SYSTEM, p->cxx_aware, false);
}
}
@@ -162,12 +162,12 @@ add_standard_paths (const char *sysroot, const char *i
/* Should this directory start with the sysroot? */
if (sysroot && p->add_sysroot)
- str = concat (sysroot, p->fname, NULL);
+ str = concat (sysroot, p->fname, (void *)0);
else
str = update_path (p->fname, p->component);
if (p->multilib && imultilib)
- str = concat (str, dir_separator_str, imultilib, NULL);
+ str = concat (str, dir_separator_str, imultilib, (void *)0);
add_path (str, SYSTEM, p->cxx_aware, false);
}

76
lang/gcc/4.2/patches/patch-gcc_collect2_c
View File

@ -1,76 +0,0 @@
$OpenBSD: patch-gcc_collect2_c,v 1.5 2009/04/16 18:36:48 espie Exp $
--- gcc/collect2.c.orig Mon Dec 31 17:04:26 2007
+++ gcc/collect2.c Tue Apr 7 19:38:58 2009
@@ -756,19 +756,19 @@ main (int argc, char **argv)
qualify the program name with the target machine. */
const char *const full_ld_suffix =
- concat(target_machine, "-", ld_suffix, NULL);
+ concat(target_machine, "-", ld_suffix, (char *)0);
const char *const full_nm_suffix =
- concat (target_machine, "-", nm_suffix, NULL);
+ concat (target_machine, "-", nm_suffix, (char *)0);
const char *const full_gnm_suffix =
- concat (target_machine, "-", gnm_suffix, NULL);
+ concat (target_machine, "-", gnm_suffix, (char *)0);
#ifdef LDD_SUFFIX
const char *const full_ldd_suffix =
- concat (target_machine, "-", ldd_suffix, NULL);
+ concat (target_machine, "-", ldd_suffix, (char *)0);
#endif
const char *const full_strip_suffix =
- concat (target_machine, "-", strip_suffix, NULL);
+ concat (target_machine, "-", strip_suffix, (char *)0);
const char *const full_gstrip_suffix =
- concat (target_machine, "-", gstrip_suffix, NULL);
+ concat (target_machine, "-", gstrip_suffix, (char *)0);
#else
const char *const full_ld_suffix = ld_suffix;
const char *const full_nm_suffix = nm_suffix;
@@ -961,7 +961,7 @@ main (int argc, char **argv)
if (c_file_name == 0)
{
#ifdef CROSS_COMPILE
- c_file_name = concat (target_machine, "-gcc", NULL);
+ c_file_name = concat (target_machine, "-gcc", (char *)0);
#else
c_file_name = "gcc";
#endif
@@ -1239,7 +1239,7 @@ main (int argc, char **argv)
if (exports.first)
{
- char *buf = concat ("-bE:", export_file, NULL);
+ char *buf = concat ("-bE:", export_file, (char *)0);
*ld1++ = buf;
*ld2++ = buf;
@@ -1404,7 +1404,7 @@ main (int argc, char **argv)
/* Tell the linker that we have initializer and finalizer functions. */
#ifdef LD_INIT_SWITCH
#ifdef COLLECT_EXPORT_LIST
- *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, NULL);
+ *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, (char *)0);
#else
*ld2++ = LD_INIT_SWITCH;
*ld2++ = initname;
@@ -1419,7 +1419,7 @@ main (int argc, char **argv)
/* If we did not add export flag to link arguments before, add it to
second link phase now. No new exports should have been added. */
if (! exports.first)
- *ld2++ = concat ("-bE:", export_file, NULL);
+ *ld2++ = concat ("-bE:", export_file, (char *)0);
#ifndef LD_INIT_SWITCH
add_to_list (&exports, initname);
@@ -1814,8 +1814,8 @@ write_c_file_stat (FILE *stream, const char *name ATTR
notice ("\nwrite_c_file - output name is %s, prefix is %s\n",
output_file, prefix);
- initname = concat ("_GLOBAL__FI_", prefix, NULL);
- fininame = concat ("_GLOBAL__FD_", prefix, NULL);
+ initname = concat ("_GLOBAL__FI_", prefix, (char *)0);
+ fininame = concat ("_GLOBAL__FD_", prefix, (char *)0);
free (prefix);

20
lang/gcc/4.2/patches/patch-gcc_config_i386_driver-i386_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-gcc_config_i386_driver-i386_c,v 1.6 2009/04/16 18:36:48 espie Exp $
--- gcc/config/i386/driver-i386.c.orig Thu Nov 8 11:07:06 2007
+++ gcc/config/i386/driver-i386.c Tue Apr 7 19:38:59 2009
@@ -268,7 +268,7 @@ const char *host_detect_local_cpu (int argc, const cha
}
done:
- return concat ("-m", argv[0], "=", cpu, NULL);
+ return concat ("-m", argv[0], "=", cpu, (void *)0);
}
#else
/* If we aren't compiling with GCC we just provide a minimal
@@ -294,6 +294,6 @@ const char *host_detect_local_cpu (int argc, const cha
else
cpu = "generic";
- return concat ("-m", argv[0], "=", cpu, NULL);
+ return concat ("-m", argv[0], "=", cpu, (void *)0);
}
#endif /* __GNUC__ */

12
lang/gcc/4.2/patches/patch-gcc_coverage_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_coverage_c,v 1.4 2009/04/16 18:36:48 espie Exp $
--- gcc/coverage.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/coverage.c Tue Apr 7 19:38:59 2009
@@ -806,7 +806,7 @@ build_gcov_info (void)
fields = field;
filename = getpwd ();
filename = (filename && da_file_name[0] != '/'
- ? concat (filename, "/", da_file_name, NULL)
+ ? concat (filename, "/", da_file_name, (void *)0)
: da_file_name);
filename_len = strlen (filename);
filename_string = build_string (filename_len + 1, filename);

21
lang/gcc/4.2/patches/patch-gcc_cp_call_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-gcc_cp_call_c,v 1.6 2009/04/16 18:36:48 espie Exp $
--- gcc/cp/call.c.orig Mon Jan 28 17:18:56 2008
+++ gcc/cp/call.c Tue Apr 7 19:38:59 2009
@@ -5318,7 +5318,7 @@ name_as_c_string (tree name, tree type, bool *free_p)
|| name == base_dtor_identifier
|| name == deleting_dtor_identifier)
{
- pretty_name = concat ("~", pretty_name, NULL);
+ pretty_name = concat ("~", pretty_name, (void *)0);
/* Remember that we need to free the memory allocated. */
*free_p = true;
}
@@ -5328,7 +5328,7 @@ name_as_c_string (tree name, tree type, bool *free_p)
pretty_name = concat ("operator ",
type_as_string (TREE_TYPE (name),
TFF_PLAIN_IDENTIFIER),
- NULL);
+ (void *)0);
/* Remember that we need to free the memory allocated. */
*free_p = true;
}

12
lang/gcc/4.2/patches/patch-gcc_cp_decl2_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_cp_decl2_c,v 1.7 2009/04/16 18:36:48 espie Exp $
--- gcc/cp/decl2.c.orig Tue Feb 12 07:37:34 2008
+++ gcc/cp/decl2.c Tue Apr 7 19:38:59 2009
@@ -3018,7 +3018,7 @@ build_java_method_aliases (void)
oid = DECL_ASSEMBLER_NAME (fndecl);
oname = IDENTIFIER_POINTER (oid);
gcc_assert (oname[0] == '_' && oname[1] == 'Z');
- nname = ACONCAT (("_ZGA", oname+2, NULL));
+ nname = ACONCAT (("_ZGA", oname+2, (char *)0));
nid = get_identifier (nname);
alias = make_alias_for (fndecl, nid);

12
lang/gcc/4.2/patches/patch-gcc_cp_parser_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_cp_parser_c,v 1.7 2009/04/16 18:36:48 espie Exp $
--- gcc/cp/parser.c.orig Sun May 11 21:58:40 2008
+++ gcc/cp/parser.c Tue Apr 7 19:38:59 2009
@@ -16522,7 +16522,7 @@ cp_parser_require (cp_parser* parser,
/* Output the MESSAGE -- unless we're parsing tentatively. */
if (!cp_parser_simulate_error (parser))
{
- char *message = concat ("expected ", token_desc, NULL);
+ char *message = concat ("expected ", token_desc, (void *)0);
cp_parser_error (parser, message);
free (message);
}

12
lang/gcc/4.2/patches/patch-gcc_dbxout_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_dbxout_c,v 1.4 2009/04/16 18:36:48 espie Exp $
--- gcc/dbxout.c.orig Mon Sep 24 11:17:10 2007
+++ gcc/dbxout.c Tue Apr 7 19:38:59 2009
@@ -1007,7 +1007,7 @@ dbxout_init (const char *input_file_name)
if (cwd[0] == '\0')
cwd = "/";
else if (!IS_DIR_SEPARATOR (cwd[strlen (cwd) - 1]))
- cwd = concat (cwd, "/", NULL);
+ cwd = concat (cwd, "/", (void *)0);
}
#ifdef DBX_OUTPUT_MAIN_SOURCE_DIRECTORY
DBX_OUTPUT_MAIN_SOURCE_DIRECTORY (asm_out_file, cwd);

12
lang/gcc/4.2/patches/patch-gcc_diagnostic_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_diagnostic_c,v 1.5 2009/04/16 18:36:48 espie Exp $
--- gcc/diagnostic.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/diagnostic.c Tue Apr 7 19:38:59 2009
@@ -397,7 +397,7 @@ diagnostic_report_diagnostic (diagnostic_context *cont
if (context->show_option_requested && diagnostic->option_index)
diagnostic->message.format_spec
= ACONCAT ((diagnostic->message.format_spec,
- " [", cl_options[diagnostic->option_index].opt_text, "]", NULL));
+ " [", cl_options[diagnostic->option_index].opt_text, "]", (char *)0));
diagnostic->message.locus = &diagnostic->location;
pp_format (context->printer, &diagnostic->message);

200
lang/gcc/4.2/patches/patch-gcc_gcc_c
View File

@ -1,200 +0,0 @@
$OpenBSD: patch-gcc_gcc_c,v 1.5 2009/04/16 18:36:48 espie Exp $
--- gcc/gcc.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/gcc.c Tue Apr 7 19:38:59 2009
@@ -1312,7 +1312,7 @@ translate_options (int *argcp, const char *const **arg
/* Store the translation as one argv elt or as two. */
if (arg != 0 && strchr (arginfo, 'j') != 0)
newv[newindex++] = concat (option_map[j].equivalent, arg,
- NULL);
+ (void *)0);
else if (arg != 0)
{
newv[newindex++] = option_map[j].equivalent;
@@ -1641,7 +1641,7 @@ init_gcc_specs (struct obstack *obstack, const char *s
"%{shared:", shared_name, "}"
#endif
#endif
- "}}", NULL);
+ "}}", (void *)0);
obstack_grow (obstack, buf, strlen (buf));
free (buf);
@@ -1839,7 +1839,7 @@ set_spec (const char *name, const char *spec)
old_spec = *(sl->ptr_spec);
*(sl->ptr_spec) = ((spec[0] == '+' && ISSPACE ((unsigned char)spec[1]))
- ? concat (old_spec, spec + 1, NULL)
+ ? concat (old_spec, spec + 1, (void *)0)
: xstrdup (spec));
#ifdef DEBUG_SPECS
@@ -2409,12 +2409,12 @@ for_each_path (const struct path_prefix *paths,
just_multi_suffix = just_machine_suffix;
if (do_multi && multilib_dir && strcmp (multilib_dir, ".") != 0)
{
- multi_dir = concat (multilib_dir, dir_separator_str, NULL);
- multi_suffix = concat (multi_suffix, multi_dir, NULL);
- just_multi_suffix = concat (just_multi_suffix, multi_dir, NULL);
+ multi_dir = concat (multilib_dir, dir_separator_str, (void *)0);
+ multi_suffix = concat (multi_suffix, multi_dir, (void *)0);
+ just_multi_suffix = concat (just_multi_suffix, multi_dir, (void *)0);
}
if (do_multi && multilib_os_dir && strcmp (multilib_os_dir, ".") != 0)
- multi_os_dir = concat (multilib_os_dir, dir_separator_str, NULL);
+ multi_os_dir = concat (multilib_os_dir, dir_separator_str, (void *)0);
while (1)
{
@@ -2760,8 +2760,8 @@ add_sysrooted_prefix (struct path_prefix *pprefix, con
if (target_system_root)
{
if (target_sysroot_suffix)
- prefix = concat (target_sysroot_suffix, prefix, NULL);
- prefix = concat (target_system_root, prefix, NULL);
+ prefix = concat (target_sysroot_suffix, prefix, (void *)0);
+ prefix = concat (target_system_root, prefix, (void *)0);
/* We have to override this because GCC's notion of sysroot
moves along with GCC. */
@@ -3343,7 +3343,7 @@ process_command (int argc, const char **argv)
break;
new_argv0 = xmemdup (progname, baselen,
baselen + concat_length (new_version, new_machine,
- "-gcc-", NULL) + 1);
+ "-gcc-", (void *)0) + 1);
strcpy (new_argv0 + baselen, new_machine);
strcat (new_argv0, "-gcc-");
strcat (new_argv0, new_version);
@@ -3370,7 +3370,7 @@ process_command (int argc, const char **argv)
standard_bindir_prefix,
standard_libexec_prefix);
if (gcc_exec_prefix)
- putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL));
+ putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, (void *)0));
}
else
{
@@ -3378,7 +3378,7 @@ process_command (int argc, const char **argv)
GCC_EXEC_PREFIX is typically a directory name with a trailing
/ (which is ignored by make_relative_prefix), so append a
program name. */
- char *tmp_prefix = concat (gcc_exec_prefix, "gcc", NULL);
+ char *tmp_prefix = concat (gcc_exec_prefix, "gcc", (void *)0);
gcc_libexec_prefix = make_relative_prefix (tmp_prefix,
standard_exec_prefix,
standard_libexec_prefix);
@@ -3425,7 +3425,7 @@ process_command (int argc, const char **argv)
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3459,7 +3459,7 @@ process_command (int argc, const char **argv)
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3492,7 +3492,7 @@ process_command (int argc, const char **argv)
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3960,7 +3960,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
PREFIX_PRIORITY_LAST, 1, 0);
tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
- dir_separator_str, NULL);
+ dir_separator_str, (void *)0);
/* If tooldir is relative, base it on exec_prefixes. A relative
tooldir lets us move the installed tree as a unit.
@@ -3975,28 +3975,28 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
{
char *gcc_exec_tooldir_prefix
= concat (gcc_exec_prefix, spec_machine, dir_separator_str,
- spec_version, dir_separator_str, tooldir_prefix, NULL);
+ spec_version, dir_separator_str, tooldir_prefix, (void *)0);
add_prefix (&exec_prefixes,
concat (gcc_exec_tooldir_prefix, "bin",
- dir_separator_str, NULL),
+ dir_separator_str, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 0);
add_prefix (&startfile_prefixes,
concat (gcc_exec_tooldir_prefix, "lib",
- dir_separator_str, NULL),
+ dir_separator_str, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
}
tooldir_prefix = concat (standard_exec_prefix, spec_machine,
dir_separator_str, spec_version,
- dir_separator_str, tooldir_prefix, NULL);
+ dir_separator_str, tooldir_prefix, (void *)0);
}
add_prefix (&exec_prefixes,
- concat (tooldir_prefix, "bin", dir_separator_str, NULL),
+ concat (tooldir_prefix, "bin", dir_separator_str, (void *)0),
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 0);
add_prefix (&startfile_prefixes,
- concat (tooldir_prefix, "lib", dir_separator_str, NULL),
+ concat (tooldir_prefix, "lib", dir_separator_str, (void *)0),
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
#if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
@@ -4120,7 +4120,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
{ /* POSIX allows separation of -l and the lib arg;
canonicalize by concatenating -l with its arg */
infiles[n_infiles].language = "*";
- infiles[n_infiles++].name = concat ("-l", argv[++i], NULL);
+ infiles[n_infiles++].name = concat ("-l", argv[++i], (void *)0);
}
else if (strncmp (argv[i], "-l", 2) == 0)
{
@@ -6201,8 +6201,8 @@ main (int argc, char **argv)
/* Read specs from a file if there is one. */
machine_suffix = concat (spec_machine, dir_separator_str,
- spec_version, dir_separator_str, NULL);
- just_machine_suffix = concat (spec_machine, dir_separator_str, NULL);
+ spec_version, dir_separator_str, (void *)0);
+ just_machine_suffix = concat (spec_machine, dir_separator_str, (void *)0);
specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, true);
/* Read the specs file unless it is a default one. */
@@ -6316,12 +6316,12 @@ main (int argc, char **argv)
if (gcc_exec_prefix)
add_prefix (&startfile_prefixes,
concat (gcc_exec_prefix, machine_suffix,
- standard_startfile_prefix, NULL),
+ standard_startfile_prefix, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
add_prefix (&startfile_prefixes,
concat (standard_exec_prefix,
machine_suffix,
- standard_startfile_prefix, NULL),
+ standard_startfile_prefix, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
}
@@ -6347,7 +6347,7 @@ main (int argc, char **argv)
/* If we have a GCC_EXEC_PREFIX envvar, modify it for cpp's sake. */
if (gcc_exec_prefix)
gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
- spec_version, dir_separator_str, NULL);
+ spec_version, dir_separator_str, (void *)0);
/* Now we have the specs.
Set the `valid' bits for switches that match anything in any spec. */

21
lang/gcc/4.2/patches/patch-gcc_gensupport_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-gcc_gensupport_c,v 1.2 2009/04/16 18:36:48 espie Exp $
--- gcc/gensupport.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/gensupport.c Tue Apr 7 19:38:59 2009
@@ -219,7 +219,7 @@ process_include (rtx desc, int lineno)
{
static const char sep[2] = { DIR_SEPARATOR, '\0' };
- pathname = concat (stackp->fname, sep, filename, NULL);
+ pathname = concat (stackp->fname, sep, filename, (void *)0);
input_file = fopen (pathname, "r");
if (input_file != NULL)
goto success;
@@ -228,7 +228,7 @@ process_include (rtx desc, int lineno)
}
if (base_dir)
- pathname = concat (base_dir, filename, NULL);
+ pathname = concat (base_dir, filename, (void *)0);
else
pathname = xstrdup (filename);
input_file = fopen (pathname, "r");

12
lang/gcc/4.2/patches/patch-gcc_objc_objc-act_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_objc_objc-act_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/objc/objc-act.c.orig Tue Jun 6 12:22:54 2006
+++ gcc/objc/objc-act.c Sun Jul 23 11:24:02 2006
@@ -494,7 +494,7 @@ objc_init (void)
/* If gen_declaration desired, open the output file. */
if (flag_gen_declaration)
{
- register char * const dumpname = concat (dump_base_name, ".decl", NULL);
+ register char * const dumpname = concat (dump_base_name, ".decl", (void *)0);
gen_declaration_file = fopen (dumpname, "w");
if (gen_declaration_file == 0)
fatal_error ("can't open %s: %m", dumpname);

12
lang/gcc/4.2/patches/patch-gcc_omp-low_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_omp-low_c,v 1.6 2009/04/16 18:36:48 espie Exp $
--- gcc/omp-low.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/omp-low.c Tue Apr 7 19:38:59 2009
@@ -3933,7 +3933,7 @@ lower_omp_critical (tree *stmt_p, omp_context *ctx)
decl = create_tmp_var_raw (ptr_type_node, NULL);
new_str = ACONCAT ((".gomp_critical_user_",
- IDENTIFIER_POINTER (name), NULL));
+ IDENTIFIER_POINTER (name), (void *)0));
DECL_NAME (decl) = get_identifier (new_str);
TREE_PUBLIC (decl) = 1;
TREE_STATIC (decl) = 1;

23
lang/gcc/4.2/patches/patch-gcc_passes_c
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-gcc_passes_c,v 1.4 2007/03/20 10:48:52 espie Exp $
--- gcc/passes.c.orig Tue Jan 30 14:34:10 2007
+++ gcc/passes.c Sun Mar 18 23:58:45 2007
@@ -317,7 +317,7 @@ register_one_dump_file (struct tree_opt_pass *pass, bo
sprintf (num, "%d", ((int) pass->static_pass_number < 0
? 1 : pass->static_pass_number));
- dot_name = concat (".", pass->name, num, NULL);
+ dot_name = concat (".", pass->name, num, (void *)0);
if (ipa)
prefix = "ipa-", flags = TDF_IPA;
else if (properties & PROP_trees)
@@ -325,8 +325,8 @@ register_one_dump_file (struct tree_opt_pass *pass, bo
else
prefix = "rtl-", flags = TDF_RTL;
- flag_name = concat (prefix, pass->name, num, NULL);
- glob_name = concat (prefix, pass->name, NULL);
+ flag_name = concat (prefix, pass->name, num, (void *)0);
+ glob_name = concat (prefix, pass->name, (void *)0);
pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
flags, pass->letter);
}

35
lang/gcc/4.2/patches/patch-gcc_prefix_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-gcc_prefix_c,v 1.3 2009/04/16 18:36:48 espie Exp $
--- gcc/prefix.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/prefix.c Tue Apr 7 19:38:59 2009
@@ -98,7 +98,7 @@ get_key_value (char *key)
#endif
if (prefix == 0)
- prefix = getenv (temp = concat (key, "_ROOT", NULL));
+ prefix = getenv (temp = concat (key, "_ROOT", (void *)0));
if (prefix == 0)
prefix = std_prefix;
@@ -222,7 +222,7 @@ translate_name (char *name)
together. */
old_name = name;
- name = concat (prefix, &name[keylen + 1], NULL);
+ name = concat (prefix, &name[keylen + 1], (void *)0);
free (old_name);
}
@@ -260,11 +260,11 @@ update_path (const char *path, const char *key)
if (key[0] != '$')
{
- key = concat ("@", key, NULL);
+ key = concat ("@", key, (void *)0);
free_key = true;
}
- result = concat (key, &path[len], NULL);
+ result = concat (key, &path[len], (void *)0);
if (free_key)
free ((char *) key);
result = translate_name (result);

12
lang/gcc/4.2/patches/patch-gcc_read-rtl_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_read-rtl_c,v 1.3 2009/04/16 18:36:48 espie Exp $
--- gcc/read-rtl.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/read-rtl.c Tue Apr 7 19:38:59 2009
@@ -783,7 +783,7 @@ join_c_conditions (const char *cond1, const char *cond
if (cond2 == 0 || cond2[0] == 0)
return cond1;
- result = concat ("(", cond1, ") && (", cond2, ")", NULL);
+ result = concat ("(", cond1, ") && (", cond2, ")", (void *)0);
obstack_ptr_grow (&joined_conditions_obstack, result);
obstack_ptr_grow (&joined_conditions_obstack, cond1);
obstack_ptr_grow (&joined_conditions_obstack, cond2);

12
lang/gcc/4.2/patches/patch-gcc_tree-complex_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-complex_c,v 1.3 2009/04/16 18:36:48 espie Exp $
--- gcc/tree-complex.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/tree-complex.c Tue Apr 7 19:38:59 2009
@@ -396,7 +396,7 @@ create_one_component_var (tree type, tree orig, const
const char *name = IDENTIFIER_POINTER (DECL_NAME (orig));
tree inner_type;
- DECL_NAME (r) = get_identifier (ACONCAT ((name, suffix, NULL)));
+ DECL_NAME (r) = get_identifier (ACONCAT ((name, suffix, (char *)0)));
inner_type = TREE_TYPE (TREE_TYPE (orig));
SET_DECL_DEBUG_EXPR (r, build1 (code, type, orig));

12
lang/gcc/4.2/patches/patch-gcc_tree-dump_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-dump_c,v 1.5 2009/04/16 18:36:48 espie Exp $
--- gcc/tree-dump.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/tree-dump.c Tue Apr 7 19:38:59 2009
@@ -866,7 +866,7 @@ get_dump_file_name (enum tree_dump_index phase)
dump_id[0] = '\0';
}
- return concat (dump_base_name, dump_id, dfi->suffix, NULL);
+ return concat (dump_base_name, dump_id, dfi->suffix, (void *)0);
}
/* Begin a tree dump for PHASE. Stores any user supplied flag in

12
lang/gcc/4.2/patches/patch-gcc_tree-mudflap_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-mudflap_c,v 1.5 2009/04/16 18:36:48 espie Exp $
--- gcc/tree-mudflap.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/tree-mudflap.c Tue Apr 7 19:38:59 2009
@@ -235,7 +235,7 @@ mf_file_function_line_tree (location_t location)
else
op = name = cp = "";
- string = concat (file, colon, line, op, name, cp, NULL);
+ string = concat (file, colon, line, op, name, cp, (void *)0);
result = mf_build_string (string);
free (string);

12
lang/gcc/4.2/patches/patch-gcc_tree-nested_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-nested_c,v 1.6 2009/04/16 18:36:48 espie Exp $
--- gcc/tree-nested.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/tree-nested.c Tue Apr 7 19:38:59 2009
@@ -221,7 +221,7 @@ get_frame_type (struct nesting_info *info)
name = concat ("FRAME.",
IDENTIFIER_POINTER (DECL_NAME (info->context)),
- NULL);
+ (void *)0);
TYPE_NAME (type) = get_identifier (name);
free (name);

12
lang/gcc/4.2/patches/patch-gcc_tree-vect-transform_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-vect-transform_c,v 1.5 2009/04/16 18:36:48 espie Exp $
--- gcc/tree-vect-transform.c.orig Sat Sep 1 17:28:30 2007
+++ gcc/tree-vect-transform.c Tue Apr 7 19:38:59 2009
@@ -104,7 +104,7 @@ vect_get_new_vect_var (tree type, enum vect_var_kind v
}
if (name)
- new_vect_var = create_tmp_var (type, concat (prefix, name, NULL));
+ new_vect_var = create_tmp_var (type, concat (prefix, name, (void *)0));
else
new_vect_var = create_tmp_var (type, prefix);

17
lang/gcc/4.2/patches/patch-gcc_tree_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-gcc_tree_c,v 1.6 2009/04/16 18:36:48 espie Exp $
--- gcc/tree.c.orig Sat Feb 2 21:42:10 2008
+++ gcc/tree.c Tue Apr 7 19:38:59 2009
@@ -6805,11 +6805,11 @@ build_common_builtin_nodes (void)
*q = TOLOWER (*p);
*q = '\0';
- built_in_names[mcode] = concat ("__mul", mode_name_buf, "3", NULL);
+ built_in_names[mcode] = concat ("__mul", mode_name_buf, "3", (void *)0);
local_define_builtin (built_in_names[mcode], ftype, mcode,
built_in_names[mcode], ECF_CONST | ECF_NOTHROW);
- built_in_names[dcode] = concat ("__div", mode_name_buf, "3", NULL);
+ built_in_names[dcode] = concat ("__div", mode_name_buf, "3", (void *)0);
local_define_builtin (built_in_names[dcode], ftype, dcode,
built_in_names[dcode], ECF_CONST | ECF_NOTHROW);
}

12
lang/gcc/4.2/patches/patch-gcc_varasm_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_varasm_c,v 1.4 2009/04/16 18:36:48 espie Exp $
--- gcc/varasm.c.orig Sat Feb 2 02:42:03 2008
+++ gcc/varasm.c Tue Apr 7 19:39:00 2009
@@ -396,7 +396,7 @@ initialize_cold_section_name (void)
stripped_name = targetm.strip_name_encoding (name);
- buffer = ACONCAT ((stripped_name, "_unlikely", NULL));
+ buffer = ACONCAT ((stripped_name, "_unlikely", (char *)0));
cfun->unlikely_text_section_name = ggc_strdup (buffer);
}
else

100
lang/gcc/4.3/patches/keep
View File

@ -1,100 +0,0 @@
$OpenBSD: keep,v 1.1.1.1 2007/03/17 22:35:25 espie Exp $
--- gcc/c-format.c.orig Mon Mar 27 10:35:04 2006
+++ gcc/c-format.c Mon Mar 27 10:56:06 2006
@@ -62,6 +62,7 @@ enum format_type { printf_format_type, a
gcc_cdiag_format_type,
gcc_cxxdiag_format_type, gcc_gfc_format_type,
scanf_format_type, strftime_format_type,
+ kprintf_format_type, syslog_format_type,
strfmon_format_type, format_type_error = -1};
typedef struct function_format_info
@@ -294,6 +295,15 @@ static const format_length_info printf_l
{ NULL, 0, 0, NULL, 0, 0 }
};
+static const format_length_info kprintf_length_specs[] =
+{
+ { "h", FMT_LEN_h, STD_C89, NULL, 0, 0 },
+ { "l", FMT_LEN_l, STD_C89, "ll", FMT_LEN_ll, STD_C9L },
+ { "q", FMT_LEN_ll, STD_EXT, NULL, 0, 0 },
+ { "L", FMT_LEN_L, STD_C89, NULL, 0, 0 },
+ { NULL, 0, 0, NULL, 0, 0 }
+};
+
/* Length specifiers valid for asm_fprintf. */
static const format_length_info asm_fprintf_length_specs[] =
{
@@ -509,6 +519,24 @@ static const format_char_info print_char
{ NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
};
+static const format_char_info kprint_char_table[] =
+{
+ /* C89 conversion specifiers. */
+ { "di", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM }, "-wp0 +'I", "i", NULL },
+ { "oxX", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0#", "i", NULL },
+ { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0'I", "i", NULL },
+ { "c", 0, STD_C89, { T89_I, BADLEN, BADLEN, T94_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL },
+ { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR", NULL },
+ { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "c", NULL },
+/* Kernel bitmap formatting */
+ { "b", 1, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "", NULL },
+/* Kernel recursive format */
+ { ":", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "", NULL },
+/* Kernel debugger auto-radix printing */
+ { "nrz", 0, STD_C89, { T89_I, T89_I, T89_I, T89_L, T9L_LL, TEX_LL, BADLEN, BADLEN, BADLEN }, "-wp0# +", "", NULL },
+ { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
+};
+
static const format_char_info asm_fprintf_char_table[] =
{
/* C89 conversion specifiers. */
@@ -641,6 +669,28 @@ static const format_char_info gcc_gfc_ch
{ NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
};
+static const format_char_info syslog_char_table[] =
+{
+ /* C89 conversion specifiers. */
+ { "di", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM }, "-wp0 +'I", "i", NULL },
+ { "oxX", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0#", "i", NULL },
+ { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0'I", "i", NULL },
+ { "fgG", 0, STD_C89, { T89_D, BADLEN, BADLEN, T99_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#'", "", NULL },
+ { "eE", 0, STD_C89, { T89_D, BADLEN, BADLEN, T99_D, BADLEN, T89_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "", NULL },
+ { "c", 0, STD_C89, { T89_I, BADLEN, BADLEN, T94_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL },
+ { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR", NULL },
+ { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "c" , NULL },
+ { "n", 1, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, BADLEN, T99_SST, T99_PD, T99_IM }, "", "W", NULL },
+ /* C99 conversion specifiers. */
+ { "F", 0, STD_C99, { T99_D, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#'", "", NULL },
+ { "aA", 0, STD_C99, { T99_D, BADLEN, BADLEN, T99_D, BADLEN, T99_LD, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "", NULL },
+ /* X/Open conversion specifiers. */
+ { "C", 0, STD_EXT, { TEX_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL },
+ { "S", 1, STD_EXT, { TEX_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "R", NULL },
+ { "m", 0, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "", NULL },
+ { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
+};
+
static const format_char_info scan_char_table[] =
{
/* C89 conversion specifiers. */
@@ -698,6 +748,18 @@ static const format_char_info monetary_c
static const format_kind_info format_types_orig[] =
{
{ "printf", printf_length_specs, print_char_table, " +#0-'I", NULL,
+ printf_flag_specs, printf_flag_pairs,
+ FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
+ 'w', 0, 'p', 0, 'L',
+ &integer_type_node, &integer_type_node
+ },
+ { "kprintf", kprintf_length_specs, kprint_char_table, " +#0-'I", NULL,
+ printf_flag_specs, printf_flag_pairs,
+ FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
+ 'w', 0, 'p', 0, 'L',
+ &integer_type_node, &integer_type_node
+ },
+ { "syslog", printf_length_specs, syslog_char_table, " +#0-'I", NULL,
printf_flag_specs, printf_flag_pairs,
FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
'w', 0, 'p', 0, 'L',

52
lang/gcc/4.3/patches/patch-gcc_builtins_c
View File

@ -1,52 +0,0 @@
$OpenBSD: patch-gcc_builtins_c,v 1.1.1.1 2007/03/17 22:35:25 espie Exp $
--- gcc/builtins.c.orig Wed Feb 28 20:21:20 2007
+++ gcc/builtins.c Mon Mar 12 11:37:52 2007
@@ -12218,13 +12218,13 @@ do_mpfr_arg2 (tree arg1, tree arg2, tree
int inexact;
mpfr_t m1, m2;
- mpfr_inits2 (prec, m1, m2, NULL);
+ mpfr_inits2 (prec, m1, m2, (void *)0);
mpfr_from_real (m1, ra1);
mpfr_from_real (m2, ra2);
mpfr_clear_flags ();
inexact = func (m1, m1, m2, GMP_RNDN);
result = do_mpfr_ckconv (m1, type, inexact);
- mpfr_clears (m1, m2, NULL);
+ mpfr_clears (m1, m2, (void *)0);
}
}
@@ -12266,14 +12266,14 @@ do_mpfr_arg3 (tree arg1, tree arg2, tree
int inexact;
mpfr_t m1, m2, m3;
- mpfr_inits2 (prec, m1, m2, m3, NULL);
+ mpfr_inits2 (prec, m1, m2, m3, (void *)0);
mpfr_from_real (m1, ra1);
mpfr_from_real (m2, ra2);
mpfr_from_real (m3, ra3);
mpfr_clear_flags ();
inexact = func (m1, m1, m2, m3, GMP_RNDN);
result = do_mpfr_ckconv (m1, type, inexact);
- mpfr_clears (m1, m2, m3, NULL);
+ mpfr_clears (m1, m2, m3, (void *)0);
}
}
@@ -12310,13 +12310,13 @@ do_mpfr_sincos (tree arg, tree arg_sinp,
int inexact;
mpfr_t m, ms, mc;
- mpfr_inits2 (prec, m, ms, mc, NULL);
+ mpfr_inits2 (prec, m, ms, mc, (void *)0);
mpfr_from_real (m, ra);
mpfr_clear_flags ();
inexact = mpfr_sin_cos (ms, mc, m, GMP_RNDN);
result_s = do_mpfr_ckconv (ms, type, inexact);
result_c = do_mpfr_ckconv (mc, type, inexact);
- mpfr_clears (m, ms, mc, NULL);
+ mpfr_clears (m, ms, mc, (void *)0);
if (result_s && result_c)
{
/* If we are to return in a complex value do so. */

245
lang/gcc/4.3/patches/patch-gcc_c-aux-info_c
View File

@ -1,245 +0,0 @@
$OpenBSD: patch-gcc_c-aux-info_c,v 1.1.1.1 2007/03/17 22:35:25 espie Exp $
--- gcc/c-aux-info.c.orig Fri May 19 00:16:23 2006
+++ gcc/c-aux-info.c Sun Jul 23 11:25:55 2006
@@ -91,14 +91,14 @@ affix_data_type (const char *param)
add a blank after the data-type of course. */
if (p == type_or_decl)
- return concat (data_type, " ", type_or_decl, NULL);
+ return concat (data_type, " ", type_or_decl, (void *)0);
saved = *p;
*p = '\0';
- qualifiers_then_data_type = concat (type_or_decl, data_type, NULL);
+ qualifiers_then_data_type = concat (type_or_decl, data_type, (void *)0);
*p = saved;
return reconcat (qualifiers_then_data_type,
- qualifiers_then_data_type, " ", p, NULL);
+ qualifiers_then_data_type, " ", p, (void *)0);
}
/* Given a tree node which represents some "function type", generate the
@@ -123,13 +123,13 @@ gen_formal_list_for_type (tree fntype, f
const char *this_type;
if (*formal_list)
- formal_list = concat (formal_list, ", ", NULL);
+ formal_list = concat (formal_list, ", ", (void *)0);
this_type = gen_type ("", TREE_VALUE (formal_type), ansi);
formal_list
= ((strlen (this_type))
- ? concat (formal_list, affix_data_type (this_type), NULL)
- : concat (formal_list, data_type, NULL));
+ ? concat (formal_list, affix_data_type (this_type), (void *)0)
+ : concat (formal_list, data_type, (void *)0));
formal_type = TREE_CHAIN (formal_type);
}
@@ -178,10 +178,10 @@ gen_formal_list_for_type (tree fntype, f
petered out to a NULL (i.e. without being terminated by a
void_type_node) then we need to tack on an ellipsis. */
if (!formal_type)
- formal_list = concat (formal_list, ", ...", NULL);
+ formal_list = concat (formal_list, ", ...", (void *)0);
}
- return concat (" (", formal_list, ")", NULL);
+ return concat (" (", formal_list, ")", (void *)0);
}
/* For the generation of an ANSI prototype for a function definition, we have
@@ -237,23 +237,23 @@ gen_formal_list_for_func_def (tree fndec
const char *this_formal;
if (*formal_list && ((style == ansi) || (style == k_and_r_names)))
- formal_list = concat (formal_list, ", ", NULL);
+ formal_list = concat (formal_list, ", ", (void *)0);
this_formal = gen_decl (formal_decl, 0, style);
if (style == k_and_r_decls)
- formal_list = concat (formal_list, this_formal, "; ", NULL);
+ formal_list = concat (formal_list, this_formal, "; ", (void *)0);
else
- formal_list = concat (formal_list, this_formal, NULL);
+ formal_list = concat (formal_list, this_formal, (void *)0);
formal_decl = TREE_CHAIN (formal_decl);
}
if (style == ansi)
{
if (!DECL_ARGUMENTS (fndecl))
- formal_list = concat (formal_list, "void", NULL);
+ formal_list = concat (formal_list, "void", (void *)0);
if (deserves_ellipsis (TREE_TYPE (fndecl)))
- formal_list = concat (formal_list, ", ...", NULL);
+ formal_list = concat (formal_list, ", ...", (void *)0);
}
if ((style == ansi) || (style == k_and_r_names))
- formal_list = concat (" (", formal_list, ")", NULL);
+ formal_list = concat (" (", formal_list, ")", (void *)0);
return formal_list;
}
@@ -312,14 +312,14 @@ gen_type (const char *ret_val, tree t, f
{
case POINTER_TYPE:
if (TYPE_READONLY (t))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
if (TYPE_VOLATILE (t))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
- ret_val = concat ("*", ret_val, NULL);
+ ret_val = concat ("*", ret_val, (void *)0);
if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE || TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
- ret_val = concat ("(", ret_val, ")", NULL);
+ ret_val = concat ("(", ret_val, ")", (void *)0);
ret_val = gen_type (ret_val, TREE_TYPE (t), style);
@@ -327,17 +327,17 @@ gen_type (const char *ret_val, tree t, f
case ARRAY_TYPE:
if (!COMPLETE_TYPE_P (t) || TREE_CODE (TYPE_SIZE (t)) != INTEGER_CST)
- ret_val = gen_type (concat (ret_val, "[]", NULL),
+ ret_val = gen_type (concat (ret_val, "[]", (void *)0),
TREE_TYPE (t), style);
else if (int_size_in_bytes (t) == 0)
- ret_val = gen_type (concat (ret_val, "[0]", NULL),
+ ret_val = gen_type (concat (ret_val, "[0]", (void *)0),
TREE_TYPE (t), style);
else
{
int size = (int_size_in_bytes (t) / int_size_in_bytes (TREE_TYPE (t)));
char buff[10];
sprintf (buff, "[%d]", size);
- ret_val = gen_type (concat (ret_val, buff, NULL),
+ ret_val = gen_type (concat (ret_val, buff, (void *)0),
TREE_TYPE (t), style);
}
break;
@@ -345,7 +345,7 @@ gen_type (const char *ret_val, tree t, f
case FUNCTION_TYPE:
ret_val = gen_type (concat (ret_val,
gen_formal_list_for_type (t, style),
- NULL),
+ (void *)0),
TREE_TYPE (t), style);
break;
@@ -374,13 +374,13 @@ gen_type (const char *ret_val, tree t, f
while (chain_p)
{
data_type = concat (data_type, gen_decl (chain_p, 0, ansi),
- NULL);
+ (void *)0);
chain_p = TREE_CHAIN (chain_p);
- data_type = concat (data_type, "; ", NULL);
+ data_type = concat (data_type, "; ", (void *)0);
}
- data_type = concat ("{ ", data_type, "}", NULL);
+ data_type = concat ("{ ", data_type, "}", (void *)0);
}
- data_type = concat ("struct ", data_type, NULL);
+ data_type = concat ("struct ", data_type, (void *)0);
break;
case UNION_TYPE:
@@ -393,13 +393,13 @@ gen_type (const char *ret_val, tree t, f
while (chain_p)
{
data_type = concat (data_type, gen_decl (chain_p, 0, ansi),
- NULL);
+ (void *)0);
chain_p = TREE_CHAIN (chain_p);
- data_type = concat (data_type, "; ", NULL);
+ data_type = concat (data_type, "; ", (void *)0);
}
- data_type = concat ("{ ", data_type, "}", NULL);
+ data_type = concat ("{ ", data_type, "}", (void *)0);
}
- data_type = concat ("union ", data_type, NULL);
+ data_type = concat ("union ", data_type, (void *)0);
break;
case ENUMERAL_TYPE:
@@ -412,14 +412,14 @@ gen_type (const char *ret_val, tree t, f
while (chain_p)
{
data_type = concat (data_type,
- IDENTIFIER_POINTER (TREE_PURPOSE (chain_p)), NULL);
+ IDENTIFIER_POINTER (TREE_PURPOSE (chain_p)), (void *)0);
chain_p = TREE_CHAIN (chain_p);
if (chain_p)
- data_type = concat (data_type, ", ", NULL);
+ data_type = concat (data_type, ", ", (void *)0);
}
- data_type = concat ("{ ", data_type, " }", NULL);
+ data_type = concat ("{ ", data_type, " }", (void *)0);
}
- data_type = concat ("enum ", data_type, NULL);
+ data_type = concat ("enum ", data_type, (void *)0);
break;
case TYPE_DECL:
@@ -431,7 +431,7 @@ gen_type (const char *ret_val, tree t, f
/* Normally, `unsigned' is part of the deal. Not so if it comes
with a type qualifier. */
if (TYPE_UNSIGNED (t) && TYPE_QUALS (t))
- data_type = concat ("unsigned ", data_type, NULL);
+ data_type = concat ("unsigned ", data_type, (void *)0);
break;
case REAL_TYPE:
@@ -451,11 +451,11 @@ gen_type (const char *ret_val, tree t, f
}
}
if (TYPE_READONLY (t))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
if (TYPE_VOLATILE (t))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
if (TYPE_RESTRICT (t))
- ret_val = concat ("restrict ", ret_val, NULL);
+ ret_val = concat ("restrict ", ret_val, (void *)0);
return ret_val;
}
@@ -494,9 +494,9 @@ gen_decl (tree decl, int is_func_definit
generate the qualifiers here. */
if (TREE_THIS_VOLATILE (decl))
- ret_val = concat ("volatile ", ret_val, NULL);
+ ret_val = concat ("volatile ", ret_val, (void *)0);
if (TREE_READONLY (decl))
- ret_val = concat ("const ", ret_val, NULL);
+ ret_val = concat ("const ", ret_val, (void *)0);
data_type = "";
@@ -515,7 +515,7 @@ gen_decl (tree decl, int is_func_definit
if (TREE_CODE (decl) == FUNCTION_DECL && is_func_definition)
{
ret_val = concat (ret_val, gen_formal_list_for_func_def (decl, ansi),
- NULL);
+ (void *)0);
/* Since we have already added in the formals list stuff, here we don't
add the whole "type" of the function we are considering (which
@@ -532,11 +532,11 @@ gen_decl (tree decl, int is_func_definit
ret_val = affix_data_type (ret_val);
if (TREE_CODE (decl) != FUNCTION_DECL && C_DECL_REGISTER (decl))
- ret_val = concat ("register ", ret_val, NULL);
+ ret_val = concat ("register ", ret_val, (void *)0);
if (TREE_PUBLIC (decl))
- ret_val = concat ("extern ", ret_val, NULL);
+ ret_val = concat ("extern ", ret_val, (void *)0);
if (TREE_CODE (decl) == FUNCTION_DECL && !TREE_PUBLIC (decl))
- ret_val = concat ("static ", ret_val, NULL);
+ ret_val = concat ("static ", ret_val, (void *)0);
return ret_val;
}

41
lang/gcc/4.3/patches/patch-gcc_c-incpath_c
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-gcc_c-incpath_c,v 1.1.1.1 2007/03/17 22:35:25 espie Exp $
--- gcc/c-incpath.c.orig Wed Dec 20 23:34:14 2006
+++ gcc/c-incpath.c Mon Feb 19 14:09:48 2007
@@ -146,9 +146,9 @@ add_standard_paths (const char *sysroot,
continue;
if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
{
- char *str = concat (iprefix, p->fname + len, NULL);
+ char *str = concat (iprefix, p->fname + len, (void *)0);
if (p->multilib && imultilib)
- str = concat (str, dir_separator_str, imultilib, NULL);
+ str = concat (str, dir_separator_str, imultilib, (void *)0);
add_path (str, SYSTEM, p->cxx_aware, false);
}
}
@@ -163,7 +163,7 @@ add_standard_paths (const char *sysroot,
/* Should this directory start with the sysroot? */
if (sysroot && p->add_sysroot)
- str = concat (sysroot, p->fname, NULL);
+ str = concat (sysroot, p->fname, (void *)0);
else if (!p->add_sysroot && relocated
&& strncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len) == 0)
{
@@ -171,14 +171,14 @@ add_standard_paths (const char *sysroot,
prefix relative path, then we use gcc_exec_prefix instead
of the configured prefix. */
str = concat (gcc_exec_prefix, p->fname
- + cpp_PREFIX_len, NULL);
+ + cpp_PREFIX_len, (void *)0);
str = update_path (str, p->component);
}
else
str = update_path (p->fname, p->component);
if (p->multilib && imultilib)
- str = concat (str, dir_separator_str, imultilib, NULL);
+ str = concat (str, dir_separator_str, imultilib, (void *)0);
add_path (str, SYSTEM, p->cxx_aware, false);
}

76
lang/gcc/4.3/patches/patch-gcc_collect2_c
View File

@ -1,76 +0,0 @@
$OpenBSD: patch-gcc_collect2_c,v 1.1.1.1 2007/03/17 22:35:25 espie Exp $
--- gcc/collect2.c.orig Wed Dec 13 10:28:16 2006
+++ gcc/collect2.c Mon Feb 19 14:10:17 2007
@@ -753,19 +753,19 @@ main (int argc, char **argv)
qualify the program name with the target machine. */
const char *const full_ld_suffix =
- concat(target_machine, "-", ld_suffix, NULL);
+ concat(target_machine, "-", ld_suffix, (char *)0);
const char *const full_nm_suffix =
- concat (target_machine, "-", nm_suffix, NULL);
+ concat (target_machine, "-", nm_suffix, (char *)0);
const char *const full_gnm_suffix =
- concat (target_machine, "-", gnm_suffix, NULL);
+ concat (target_machine, "-", gnm_suffix, (char *)0);
#ifdef LDD_SUFFIX
const char *const full_ldd_suffix =
- concat (target_machine, "-", ldd_suffix, NULL);
+ concat (target_machine, "-", ldd_suffix, (char *)0);
#endif
const char *const full_strip_suffix =
- concat (target_machine, "-", strip_suffix, NULL);
+ concat (target_machine, "-", strip_suffix, (char *)0);
const char *const full_gstrip_suffix =
- concat (target_machine, "-", gstrip_suffix, NULL);
+ concat (target_machine, "-", gstrip_suffix, (char *)0);
#else
const char *const full_ld_suffix = ld_suffix;
const char *const full_nm_suffix = nm_suffix;
@@ -958,7 +958,7 @@ main (int argc, char **argv)
if (c_file_name == 0)
{
#ifdef CROSS_DIRECTORY_STRUCTURE
- c_file_name = concat (target_machine, "-gcc", NULL);
+ c_file_name = concat (target_machine, "-gcc", (void *)0);
#else
c_file_name = "gcc";
#endif
@@ -1236,7 +1236,7 @@ main (int argc, char **argv)
if (exports.first)
{
- char *buf = concat ("-bE:", export_file, NULL);
+ char *buf = concat ("-bE:", export_file, (char *)0);
*ld1++ = buf;
*ld2++ = buf;
@@ -1401,7 +1401,7 @@ main (int argc, char **argv)
/* Tell the linker that we have initializer and finalizer functions. */
#ifdef LD_INIT_SWITCH
#ifdef COLLECT_EXPORT_LIST
- *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, NULL);
+ *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, (char *)0);
#else
*ld2++ = LD_INIT_SWITCH;
*ld2++ = initname;
@@ -1416,7 +1416,7 @@ main (int argc, char **argv)
/* If we did not add export flag to link arguments before, add it to
second link phase now. No new exports should have been added. */
if (! exports.first)
- *ld2++ = concat ("-bE:", export_file, NULL);
+ *ld2++ = concat ("-bE:", export_file, (char *)0);
#ifndef LD_INIT_SWITCH
add_to_list (&exports, initname);
@@ -1811,8 +1811,8 @@ write_c_file_stat (FILE *stream, const c
notice ("\nwrite_c_file - output name is %s, prefix is %s\n",
output_file, prefix);
- initname = concat ("_GLOBAL__FI_", prefix, NULL);
- fininame = concat ("_GLOBAL__FD_", prefix, NULL);
+ initname = concat ("_GLOBAL__FI_", prefix, (char *)0);
+ fininame = concat ("_GLOBAL__FD_", prefix, (char *)0);
free (prefix);

29
lang/gcc/4.3/patches/patch-gcc_config_i386_driver-i386_c
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-gcc_config_i386_driver-i386_c,v 1.1.1.1 2007/03/17 22:35:25 espie Exp $
--- gcc/config/i386/driver-i386.c.orig Thu Mar 1 23:14:23 2007
+++ gcc/config/i386/driver-i386.c Mon Mar 12 11:46:35 2007
@@ -65,7 +65,7 @@ describe_cache (unsigned l1_sizekb, unsi
sprintf (size, "--param l1-cache-size=%u", size_in_lines);
sprintf (line, "--param l1-cache-line-size=%u", l1_line);
- return concat (size, " ", line, " ", NULL);
+ return concat (size, " ", line, " ", (void *)0);
}
/* Returns the description of caches for an AMD processor. */
@@ -417,7 +417,7 @@ const char *host_detect_local_cpu (int a
}
done:
- return concat (cache, "-m", argv[0], "=", cpu, NULL);
+ return concat (cache, "-m", argv[0], "=", cpu, (void *)0);
}
#else
/* If we aren't compiling with GCC we just provide a minimal
@@ -443,6 +443,6 @@ const char *host_detect_local_cpu (int a
else
cpu = "generic";
- return concat ("-m", argv[0], "=", cpu, NULL);
+ return concat ("-m", argv[0], "=", cpu, (void *)0);
}
#endif /* GCC_VERSION */

12
lang/gcc/4.3/patches/patch-gcc_coverage_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_coverage_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/coverage.c.orig Fri Feb 16 00:50:49 2007
+++ gcc/coverage.c Mon Feb 19 14:08:47 2007
@@ -828,7 +828,7 @@ build_gcov_info (void)
fields = field;
filename = getpwd ();
filename = (filename && da_file_name[0] != '/'
- ? concat (filename, "/", da_file_name, NULL)
+ ? concat (filename, "/", da_file_name, (void *)0)
: da_file_name);
filename_len = strlen (filename);
filename_string = build_string (filename_len + 1, filename);

21
lang/gcc/4.3/patches/patch-gcc_cp_call_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-gcc_cp_call_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/cp/call.c.orig Fri Mar 9 17:16:35 2007
+++ gcc/cp/call.c Mon Mar 12 11:37:53 2007
@@ -5326,7 +5326,7 @@ name_as_c_string (tree name, tree type,
|| name == base_dtor_identifier
|| name == deleting_dtor_identifier)
{
- pretty_name = concat ("~", pretty_name, NULL);
+ pretty_name = concat ("~", pretty_name, (void *)0);
/* Remember that we need to free the memory allocated. */
*free_p = true;
}
@@ -5336,7 +5336,7 @@ name_as_c_string (tree name, tree type,
pretty_name = concat ("operator ",
type_as_string (TREE_TYPE (name),
TFF_PLAIN_IDENTIFIER),
- NULL);
+ (void *)0);
/* Remember that we need to free the memory allocated. */
*free_p = true;
}

12
lang/gcc/4.3/patches/patch-gcc_cp_decl2_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_cp_decl2_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/cp/decl2.c.orig Mon Feb 26 22:14:24 2007
+++ gcc/cp/decl2.c Mon Mar 12 11:37:53 2007
@@ -2969,7 +2969,7 @@ build_java_method_aliases (void)
oid = DECL_ASSEMBLER_NAME (fndecl);
oname = IDENTIFIER_POINTER (oid);
gcc_assert (oname[0] == '_' && oname[1] == 'Z');
- nname = ACONCAT (("_ZGA", oname+2, NULL));
+ nname = ACONCAT (("_ZGA", oname+2, (char *)0));
nid = get_identifier (nname);
alias = make_alias_for (fndecl, nid);

12
lang/gcc/4.3/patches/patch-gcc_cp_parser_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_cp_parser_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/cp/parser.c.orig Sat Mar 3 16:32:13 2007
+++ gcc/cp/parser.c Mon Mar 12 11:37:53 2007
@@ -16673,7 +16673,7 @@ cp_parser_require (cp_parser* parser,
/* Output the MESSAGE -- unless we're parsing tentatively. */
if (!cp_parser_simulate_error (parser))
{
- char *message = concat ("expected ", token_desc, NULL);
+ char *message = concat ("expected ", token_desc, (void *)0);
cp_parser_error (parser, message);
free (message);
}

12
lang/gcc/4.3/patches/patch-gcc_dbxout_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_dbxout_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/dbxout.c.orig Wed Jul 26 19:38:37 2006
+++ gcc/dbxout.c Wed Oct 18 00:37:31 2006
@@ -1008,7 +1008,7 @@ dbxout_init (const char *input_file_name
if (cwd[0] == '\0')
cwd = "/";
else if (!IS_DIR_SEPARATOR (cwd[strlen (cwd) - 1]))
- cwd = concat (cwd, "/", NULL);
+ cwd = concat (cwd, "/", (void *)0);
}
#ifdef DBX_OUTPUT_MAIN_SOURCE_DIRECTORY
DBX_OUTPUT_MAIN_SOURCE_DIRECTORY (asm_out_file, cwd);

12
lang/gcc/4.3/patches/patch-gcc_diagnostic_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_diagnostic_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/diagnostic.c.orig Tue Feb 20 11:18:58 2007
+++ gcc/diagnostic.c Mon Mar 12 11:37:53 2007
@@ -412,7 +412,7 @@ diagnostic_report_diagnostic (diagnostic
if (context->show_option_requested && diagnostic->option_index)
diagnostic->message.format_spec
= ACONCAT ((diagnostic->message.format_spec,
- " [", cl_options[diagnostic->option_index].opt_text, "]", NULL));
+ " [", cl_options[diagnostic->option_index].opt_text, "]", (char *)0));
diagnostic->message.locus = &diagnostic->location;
pp_format (context->printer, &diagnostic->message);

193
lang/gcc/4.3/patches/patch-gcc_gcc_c
View File

@ -1,193 +0,0 @@
$OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2007/03/17 22:35:25 espie Exp $
--- gcc/gcc.c.orig Tue Mar 6 16:50:28 2007
+++ gcc/gcc.c Mon Mar 12 14:55:44 2007
@@ -1322,7 +1322,7 @@ translate_options (int *argcp, const cha
/* Store the translation as one argv elt or as two. */
if (arg != 0 && strchr (arginfo, 'j') != 0)
newv[newindex++] = concat (option_map[j].equivalent, arg,
- NULL);
+ (void *)0);
else if (arg != 0)
{
newv[newindex++] = option_map[j].equivalent;
@@ -1660,7 +1660,7 @@ init_gcc_specs (struct obstack *obstack,
"%{shared:", shared_name, "}"
#endif
#endif
- "}}", NULL);
+ "}}", (void *)0);
obstack_grow (obstack, buf, strlen (buf));
free (buf);
@@ -1858,7 +1858,7 @@ set_spec (const char *name, const char *
old_spec = *(sl->ptr_spec);
*(sl->ptr_spec) = ((spec[0] == '+' && ISSPACE ((unsigned char)spec[1]))
- ? concat (old_spec, spec + 1, NULL)
+ ? concat (old_spec, spec + 1, (void *)0)
: xstrdup (spec));
#ifdef DEBUG_SPECS
@@ -2428,12 +2428,12 @@ for_each_path (const struct path_prefix
just_multi_suffix = just_machine_suffix;
if (do_multi && multilib_dir && strcmp (multilib_dir, ".") != 0)
{
- multi_dir = concat (multilib_dir, dir_separator_str, NULL);
- multi_suffix = concat (multi_suffix, multi_dir, NULL);
- just_multi_suffix = concat (just_multi_suffix, multi_dir, NULL);
+ multi_dir = concat (multilib_dir, dir_separator_str, (void *)0);
+ multi_suffix = concat (multi_suffix, multi_dir, (void *)0);
+ just_multi_suffix = concat (just_multi_suffix, multi_dir, (void *)0);
}
if (do_multi && multilib_os_dir && strcmp (multilib_os_dir, ".") != 0)
- multi_os_dir = concat (multilib_os_dir, dir_separator_str, NULL);
+ multi_os_dir = concat (multilib_os_dir, dir_separator_str, (void *)0);
while (1)
{
@@ -2780,8 +2780,8 @@ add_sysrooted_prefix (struct path_prefix
if (target_system_root)
{
if (target_sysroot_suffix)
- prefix = concat (target_sysroot_suffix, prefix, NULL);
- prefix = concat (target_system_root, prefix, NULL);
+ prefix = concat (target_sysroot_suffix, prefix, (void *)0);
+ prefix = concat (target_system_root, prefix, (void *)0);
/* We have to override this because GCC's notion of sysroot
moves along with GCC. */
@@ -3367,7 +3367,7 @@ process_command (int argc, const char **
break;
new_argv0 = xmemdup (progname, baselen,
baselen + concat_length (new_version, new_machine,
- "-gcc-", NULL) + 1);
+ "-gcc-", (void *)0) + 1);
strcpy (new_argv0 + baselen, new_machine);
strcat (new_argv0, "-gcc-");
strcat (new_argv0, new_version);
@@ -3394,7 +3394,7 @@ process_command (int argc, const char **
standard_bindir_prefix,
standard_libexec_prefix);
if (gcc_exec_prefix)
- putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL));
+ putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, (void *)0));
}
else
{
@@ -3402,7 +3402,7 @@ process_command (int argc, const char **
GCC_EXEC_PREFIX is typically a directory name with a trailing
/ (which is ignored by make_relative_prefix), so append a
program name. */
- char *tmp_prefix = concat (gcc_exec_prefix, "gcc", NULL);
+ char *tmp_prefix = concat (gcc_exec_prefix, "gcc", (void *)0);
gcc_libexec_prefix = make_relative_prefix (tmp_prefix,
standard_exec_prefix,
standard_libexec_prefix);
@@ -3457,7 +3457,7 @@ process_command (int argc, const char **
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3491,7 +3491,7 @@ process_command (int argc, const char **
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3524,7 +3524,7 @@ process_command (int argc, const char **
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
- strcpy (nstore, concat (".", dir_separator_str, NULL));
+ strcpy (nstore, concat (".", dir_separator_str, (void *)0));
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3992,20 +3992,20 @@ warranty; not even for MERCHANTABILITY o
gcc_assert (!IS_ABSOLUTE_PATH (tooldir_base_prefix));
tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
- dir_separator_str, NULL);
+ dir_separator_str, (void *)0);
/* Look for tools relative to the location from which the driver is
running, or, if that is not available, the configured prefix. */
tooldir_prefix
= concat (gcc_exec_prefix ? gcc_exec_prefix : standard_exec_prefix,
spec_machine, dir_separator_str,
- spec_version, dir_separator_str, tooldir_prefix, NULL);
+ spec_version, dir_separator_str, tooldir_prefix, (void *)0);
add_prefix (&exec_prefixes,
- concat (tooldir_prefix, "bin", dir_separator_str, NULL),
+ concat (tooldir_prefix, "bin", dir_separator_str, (void *)0),
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 0);
add_prefix (&startfile_prefixes,
- concat (tooldir_prefix, "lib", dir_separator_str, NULL),
+ concat (tooldir_prefix, "lib", dir_separator_str, (void *)0),
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
#if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
@@ -4127,7 +4127,7 @@ warranty; not even for MERCHANTABILITY o
{ /* POSIX allows separation of -l and the lib arg;
canonicalize by concatenating -l with its arg */
infiles[n_infiles].language = "*";
- infiles[n_infiles++].name = concat ("-l", argv[++i], NULL);
+ infiles[n_infiles++].name = concat ("-l", argv[++i], (void *)0);
}
else if (strncmp (argv[i], "-l", 2) == 0)
{
@@ -4991,7 +4991,7 @@ do_spec_1 (const char *spec, int inswitc
info.append = "include-fixed";
if (*sysroot_hdrs_suffix_spec)
info.append = concat (info.append, dir_separator_str,
- multilib_dir, NULL);
+ multilib_dir, (void *)0);
info.append_len = strlen (info.append);
for_each_path (&include_prefixes, false, info.append_len,
spec_path, &info);
@@ -6196,8 +6196,8 @@ main (int argc, char **argv)
/* Read specs from a file if there is one. */
machine_suffix = concat (spec_machine, dir_separator_str,
- spec_version, dir_separator_str, NULL);
- just_machine_suffix = concat (spec_machine, dir_separator_str, NULL);
+ spec_version, dir_separator_str, (void *)0);
+ just_machine_suffix = concat (spec_machine, dir_separator_str, (void *)0);
specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, true);
/* Read the specs file unless it is a default one. */
@@ -6312,7 +6312,7 @@ main (int argc, char **argv)
concat (gcc_exec_prefix
? gcc_exec_prefix : standard_exec_prefix,
machine_suffix,
- standard_startfile_prefix, NULL),
+ standard_startfile_prefix, (void *)0),
NULL, PREFIX_PRIORITY_LAST, 0, 1);
}
@@ -6340,7 +6340,7 @@ main (int argc, char **argv)
/* If we have a GCC_EXEC_PREFIX envvar, modify it for cpp's sake. */
if (gcc_exec_prefix)
gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
- spec_version, dir_separator_str, NULL);
+ spec_version, dir_separator_str, (void *)0);
/* Now we have the specs.
Set the `valid' bits for switches that match anything in any spec. */
@@ -7675,7 +7675,7 @@ getenv_spec_function (int argc, const ch
if (!value)
fatal ("environment variable \"%s\" not defined", argv[0]);
- return concat (value, argv[1], NULL);
+ return concat (value, argv[1], (void *)0);
}
/* if-exists built-in spec function.

21
lang/gcc/4.3/patches/patch-gcc_gensupport_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-gcc_gensupport_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/gensupport.c.orig Wed Mar 15 11:14:51 2006
+++ gcc/gensupport.c Sun Jul 23 11:24:02 2006
@@ -220,7 +220,7 @@ process_include (rtx desc, int lineno)
{
static const char sep[2] = { DIR_SEPARATOR, '\0' };
- pathname = concat (stackp->fname, sep, filename, NULL);
+ pathname = concat (stackp->fname, sep, filename, (void *)0);
input_file = fopen (pathname, "r");
if (input_file != NULL)
goto success;
@@ -229,7 +229,7 @@ process_include (rtx desc, int lineno)
}
if (base_dir)
- pathname = concat (base_dir, filename, NULL);
+ pathname = concat (base_dir, filename, (void *)0);
else
pathname = xstrdup (filename);
input_file = fopen (pathname, "r");

12
lang/gcc/4.3/patches/patch-gcc_objc_objc-act_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_objc_objc-act_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/objc/objc-act.c.orig Tue Jun 6 12:22:54 2006
+++ gcc/objc/objc-act.c Sun Jul 23 11:24:02 2006
@@ -494,7 +494,7 @@ objc_init (void)
/* If gen_declaration desired, open the output file. */
if (flag_gen_declaration)
{
- register char * const dumpname = concat (dump_base_name, ".decl", NULL);
+ register char * const dumpname = concat (dump_base_name, ".decl", (void *)0);
gen_declaration_file = fopen (dumpname, "w");
if (gen_declaration_file == 0)
fatal_error ("can't open %s: %m", dumpname);

12
lang/gcc/4.3/patches/patch-gcc_omp-low_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_omp-low_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/omp-low.c.orig Fri Feb 16 00:50:49 2007
+++ gcc/omp-low.c Mon Feb 19 14:08:48 2007
@@ -3894,7 +3894,7 @@ lower_omp_critical (tree *stmt_p, omp_co
decl = create_tmp_var_raw (ptr_type_node, NULL);
new_str = ACONCAT ((".gomp_critical_user_",
- IDENTIFIER_POINTER (name), NULL));
+ IDENTIFIER_POINTER (name), (void *)0));
DECL_NAME (decl) = get_identifier (new_str);
TREE_PUBLIC (decl) = 1;
TREE_STATIC (decl) = 1;

23
lang/gcc/4.3/patches/patch-gcc_passes_c
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-gcc_passes_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/passes.c.orig Wed Feb 14 22:54:44 2007
+++ gcc/passes.c Mon Feb 19 14:08:48 2007
@@ -319,7 +319,7 @@ register_one_dump_file (struct tree_opt_
sprintf (num, "%d", ((int) pass->static_pass_number < 0
? 1 : pass->static_pass_number));
- dot_name = concat (".", pass->name, num, NULL);
+ dot_name = concat (".", pass->name, num, (void *)0);
if (ipa)
prefix = "ipa-", flags = TDF_IPA;
else if (properties & PROP_trees)
@@ -327,8 +327,8 @@ register_one_dump_file (struct tree_opt_
else
prefix = "rtl-", flags = TDF_RTL;
- flag_name = concat (prefix, pass->name, num, NULL);
- glob_name = concat (prefix, pass->name, NULL);
+ flag_name = concat (prefix, pass->name, num, (void *)0);
+ glob_name = concat (prefix, pass->name, (void *)0);
pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
flags, pass->letter);
}

35
lang/gcc/4.3/patches/patch-gcc_prefix_c
View File

@ -1,35 +0,0 @@
$OpenBSD: patch-gcc_prefix_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/prefix.c.orig Fri Mar 18 16:24:19 2005
+++ gcc/prefix.c Mon May 16 17:43:13 2005
@@ -99,7 +99,7 @@ get_key_value (char *key)
#endif
if (prefix == 0)
- prefix = getenv (temp = concat (key, "_ROOT", NULL));
+ prefix = getenv (temp = concat (key, "_ROOT", (void *)0));
if (prefix == 0)
prefix = std_prefix;
@@ -223,7 +223,7 @@ translate_name (char *name)
together. */
old_name = name;
- name = concat (prefix, &name[keylen + 1], NULL);
+ name = concat (prefix, &name[keylen + 1], (void *)0);
free (old_name);
}
@@ -261,11 +261,11 @@ update_path (const char *path, const cha
if (key[0] != '$')
{
- key = concat ("@", key, NULL);
+ key = concat ("@", key, (void *)0);
free_key = true;
}
- result = concat (key, &path[len], NULL);
+ result = concat (key, &path[len], (void *)0);
if (free_key)
free ((char *) key);
result = translate_name (result);

12
lang/gcc/4.3/patches/patch-gcc_read-rtl_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_read-rtl_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/read-rtl.c.orig Sat Feb 18 23:06:53 2006
+++ gcc/read-rtl.c Sun Jul 23 11:24:02 2006
@@ -784,7 +784,7 @@ join_c_conditions (const char *cond1, co
if (cond2 == 0 || cond2[0] == 0)
return cond1;
- result = concat ("(", cond1, ") && (", cond2, ")", NULL);
+ result = concat ("(", cond1, ") && (", cond2, ")", (void *)0);
obstack_ptr_grow (&joined_conditions_obstack, result);
obstack_ptr_grow (&joined_conditions_obstack, cond1);
obstack_ptr_grow (&joined_conditions_obstack, cond2);

12
lang/gcc/4.3/patches/patch-gcc_tree-complex_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-complex_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/tree-complex.c.orig Fri Jul 29 16:51:58 2005
+++ gcc/tree-complex.c Thu Aug 4 10:54:45 2005
@@ -397,7 +397,7 @@ create_one_component_var (tree type, tre
const char *name = IDENTIFIER_POINTER (DECL_NAME (orig));
tree inner_type;
- DECL_NAME (r) = get_identifier (ACONCAT ((name, suffix, NULL)));
+ DECL_NAME (r) = get_identifier (ACONCAT ((name, suffix, (char *)0)));
inner_type = TREE_TYPE (TREE_TYPE (orig));
SET_DECL_DEBUG_EXPR (r, build1 (code, type, orig));

12
lang/gcc/4.3/patches/patch-gcc_tree-dump_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-dump_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/tree-dump.c.orig Mon Feb 19 05:12:49 2007
+++ gcc/tree-dump.c Mon Mar 12 11:37:54 2007
@@ -885,7 +885,7 @@ get_dump_file_name (enum tree_dump_index
dump_id[0] = '\0';
}
- return concat (dump_base_name, dump_id, dfi->suffix, NULL);
+ return concat (dump_base_name, dump_id, dfi->suffix, (void *)0);
}
/* Begin a tree dump for PHASE. Stores any user supplied flag in

12
lang/gcc/4.3/patches/patch-gcc_tree-mudflap_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-mudflap_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/tree-mudflap.c.orig Thu Mar 8 20:02:51 2007
+++ gcc/tree-mudflap.c Mon Mar 12 11:37:54 2007
@@ -237,7 +237,7 @@ mf_file_function_line_tree (location_t l
else
op = name = cp = "";
- string = concat (file, colon, line, op, name, cp, NULL);
+ string = concat (file, colon, line, op, name, cp, (void *)0);
result = mf_build_string (string);
free (string);

12
lang/gcc/4.3/patches/patch-gcc_tree-nested_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-nested_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/tree-nested.c.orig Fri Feb 16 00:50:49 2007
+++ gcc/tree-nested.c Mon Feb 19 14:08:48 2007
@@ -205,7 +205,7 @@ get_frame_type (struct nesting_info *inf
name = concat ("FRAME.",
IDENTIFIER_POINTER (DECL_NAME (info->context)),
- NULL);
+ (void *)0);
TYPE_NAME (type) = get_identifier (name);
free (name);

12
lang/gcc/4.3/patches/patch-gcc_tree-vect-transform_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_tree-vect-transform_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/tree-vect-transform.c.orig Fri Feb 16 00:50:49 2007
+++ gcc/tree-vect-transform.c Mon Feb 19 14:08:49 2007
@@ -103,7 +103,7 @@ vect_get_new_vect_var (tree type, enum v
}
if (name)
- new_vect_var = create_tmp_var (type, concat (prefix, name, NULL));
+ new_vect_var = create_tmp_var (type, concat (prefix, name, (void *)0));
else
new_vect_var = create_tmp_var (type, prefix);

17
lang/gcc/4.3/patches/patch-gcc_tree_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-gcc_tree_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/tree.c.orig Sun Mar 4 13:57:13 2007
+++ gcc/tree.c Mon Mar 12 11:37:54 2007
@@ -7204,11 +7204,11 @@ build_common_builtin_nodes (void)
*q = TOLOWER (*p);
*q = '\0';
- built_in_names[mcode] = concat ("__mul", mode_name_buf, "3", NULL);
+ built_in_names[mcode] = concat ("__mul", mode_name_buf, "3", (void *)0);
local_define_builtin (built_in_names[mcode], ftype, mcode,
built_in_names[mcode], ECF_CONST | ECF_NOTHROW);
- built_in_names[dcode] = concat ("__div", mode_name_buf, "3", NULL);
+ built_in_names[dcode] = concat ("__div", mode_name_buf, "3", (void *)0);
local_define_builtin (built_in_names[dcode], ftype, dcode,
built_in_names[dcode], ECF_CONST | ECF_NOTHROW);
}

12
lang/gcc/4.3/patches/patch-gcc_varasm_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_varasm_c,v 1.1.1.1 2007/03/17 22:35:26 espie Exp $
--- gcc/varasm.c.orig Thu Feb 15 11:33:59 2007
+++ gcc/varasm.c Mon Feb 19 14:08:49 2007
@@ -633,7 +633,7 @@ initialize_cold_section_name (void)
stripped_name = targetm.strip_name_encoding (name);
- buffer = ACONCAT ((stripped_name, "_unlikely", NULL));
+ buffer = ACONCAT ((stripped_name, "_unlikely", (char *)0));
cfun->unlikely_text_section_name = ggc_strdup (buffer);
}
else