update to newer snapshot. WANTLIB
This commit is contained in:
parent
f7b657b9db
commit
01acb9759c
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
|
||||
ONLY_FOR_ARCHS= alpha i386 m68k sparc sparc64 powerpc vax
|
||||
|
||||
V=4.0.0
|
||||
FULL_VERSION=4.0-20040912
|
||||
FULL_VERSION=4.0-20041121
|
||||
|
||||
MAINTAINER= Marc Espie <espie@openbsd.org>
|
||||
|
||||
@ -25,6 +25,7 @@ BUILD_DEPENDS= ::devel/autoconf/2.13
|
||||
BUILD_DEPENDS+= ::devel/autoconf/2.59
|
||||
BUILD_DEPENDS+= ::devel/metaauto
|
||||
SUBPACKAGE?=
|
||||
WANTLIB=c m
|
||||
|
||||
.if ${MAKE_JAVA:L} == "yes"
|
||||
. if !defined(PACKAGING) || ${SUBPACKAGE} == "-java"
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (gcc/gcc-4.0-20040912.tar.bz2) = ee7c5f928b0976f5b17d0016c9e7e99f
|
||||
RMD160 (gcc/gcc-4.0-20040912.tar.bz2) = 3483a0979999e47a6be7cadb0ec31c399739b16a
|
||||
SHA1 (gcc/gcc-4.0-20040912.tar.bz2) = 48e23960a7cf07da50f94df5b8f8df79879b33a0
|
||||
MD5 (gcc/gcc-4.0-20041121.tar.bz2) = 4af63d6e46f17fbb1e2f5e09e2b58389
|
||||
RMD160 (gcc/gcc-4.0-20041121.tar.bz2) = a586869f8830586850ec1f93a6db9d1a78eda2fd
|
||||
SHA1 (gcc/gcc-4.0-20041121.tar.bz2) = 5a7ed9d87b1545b0ede80a5ee029f9160983df6f
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-gcc_collect2_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
--- gcc/collect2.c.orig Tue Sep 14 09:30:22 2004
|
||||
+++ gcc/collect2.c Tue Sep 14 09:30:56 2004
|
||||
@@ -783,19 +783,19 @@ main (int argc, char **argv)
|
||||
$OpenBSD: patch-gcc_collect2_c,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- gcc/collect2.c.orig Tue Nov 9 11:12:15 2004
|
||||
+++ gcc/collect2.c Tue Nov 23 12:44:28 2004
|
||||
@@ -779,19 +779,19 @@ main (int argc, char **argv)
|
||||
qualify the program name with the target machine. */
|
||||
|
||||
const char *const full_ld_suffix =
|
||||
@ -27,7 +27,7 @@ $OpenBSD: patch-gcc_collect2_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
#else
|
||||
const char *const full_ld_suffix = ld_suffix;
|
||||
const char *const full_nm_suffix = nm_suffix;
|
||||
@@ -986,7 +986,7 @@ main (int argc, char **argv)
|
||||
@@ -981,7 +981,7 @@ main (int argc, char **argv)
|
||||
if (c_file_name == 0)
|
||||
{
|
||||
#ifdef CROSS_COMPILE
|
||||
@ -36,7 +36,7 @@ $OpenBSD: patch-gcc_collect2_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
#else
|
||||
c_file_name = "gcc";
|
||||
#endif
|
||||
@@ -1256,7 +1256,7 @@ main (int argc, char **argv)
|
||||
@@ -1251,7 +1251,7 @@ main (int argc, char **argv)
|
||||
|
||||
if (exports.first)
|
||||
{
|
||||
@ -45,7 +45,7 @@ $OpenBSD: patch-gcc_collect2_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
|
||||
*ld1++ = buf;
|
||||
*ld2++ = buf;
|
||||
@@ -1421,7 +1421,7 @@ main (int argc, char **argv)
|
||||
@@ -1416,7 +1416,7 @@ main (int argc, char **argv)
|
||||
/* Tell the linker that we have initializer and finalizer functions. */
|
||||
#ifdef LD_INIT_SWITCH
|
||||
#ifdef COLLECT_EXPORT_LIST
|
||||
@ -54,7 +54,7 @@ $OpenBSD: patch-gcc_collect2_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
#else
|
||||
*ld2++ = LD_INIT_SWITCH;
|
||||
*ld2++ = initname;
|
||||
@@ -1436,7 +1436,7 @@ main (int argc, char **argv)
|
||||
@@ -1431,7 +1431,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)
|
||||
@ -63,7 +63,7 @@ $OpenBSD: patch-gcc_collect2_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
|
||||
#ifndef LD_INIT_SWITCH
|
||||
add_to_list (&exports, initname);
|
||||
@@ -1843,8 +1843,8 @@ write_c_file_stat (FILE *stream, const c
|
||||
@@ -1838,8 +1838,8 @@ write_c_file_stat (FILE *stream, const c
|
||||
notice ("\nwrite_c_file - output name is %s, prefix is %s\n",
|
||||
output_file, prefix);
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-gcc_cp_call_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
--- gcc/cp/call.c.orig Tue Sep 14 09:21:29 2004
|
||||
+++ gcc/cp/call.c Tue Sep 14 09:21:40 2004
|
||||
@@ -5104,7 +5104,7 @@ name_as_c_string (tree name, tree type,
|
||||
$OpenBSD: patch-gcc_cp_call_c,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- gcc/cp/call.c.orig Tue Nov 9 11:12:27 2004
|
||||
+++ gcc/cp/call.c Tue Nov 23 12:44:29 2004
|
||||
@@ -5130,7 +5130,7 @@ name_as_c_string (tree name, tree type,
|
||||
|| name == base_dtor_identifier
|
||||
|| name == deleting_dtor_identifier)
|
||||
{
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_cp_call_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
/* Remember that we need to free the memory allocated. */
|
||||
*free_p = true;
|
||||
}
|
||||
@@ -5114,7 +5114,7 @@ name_as_c_string (tree name, tree type,
|
||||
@@ -5140,7 +5140,7 @@ name_as_c_string (tree name, tree type,
|
||||
pretty_name = concat ("operator ",
|
||||
type_as_string (TREE_TYPE (name),
|
||||
TFF_PLAIN_IDENTIFIER),
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-gcc_cp_parser_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
--- gcc/cp/parser.c.orig Tue Sep 14 09:24:04 2004
|
||||
+++ gcc/cp/parser.c Tue Sep 14 09:24:13 2004
|
||||
@@ -15554,7 +15554,7 @@ cp_parser_require (cp_parser* parser,
|
||||
$OpenBSD: patch-gcc_cp_parser_c,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- gcc/cp/parser.c.orig Fri Nov 12 22:47:07 2004
|
||||
+++ gcc/cp/parser.c Tue Nov 23 12:44:30 2004
|
||||
@@ -15396,7 +15396,7 @@ cp_parser_require (cp_parser* parser,
|
||||
/* Output the MESSAGE -- unless we're parsing tentatively. */
|
||||
if (!cp_parser_simulate_error (parser))
|
||||
{
|
||||
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-gcc_dbxout_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
--- gcc/dbxout.c.orig Tue Sep 14 08:59:02 2004
|
||||
+++ gcc/dbxout.c Tue Sep 14 08:59:13 2004
|
||||
@@ -513,7 +513,7 @@ dbxout_init (const char *input_file_name
|
||||
{
|
||||
if (!cwd && (cwd = get_src_pwd ())
|
||||
&& (!*cwd || cwd[strlen (cwd) - 1] != '/'))
|
||||
- cwd = concat (cwd, FILE_NAME_JOINER, NULL);
|
||||
+ cwd = concat (cwd, FILE_NAME_JOINER, (void *)0);
|
||||
if (cwd)
|
||||
{
|
||||
$OpenBSD: patch-gcc_dbxout_c,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- gcc/dbxout.c.orig Wed Nov 3 04:19:11 2004
|
||||
+++ gcc/dbxout.c Tue Nov 23 12:47:44 2004
|
||||
@@ -998,7 +998,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);
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
--- gcc/gcc.c.orig Tue Sep 14 09:31:37 2004
|
||||
+++ gcc/gcc.c Tue Sep 14 09:33:19 2004
|
||||
@@ -1295,7 +1295,7 @@ translate_options (int *argcp, const cha
|
||||
$OpenBSD: patch-gcc_gcc_c,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- gcc/gcc.c.orig Tue Nov 9 11:12:16 2004
|
||||
+++ gcc/gcc.c Tue Nov 23 12:44:31 2004
|
||||
@@ -1298,7 +1298,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,
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
else if (arg != 0)
|
||||
{
|
||||
newv[newindex++] = option_map[j].equivalent;
|
||||
@@ -1610,7 +1610,7 @@ init_gcc_specs (struct obstack *obstack,
|
||||
@@ -1614,7 +1614,7 @@ init_gcc_specs (struct obstack *obstack,
|
||||
shared_name,
|
||||
#endif
|
||||
#endif
|
||||
@ -19,7 +19,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
|
||||
obstack_grow (obstack, buf, strlen (buf));
|
||||
free (buf);
|
||||
@@ -1813,7 +1813,7 @@ set_spec (const char *name, const char *
|
||||
@@ -1817,7 +1817,7 @@ set_spec (const char *name, const char *
|
||||
|
||||
old_spec = *(sl->ptr_spec);
|
||||
*(sl->ptr_spec) = ((spec[0] == '+' && ISSPACE ((unsigned char)spec[1]))
|
||||
@ -28,7 +28,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
: xstrdup (spec));
|
||||
|
||||
#ifdef DEBUG_SPECS
|
||||
@@ -2471,10 +2471,10 @@ find_a_file (struct path_prefix *pprefix
|
||||
@@ -2475,10 +2475,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,
|
||||
@ -41,7 +41,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
}
|
||||
|
||||
temp = xmalloc (len);
|
||||
@@ -2633,8 +2633,8 @@ add_sysrooted_prefix (struct path_prefix
|
||||
@@ -2637,8 +2637,8 @@ add_sysrooted_prefix (struct path_prefix
|
||||
if (target_system_root)
|
||||
{
|
||||
if (target_sysroot_suffix)
|
||||
@ -52,7 +52,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
|
||||
/* We have to override this because GCC's notion of sysroot
|
||||
moves along with GCC. */
|
||||
@@ -3206,7 +3206,7 @@ process_command (int argc, const char **
|
||||
@@ -3210,7 +3210,7 @@ process_command (int argc, const char **
|
||||
break;
|
||||
new_argv0 = xmemdup (progname, baselen,
|
||||
baselen + concat_length (new_version, new_machine,
|
||||
@ -61,7 +61,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
strcpy (new_argv0 + baselen, new_machine);
|
||||
strcat (new_argv0, "-gcc-");
|
||||
strcat (new_argv0, new_version);
|
||||
@@ -3233,7 +3233,7 @@ process_command (int argc, const char **
|
||||
@@ -3237,7 +3237,7 @@ process_command (int argc, const char **
|
||||
standard_bindir_prefix,
|
||||
standard_libexec_prefix);
|
||||
if (gcc_exec_prefix)
|
||||
@ -70,7 +70,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
}
|
||||
else
|
||||
gcc_libexec_prefix = make_relative_prefix (gcc_exec_prefix,
|
||||
@@ -3280,7 +3280,7 @@ process_command (int argc, const char **
|
||||
@@ -3284,7 +3284,7 @@ process_command (int argc, const char **
|
||||
{
|
||||
strncpy (nstore, startp, endp - startp);
|
||||
if (endp == startp)
|
||||
@ -79,7 +79,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
else if (!IS_DIR_SEPARATOR (endp[-1]))
|
||||
{
|
||||
nstore[endp - startp] = DIR_SEPARATOR;
|
||||
@@ -3314,7 +3314,7 @@ process_command (int argc, const char **
|
||||
@@ -3318,7 +3318,7 @@ process_command (int argc, const char **
|
||||
{
|
||||
strncpy (nstore, startp, endp - startp);
|
||||
if (endp == startp)
|
||||
@ -88,7 +88,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
else if (!IS_DIR_SEPARATOR (endp[-1]))
|
||||
{
|
||||
nstore[endp - startp] = DIR_SEPARATOR;
|
||||
@@ -3347,7 +3347,7 @@ process_command (int argc, const char **
|
||||
@@ -3351,7 +3351,7 @@ process_command (int argc, const char **
|
||||
{
|
||||
strncpy (nstore, startp, endp - startp);
|
||||
if (endp == startp)
|
||||
@ -97,7 +97,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
else if (!IS_DIR_SEPARATOR (endp[-1]))
|
||||
{
|
||||
nstore[endp - startp] = DIR_SEPARATOR;
|
||||
@@ -3815,7 +3815,7 @@ warranty; not even for MERCHANTABILITY o
|
||||
@@ -3819,7 +3819,7 @@ warranty; not even for MERCHANTABILITY o
|
||||
PREFIX_PRIORITY_LAST, 1, 0);
|
||||
|
||||
tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
|
||||
@ -106,7 +106,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
|
||||
/* 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
|
||||
@@ -3834,28 +3834,28 @@ warranty; not even for MERCHANTABILITY o
|
||||
{
|
||||
char *gcc_exec_tooldir_prefix
|
||||
= concat (gcc_exec_prefix, spec_machine, dir_separator_str,
|
||||
@ -141,7 +141,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
|
||||
|
||||
#if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
|
||||
@@ -3974,7 +3974,7 @@ warranty; not even for MERCHANTABILITY o
|
||||
@@ -3978,7 +3978,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 = "*";
|
||||
@ -150,7 +150,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
}
|
||||
else if (strncmp (argv[i], "-l", 2) == 0)
|
||||
{
|
||||
@@ -5927,11 +5927,11 @@ is_directory (const char *path1, const c
|
||||
@@ -5931,11 +5931,11 @@ is_directory (const char *path1, const c
|
||||
if (linker
|
||||
&& ((cp - path == 6
|
||||
&& strcmp (path, concat (dir_separator_str, "lib",
|
||||
@ -164,7 +164,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
return 0;
|
||||
|
||||
return (stat (path, &st) >= 0 && S_ISDIR (st.st_mode));
|
||||
@@ -6115,8 +6115,8 @@ main (int argc, const char **argv)
|
||||
@@ -6119,8 +6119,8 @@ main (int argc, const char **argv)
|
||||
/* Read specs from a file if there is one. */
|
||||
|
||||
machine_suffix = concat (spec_machine, dir_separator_str,
|
||||
@ -175,7 +175,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
|
||||
specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, 0);
|
||||
/* Read the specs file unless it is a default one. */
|
||||
@@ -6221,12 +6221,12 @@ main (int argc, const char **argv)
|
||||
@@ -6225,12 +6225,12 @@ main (int argc, const char **argv)
|
||||
if (gcc_exec_prefix)
|
||||
add_prefix (&startfile_prefixes,
|
||||
concat (gcc_exec_prefix, machine_suffix,
|
||||
@ -190,7 +190,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
NULL, PREFIX_PRIORITY_LAST, 0, 1);
|
||||
}
|
||||
|
||||
@@ -6252,7 +6252,7 @@ main (int argc, const char **argv)
|
||||
@@ -6256,7 +6256,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,
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-gcc_objc_objc-act_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
--- gcc/objc/objc-act.c.orig Tue Sep 14 09:29:07 2004
|
||||
+++ gcc/objc/objc-act.c Tue Sep 14 09:29:15 2004
|
||||
@@ -542,7 +542,7 @@ objc_init (void)
|
||||
$OpenBSD: patch-gcc_objc_objc-act_c,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- gcc/objc/objc-act.c.orig Tue Nov 9 20:44:33 2004
|
||||
+++ gcc/objc/objc-act.c Tue Nov 23 12:44:32 2004
|
||||
@@ -544,7 +544,7 @@ objc_init (void)
|
||||
/* If gen_declaration desired, open the output file. */
|
||||
if (flag_gen_declaration)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-gcc_tree-dump_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
--- gcc/tree-dump.c.orig Tue Sep 14 09:17:33 2004
|
||||
+++ gcc/tree-dump.c Tue Sep 14 09:18:10 2004
|
||||
@@ -820,7 +820,7 @@ get_dump_file_name (enum tree_dump_index
|
||||
$OpenBSD: patch-gcc_tree-dump_c,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- gcc/tree-dump.c.orig Wed Oct 13 15:48:16 2004
|
||||
+++ gcc/tree-dump.c Tue Nov 23 12:44:32 2004
|
||||
@@ -822,7 +822,7 @@ get_dump_file_name (enum tree_dump_index
|
||||
dump_id[0] = '\0';
|
||||
}
|
||||
|
||||
|
@ -1,103 +0,0 @@
|
||||
$OpenBSD: patch-gcc_tree-ssa-alias_c,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
--- gcc/tree-ssa-alias.c.orig Tue Sep 14 12:58:50 2004
|
||||
+++ gcc/tree-ssa-alias.c Tue Sep 14 12:59:41 2004
|
||||
@@ -1244,7 +1244,7 @@ setup_pointers_and_addressables (struct
|
||||
because some TREE_ADDRESSABLE variables will be marked
|
||||
non-addressable below and only pointers with unique type tags are
|
||||
going to be added to POINTERS. */
|
||||
- ai->addressable_vars = xcalloc (num_addressable_vars,
|
||||
+ ai->addressable_vars = xcalloc (num_addressable_vars + num_pointers,
|
||||
sizeof (struct alias_map_d *));
|
||||
ai->pointers = xcalloc (num_pointers, sizeof (struct alias_map_d *));
|
||||
ai->num_addressable_vars = 0;
|
||||
@@ -1262,8 +1262,9 @@ setup_pointers_and_addressables (struct
|
||||
|
||||
/* Name memory tags already have flow-sensitive aliasing
|
||||
information, so they need not be processed by
|
||||
- compute_may_aliases. Similarly, type memory tags are already
|
||||
- accounted for when we process their associated pointer. */
|
||||
+ compute_flow_insensitive_aliasing. Similarly, type memory
|
||||
+ tags are already accounted for when we process their
|
||||
+ associated pointer. */
|
||||
if (v_ann->mem_tag_kind != NOT_A_TAG)
|
||||
continue;
|
||||
|
||||
@@ -1351,6 +1352,36 @@ setup_pointers_and_addressables (struct
|
||||
|
||||
VARRAY_UINT (ai->num_references, t_ann->uid)
|
||||
+= VARRAY_UINT (ai->num_references, v_ann->uid);
|
||||
+
|
||||
+ /* FIXME. Compensate for the lack of field-sensitive
|
||||
+ aliasing information. Since this analysis is based
|
||||
+ exclusively on symbols, it fails to handle cases
|
||||
+ where a pointer takes the address of a structure
|
||||
+ field. Consider testsuite/gcc.dg/tree-ssa/20040319-1.c:
|
||||
+
|
||||
+ struct bar { int count; int *arr;};
|
||||
+
|
||||
+ void foo (struct bar *b)
|
||||
+ {
|
||||
+ b->count = 0;
|
||||
+ *(b->arr) = 2;
|
||||
+ if (b->count == 0)
|
||||
+ abort ();
|
||||
+ }
|
||||
+
|
||||
+ b->count and *(b->arr) could be aliased if b->arr ==
|
||||
+ &b->count. But since there is no symbol that aliases
|
||||
+ with both b->arr and b->count, we miss the
|
||||
+ relationship.
|
||||
+
|
||||
+ So, if the pointed-to type is a structure, add TAG to
|
||||
+ AI->ADDRESSABLE_VARS to be handled by
|
||||
+ compute_flow_insensitive_aliasing. We only need to
|
||||
+ do this for aggregate types because pointer of scalar
|
||||
+ types will either share the same type tag or have a
|
||||
+ symbol in common. */
|
||||
+ if (AGGREGATE_TYPE_P (TREE_TYPE (tag)))
|
||||
+ create_alias_map_for (tag, ai);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1365,41 +1396,6 @@ setup_pointers_and_addressables (struct
|
||||
ann->type_mem_tag = NULL_TREE;
|
||||
}
|
||||
}
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /* If we found no addressable variables, but we have more than one
|
||||
- pointer, we will need to check for conflicts between the
|
||||
- pointers. Otherwise, we would miss alias relations as in
|
||||
- testsuite/gcc.dg/tree-ssa/20040319-1.c:
|
||||
-
|
||||
- struct bar { int count; int *arr;};
|
||||
-
|
||||
- void foo (struct bar *b)
|
||||
- {
|
||||
- b->count = 0;
|
||||
- *(b->arr) = 2;
|
||||
- if (b->count == 0)
|
||||
- abort ();
|
||||
- }
|
||||
-
|
||||
- b->count and *(b->arr) could be aliased if b->arr == &b->count.
|
||||
- To do this, we add all the memory tags for the pointers in
|
||||
- AI->POINTERS to AI->ADDRESSABLE_VARS, so that
|
||||
- compute_flow_insensitive_aliasing will naturally compare every
|
||||
- pointer to every type tag. */
|
||||
- if (ai->num_addressable_vars == 0
|
||||
- && ai->num_pointers > 1)
|
||||
- {
|
||||
- free (ai->addressable_vars);
|
||||
- ai->addressable_vars = xcalloc (ai->num_pointers,
|
||||
- sizeof (struct alias_map_d *));
|
||||
- ai->num_addressable_vars = 0;
|
||||
- for (i = 0; i < ai->num_pointers; i++)
|
||||
- {
|
||||
- struct alias_map_d *p = ai->pointers[i];
|
||||
- tree tag = var_ann (p->var)->type_mem_tag;
|
||||
- create_alias_map_for (tag, ai);
|
||||
}
|
||||
}
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-gcc_tree-vectorizer_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
--- gcc/tree-vectorizer.c.orig Tue Sep 14 08:55:08 2004
|
||||
+++ gcc/tree-vectorizer.c Tue Sep 14 08:55:18 2004
|
||||
@@ -499,7 +499,7 @@ vect_get_new_vect_var (tree type, enum v
|
||||
$OpenBSD: patch-gcc_tree-vectorizer_c,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- gcc/tree-vectorizer.c.orig Sat Nov 20 13:48:13 2004
|
||||
+++ gcc/tree-vectorizer.c Tue Nov 23 12:44:33 2004
|
||||
@@ -1542,7 +1542,7 @@ vect_get_new_vect_var (tree type, enum v
|
||||
prefix_len = strlen (prefix);
|
||||
|
||||
if (name)
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-gcc_varasm_c,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
--- gcc/varasm.c.orig Tue Sep 14 09:18:33 2004
|
||||
+++ gcc/varasm.c Tue Sep 14 09:18:41 2004
|
||||
@@ -1188,7 +1188,7 @@ assemble_start_function (tree decl, cons
|
||||
$OpenBSD: patch-gcc_varasm_c,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- gcc/varasm.c.orig Fri Nov 19 14:12:38 2004
|
||||
+++ gcc/varasm.c Tue Nov 23 12:44:33 2004
|
||||
@@ -1209,7 +1209,7 @@ assemble_start_function (tree decl, cons
|
||||
unlikely_text_section_name = NULL;
|
||||
|
||||
unlikely_section_label = reconcat (unlikely_section_label,
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
--- libstdc++-v3/libsupc++/Makefile.in.orig Sat Sep 18 17:35:15 2004
|
||||
+++ libstdc++-v3/libsupc++/Makefile.in Sat Sep 18 17:36:19 2004
|
||||
@@ -296,7 +296,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
|
||||
$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- libstdc++-v3/libsupc++/Makefile.in.orig Thu Oct 7 00:12:32 2004
|
||||
+++ libstdc++-v3/libsupc++/Makefile.in Tue Nov 23 12:44:34 2004
|
||||
@@ -298,7 +298,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
|
||||
# Need this library to both be part of libstdc++.a, and installed
|
||||
# separately too.
|
||||
# 1) separate libsupc++.la
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.1.1.1 2004/09/23 22:13:32
|
||||
# 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
|
||||
noinst_LTLIBRARIES = libsupc++convenience.la
|
||||
headers = \
|
||||
@@ -474,7 +474,7 @@ clean-toolexeclibLTLIBRARIES:
|
||||
@@ -476,7 +476,7 @@ clean-toolexeclibLTLIBRARIES:
|
||||
echo "rm -f \"$${dir}/so_locations\""; \
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
--- libstdc++-v3/src/Makefile.in.orig Tue Sep 14 01:22:33 2004
|
||||
+++ libstdc++-v3/src/Makefile.in Tue Sep 14 01:23:14 2004
|
||||
@@ -273,7 +273,7 @@ WARN_CXXFLAGS = \
|
||||
$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- libstdc++-v3/src/Makefile.in.orig Tue Nov 16 00:33:05 2004
|
||||
+++ libstdc++-v3/src/Makefile.in Tue Nov 23 12:44:34 2004
|
||||
@@ -275,7 +275,7 @@ WARN_CXXFLAGS = \
|
||||
AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
|
||||
|
||||
# Cross compiler support.
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.1.1.1 2004/09/23 22:13:31 espie
|
||||
@GLIBCXX_BUILD_VERSIONED_SHLIB_FALSE@version_arg =
|
||||
|
||||
# Symbol versioning for shared libraries.
|
||||
@@ -464,7 +464,7 @@ clean-toolexeclibLTLIBRARIES:
|
||||
@@ -469,7 +469,7 @@ clean-toolexeclibLTLIBRARIES:
|
||||
echo "rm -f \"$${dir}/so_locations\""; \
|
||||
rm -f "$${dir}/so_locations"; \
|
||||
done
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-ltcf-c_sh,v 1.1.1.1 2004/09/23 22:13:31 espie Exp $
|
||||
--- ltcf-c.sh.orig Tue Apr 27 08:14:30 2004
|
||||
+++ ltcf-c.sh Tue Sep 14 01:24:12 2004
|
||||
@@ -509,10 +509,13 @@ else
|
||||
$OpenBSD: patch-ltcf-c_sh,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
--- ltcf-c.sh.orig Sat Oct 2 18:33:06 2004
|
||||
+++ ltcf-c.sh Tue Nov 23 12:44:34 2004
|
||||
@@ -513,10 +513,13 @@ else
|
||||
;;
|
||||
|
||||
openbsd*)
|
||||
|
@ -1,3 +1,3 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
@lib lib/libestdc++.so.6.2
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
@lib lib/libestdc++.so.6.4
|
||||
@lib lib/libobjc.so.1.0
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/09/23 22:13:32 espie Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2004/11/23 18:17:34 espie Exp $
|
||||
%%SHARED%%
|
||||
bin/ec++
|
||||
bin/ecpp
|
||||
@ -167,6 +167,7 @@ include/c++/${V}/exception
|
||||
include/c++/${V}/exception_defines.h
|
||||
include/c++/${V}/ext/
|
||||
include/c++/${V}/ext/algorithm
|
||||
include/c++/${V}/ext/array_allocator.h
|
||||
include/c++/${V}/ext/bitmap_allocator.h
|
||||
include/c++/${V}/ext/debug_allocator.h
|
||||
include/c++/${V}/ext/enc_filebuf.h
|
||||
@ -207,9 +208,13 @@ include/c++/${V}/${CONFIG}/bits/cxxabi_tweaks.h
|
||||
include/c++/${V}/${CONFIG}/bits/gthr-default.h
|
||||
include/c++/${V}/${CONFIG}/bits/gthr-posix.h
|
||||
include/c++/${V}/${CONFIG}/bits/gthr-single.h
|
||||
include/c++/${V}/${CONFIG}/bits/gthr-tpf.h
|
||||
include/c++/${V}/${CONFIG}/bits/gthr.h
|
||||
include/c++/${V}/${CONFIG}/bits/messages_members.h
|
||||
include/c++/${V}/${CONFIG}/bits/os_defines.h
|
||||
include/c++/${V}/${CONFIG}/bits/stdc++.h.gch/
|
||||
include/c++/${V}/${CONFIG}/bits/stdc++.h.gch/O0g.gch
|
||||
include/c++/${V}/${CONFIG}/bits/stdc++.h.gch/O2g.gch
|
||||
include/c++/${V}/${CONFIG}/bits/time_members.h
|
||||
include/c++/${V}/iomanip
|
||||
include/c++/${V}/ios
|
||||
@ -232,6 +237,9 @@ include/c++/${V}/stack
|
||||
include/c++/${V}/stdexcept
|
||||
include/c++/${V}/streambuf
|
||||
include/c++/${V}/string
|
||||
include/c++/${V}/tr1/
|
||||
include/c++/${V}/tr1/array
|
||||
include/c++/${V}/tr1/tuple
|
||||
include/c++/${V}/typeinfo
|
||||
include/c++/${V}/utility
|
||||
include/c++/${V}/valarray
|
||||
@ -246,6 +254,8 @@ lib/gcc/${CONFIG}/
|
||||
lib/gcc/${CONFIG}/${V}/
|
||||
lib/gcc/${CONFIG}/${V}/include/
|
||||
lib/gcc/${CONFIG}/${V}/include/README
|
||||
lib/gcc/${CONFIG}/${V}/include/arpa/
|
||||
lib/gcc/${CONFIG}/${V}/include/arpa/nameser.h
|
||||
lib/gcc/${CONFIG}/${V}/include/com_err.h
|
||||
lib/gcc/${CONFIG}/${V}/include/limits.h
|
||||
lib/gcc/${CONFIG}/${V}/include/math.h
|
||||
@ -269,7 +279,6 @@ lib/gcc/${CONFIG}/${V}/include/stddef.h
|
||||
lib/gcc/${CONFIG}/${V}/include/stdio.h
|
||||
lib/gcc/${CONFIG}/${V}/include/stdlib.h
|
||||
lib/gcc/${CONFIG}/${V}/include/sys/
|
||||
lib/gcc/${CONFIG}/${V}/include/sys/limits.h
|
||||
lib/gcc/${CONFIG}/${V}/include/sys/types.h
|
||||
lib/gcc/${CONFIG}/${V}/include/syslimits.h
|
||||
lib/gcc/${CONFIG}/${V}/include/unistd.h
|
||||
@ -278,17 +287,18 @@ lib/gcc/${CONFIG}/${V}/install-tools/gsyslimits.h
|
||||
lib/gcc/${CONFIG}/${V}/install-tools/include/
|
||||
lib/gcc/${CONFIG}/${V}/install-tools/include/README
|
||||
lib/gcc/${CONFIG}/${V}/install-tools/include/limits.h
|
||||
lib/gcc/${CONFIG}/${V}/install-tools/macro_list
|
||||
lib/gcc/${CONFIG}/${V}/install-tools/mkheaders.conf
|
||||
lib/gcc/${CONFIG}/${V}/libgcc.a
|
||||
lib/gcc/${CONFIG}/${V}/libgcov.a
|
||||
lib/gcc/${CONFIG}/${V}/specs
|
||||
lib/libestdc++.a
|
||||
lib/libestdc++.la
|
||||
lib/libesupc++.a
|
||||
lib/libesupc++.la
|
||||
lib/libiberty.a
|
||||
lib/libobjc.a
|
||||
lib/libobjc.la
|
||||
lib/libesupc++.a
|
||||
lib/libesupc++.la
|
||||
libexec/gcc/
|
||||
libexec/gcc/${CONFIG}/
|
||||
libexec/gcc/${CONFIG}/${V}/
|
||||
|
Loading…
Reference in New Issue
Block a user