update to 2.6

ok sthen@
This commit is contained in:
jsg 2009-11-02 23:00:08 +00:00
parent d264b944d0
commit 20eb3476c5
11 changed files with 62 additions and 110 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2009/08/12 21:31:45 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2009/11/02 23:00:08 jsg Exp $
# XXX WORK IN PROGRESS.
@ -11,14 +11,9 @@ ONLY_FOR_ARCHS = i386
COMMENT = gcc4 front-end for LLVM
GCC_V = 4.2.1
LLVM_V = 2.6pre20090808
LLVM_V = 2.6
DISTNAME = llvm-gcc-4.2-${LLVM_V}.source
PKGNAME = ${DISTNAME:S/.source//:S/gcc-/gcc/}
EXTRACT_SUFX = .tar.lzma
do-extract:
cd ${WRKDIR} && \
lzma -dc ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} | ${TAR} xf -
SHARED_LIBS = ssp 0.0 \
objc 2.0 \
@ -37,8 +32,8 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB += c m pthread
USE_LIBTOOL = yes
MASTER_SITES = http://spacehopper.org/mirrors/
#MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
#MASTER_SITES = http://spacehopper.org/mirrors/
MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
MODULES = gcc4
LIB_DEPENDS = elf::devel/libelf
@ -77,7 +72,7 @@ CONFIGURE_ARGS += --enable-checking
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/gcc
WRKDIST = ${WRKDIR}/${DISTNAME:S/.source//}
WRKDIST= ${WRKDIR}/${DISTNAME:S/gcc-/gcc/}
WRKSRC = ${WRKDIST}/obj
post-extract:

View File

@ -1,5 +1,5 @@
MD5 (llvm-gcc-4.2-2.6pre20090808.source.tar.lzma) = jyRoftel/SObihn/z4+UQQ==
RMD160 (llvm-gcc-4.2-2.6pre20090808.source.tar.lzma) = aEjbAAT0FSeqQQOTiZtz/xIms5I=
SHA1 (llvm-gcc-4.2-2.6pre20090808.source.tar.lzma) = 8ioRQcBDjLZBaNP42EQCQG/vaXk=
SHA256 (llvm-gcc-4.2-2.6pre20090808.source.tar.lzma) = gkQ83jUWD5bbch5gr/RH+uTQkyxAb6E/Ok28zXLKp+M=
SIZE (llvm-gcc-4.2-2.6pre20090808.source.tar.lzma) = 34196174
MD5 (llvm-gcc-4.2-2.6.source.tar.gz) = ToxaEDVwHCMdv8firy11cQ==
RMD160 (llvm-gcc-4.2-2.6.source.tar.gz) = CNf/rbiOOr3MlxNy9zfk3fj5kcY=
SHA1 (llvm-gcc-4.2-2.6.source.tar.gz) = YGcNVQvgmlfTFe+iWdKxmVX2+nk=
SHA256 (llvm-gcc-4.2-2.6.source.tar.gz) = W+AfDtB4fDMjmrJ7k4hOSLVEob6XuUTHpdKehfurSV0=
SIZE (llvm-gcc-4.2-2.6.source.tar.gz) = 48364917

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gcc_c-common_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
--- gcc/c-common.c.orig Mon May 4 17:45:55 2009
+++ gcc/c-common.c Mon Jun 22 00:58:03 2009
$OpenBSD: patch-gcc_c-common_c,v 1.2 2009/11/02 23:00:08 jsg Exp $
--- gcc/c-common.c.orig Mon Jul 27 20:38:17 2009
+++ gcc/c-common.c Sat Oct 31 03:52:35 2009
@@ -641,6 +641,8 @@ static tree handle_cleanup_attribute (tree *, tree, tr
static tree handle_warn_unused_result_attribute (tree *, tree, tree, int,
bool *);
@ -19,7 +19,7 @@ $OpenBSD: patch-gcc_c-common_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
{ "visibility", 1, 1, false, false, false,
handle_visibility_attribute },
{ "tls_model", 1, 1, true, false, false,
@@ -5807,6 +5811,15 @@ handle_vector_size_attribute (tree *node, tree name, t
@@ -5810,6 +5814,15 @@ handle_vector_size_attribute (tree *node, tree name, t
*node = reconstruct_complex_type (*node, new_type);
return NULL_TREE;

View File

@ -1,6 +1,6 @@
--- gcc/config.gcc.orig Tue Jun 16 19:53:18 2009
+++ gcc/config.gcc Mon Jun 22 00:53:54 2009
@@ -598,6 +598,11 @@ case ${target} in
--- gcc/config.gcc.orig Fri Aug 7 01:47:35 2009
+++ gcc/config.gcc Sat Oct 31 03:52:35 2009
@@ -611,6 +611,11 @@ case ${target} in
*-*-openbsd2.*|*-*-openbsd3.[012])
tm_defines="${tm_defines} HAS_LIBC_R=1" ;;
esac
@ -12,7 +12,7 @@
;;
*-*-rtems*)
case ${enable_threads} in
@@ -664,7 +669,7 @@ alpha*-*-netbsd*)
@@ -677,7 +682,7 @@ alpha*-*-netbsd*)
;;
alpha*-*-openbsd*)
tm_defines="${tm_defines} OBSD_NO_DYNAMIC_LIBRARIES OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT"
@ -21,7 +21,7 @@
# default x-alpha is only appropriate for dec-osf.
target_cpu_default="MASK_GAS"
tmake_file="alpha/t-alpha alpha/t-ieee"
@@ -1139,10 +1144,15 @@ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
@@ -1152,10 +1157,15 @@ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
;;
i[34567]86-*-openbsd*)
tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
@ -38,7 +38,7 @@
i[34567]86-*-coff*)
tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
use_fixproto=yes
@@ -1542,7 +1552,7 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
@@ -1555,7 +1565,7 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
m68k*-*-openbsd*)
# needed to unconfuse gdb
tm_defines="${tm_defines} OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68881|MASK_BITFIELD)"
@ -47,7 +47,7 @@
tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
# we need collect2 until our bug is fixed...
use_collect2=yes
@@ -1632,7 +1642,7 @@ mips*-*-linux*) # Linux MIPS, either endian.
@@ -1645,7 +1655,7 @@ mips*-*-linux*) # Linux MIPS, either endian.
mips*-*-openbsd*)
tm_defines="${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS"
target_cpu_default="MASK_ABICALLS"
@ -56,7 +56,7 @@
case ${target} in
mips*el-*-openbsd*)
tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
@@ -1762,11 +1772,11 @@ pdp11-*-bsd)
@@ -1775,11 +1785,11 @@ pdp11-*-bsd)
pdp11-*-*)
use_fixproto=yes
;;
@ -73,7 +73,7 @@
powerpc64-*-linux*)
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
test x$with_cpu != x || cpu_is_64bit=yes
@@ -2240,7 +2250,7 @@ sparc-*-netbsdelf*)
@@ -2253,7 +2263,7 @@ sparc-*-netbsdelf*)
extra_options="${extra_options} sparc/long-double-switch.opt"
;;
sparc64-*-openbsd*)
@ -82,7 +82,7 @@
extra_options="${extra_options} sparc/little-endian.opt"
gas=yes gnu_ld=yes
with_cpu=ultrasparc
@@ -2506,7 +2516,7 @@ vax-*-netbsd*)
@@ -2519,7 +2529,7 @@ vax-*-netbsd*)
use_collect2=yes
;;
vax-*-openbsd*)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_cp_decl2_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
--- gcc/cp/decl2.c.orig Mon Nov 3 02:04:09 2008
+++ gcc/cp/decl2.c Mon Jun 22 00:53:58 2009
@@ -3317,7 +3317,7 @@ build_java_method_aliases (void)
$OpenBSD: patch-gcc_cp_decl2_c,v 1.2 2009/11/02 23:00:08 jsg Exp $
--- gcc/cp/decl2.c.orig Wed Jul 22 22:36:27 2009
+++ gcc/cp/decl2.c Sat Oct 31 03:52:36 2009
@@ -3320,7 +3320,7 @@ build_java_method_aliases (void)
oid = DECL_ASSEMBLER_NAME (fndecl);
oname = IDENTIFIER_POINTER (oid);
gcc_assert (oname[0] == '_' && oname[1] == 'Z');

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_cp_parser_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
--- gcc/cp/parser.c.orig Sun Feb 15 04:17:54 2009
+++ gcc/cp/parser.c Mon Jun 22 00:53:59 2009
@@ -17612,7 +17612,7 @@ cp_parser_require (cp_parser* parser,
$OpenBSD: patch-gcc_cp_parser_c,v 1.2 2009/11/02 23:00:08 jsg Exp $
--- gcc/cp/parser.c.orig Mon Jul 13 16:11:20 2009
+++ gcc/cp/parser.c Sat Oct 31 03:52:37 2009
@@ -17626,7 +17626,7 @@ cp_parser_require (cp_parser* parser,
/* Output the MESSAGE -- unless we're parsing tentatively. */
if (!cp_parser_simulate_error (parser))
{

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
--- gcc/gcc.c.orig Mon Jun 22 01:17:01 2009
+++ gcc/gcc.c Mon Jun 22 01:17:03 2009
@@ -1406,7 +1406,7 @@ translate_options (int *argcp, const char *const **arg
$OpenBSD: patch-gcc_gcc_c,v 1.2 2009/11/02 23:00:08 jsg Exp $
--- gcc/gcc.c.orig Mon Aug 17 11:12:42 2009
+++ gcc/gcc.c Sat Oct 31 03:58:15 2009
@@ -1407,7 +1407,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,
@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
else if (arg != 0)
{
newv[newindex++] = option_map[j].equivalent;
@@ -1746,7 +1746,7 @@ init_gcc_specs (struct obstack *obstack, const char *s
@@ -1747,7 +1747,7 @@ init_gcc_specs (struct obstack *obstack, const char *s
"%{shared:", shared_name, "}"
#endif
#endif
@ -19,7 +19,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
obstack_grow (obstack, buf, strlen (buf));
free (buf);
@@ -1944,7 +1944,7 @@ set_spec (const char *name, const char *spec)
@@ -1945,7 +1945,7 @@ set_spec (const char *name, const char *spec)
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 2009/06/22 22:37:32 sthen Exp $
: xstrdup (spec));
#ifdef DEBUG_SPECS
@@ -2514,12 +2514,12 @@ for_each_path (const struct path_prefix *paths,
@@ -2515,12 +2515,12 @@ for_each_path (const struct path_prefix *paths,
just_multi_suffix = just_machine_suffix;
if (do_multi && multilib_dir && strcmp (multilib_dir, ".") != 0)
{
@ -45,7 +45,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
while (1)
{
@@ -2867,8 +2867,8 @@ add_sysrooted_prefix (struct path_prefix *pprefix, con
@@ -2868,8 +2868,8 @@ add_sysrooted_prefix (struct path_prefix *pprefix, con
if (target_system_root)
{
if (target_sysroot_suffix)
@ -56,7 +56,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
/* We have to override this because GCC's notion of sysroot
moves along with GCC. */
@@ -3506,7 +3506,7 @@ process_command (int argc, const char **argv)
@@ -3513,7 +3513,7 @@ process_command (int argc, const char **argv)
break;
new_argv0 = xmemdup (progname, baselen,
baselen + concat_length (new_version, new_machine,
@ -65,25 +65,25 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
strcpy (new_argv0 + baselen, new_machine);
strcat (new_argv0, "-gcc-");
strcat (new_argv0, new_version);
@@ -3533,7 +3533,7 @@ process_command (int argc, const char **argv)
standard_bindir_prefix,
standard_libexec_prefix);
@@ -3563,7 +3563,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
{
@@ -3541,7 +3541,7 @@ process_command (int argc, const char **argv)
@@ -3571,7 +3571,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);
@@ -3588,7 +3588,7 @@ process_command (int argc, const char **argv)
gcc_libexec_prefix = get_relative_prefix (tmp_prefix,
standard_exec_prefix,
standard_libexec_prefix);
@@ -3618,7 +3618,7 @@ process_command (int argc, const char **argv)
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
@ -92,7 +92,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3622,7 +3622,7 @@ process_command (int argc, const char **argv)
@@ -3652,7 +3652,7 @@ process_command (int argc, const char **argv)
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
@ -101,7 +101,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -3655,7 +3655,7 @@ process_command (int argc, const char **argv)
@@ -3685,7 +3685,7 @@ process_command (int argc, const char **argv)
{
strncpy (nstore, startp, endp - startp);
if (endp == startp)
@ -110,7 +110,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
else if (!IS_DIR_SEPARATOR (endp[-1]))
{
nstore[endp - startp] = DIR_SEPARATOR;
@@ -4178,7 +4178,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
@@ -4205,7 +4205,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
PREFIX_PRIORITY_LAST, 1, 0);
tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
@ -119,7 +119,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
/* If tooldir is relative, base it on exec_prefixes. A relative
tooldir lets us move the installed tree as a unit.
@@ -4193,28 +4193,28 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
@@ -4220,28 +4220,28 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
{
char *gcc_exec_tooldir_prefix
= concat (gcc_exec_prefix, spec_machine, dir_separator_str,
@ -154,7 +154,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
"BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
#if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
@@ -4338,7 +4338,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR
@@ -4367,7 +4367,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 = "*";
@ -163,7 +163,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
}
else if (strncmp (argv[i], "-l", 2) == 0)
{
@@ -6618,8 +6618,8 @@ main (int argc, char **argv)
@@ -6647,8 +6647,8 @@ main (int argc, char **argv)
/* Read specs from a file if there is one. */
machine_suffix = concat (spec_machine, dir_separator_str,
@ -174,7 +174,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, true);
/* Read the specs file unless it is a default one. */
@@ -6743,7 +6743,7 @@ main (int argc, char **argv)
@@ -6772,7 +6772,7 @@ main (int argc, char **argv)
if (gcc_exec_prefix)
add_prefix (&startfile_prefixes,
concat (gcc_exec_prefix, machine_suffix,
@ -183,7 +183,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
NULL, PREFIX_PRIORITY_LAST, 0, 1);
/* APPLE LOCAL begin ARM sysroot startfile_prefixes */
@@ -6753,13 +6753,13 @@ main (int argc, char **argv)
@@ -6782,13 +6782,13 @@ main (int argc, char **argv)
add_sysrooted_prefix (&startfile_prefixes,
concat (standard_exec_prefix,
machine_suffix,
@ -199,7 +199,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
NULL, PREFIX_PRIORITY_LAST, 0, 1);
/* APPLE LOCAL end ARM sysroot startfile_prefixes */
}
@@ -6788,7 +6788,7 @@ main (int argc, char **argv)
@@ -6817,7 +6817,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,

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gcc_testsuite_ada_acats_run_acats,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
--- gcc/testsuite/ada/acats/run_acats.orig Fri Jan 7 04:04:46 2005
+++ gcc/testsuite/ada/acats/run_acats Fri Jan 7 04:06:26 2005
@@ -7,8 +7,8 @@ fi
# Set up environment to use the Ada compiler from the object tree
-host_gnatchop=`type gnatchop | awk '{print $3}'`
-host_gnatmake=`type gnatmake | awk '{print $3}'`
+host_gnatchop=`which gnatchop`
+host_gnatmake=`which gnatmake`
ROOT=`${PWDCMD-pwd}`
BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}`

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gcc_testsuite_ada_acats_run_all_sh,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
--- gcc/testsuite/ada/acats/run_all.sh.orig Mon May 8 18:50:40 2006
+++ gcc/testsuite/ada/acats/run_all.sh Sun Jul 23 11:24:02 2006
@@ -84,7 +84,7 @@ display target gcc is $GCC
display `$GCC -v 2>&1`
display host=`gcc -dumpmachine`
display target=$target
-display `type gnatmake`
+display `which gnatmake`
gnatls -v >> $dir/acats.log
display ""

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-gcc_testsuite_gcc_dg_format_format_h,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
--- gcc/testsuite/gcc.dg/format/format.h.orig Sat Jul 22 23:16:52 2006
+++ gcc/testsuite/gcc.dg/format/format.h Sat Jul 22 23:17:34 2006
@@ -4,11 +4,13 @@
#include <stdarg.h>
#include <stddef.h>
+#ifndef _WINT_T_DEFINED_
#ifndef _WINT_T
#ifndef __WINT_TYPE__
#define __WINT_TYPE__ unsigned int
#endif
typedef __WINT_TYPE__ wint_t;
+#endif
#endif
/* Kludges to get types corresponding to size_t and ptrdiff_t. */

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gcc_tree_c,v 1.1.1.1 2009/06/22 22:37:32 sthen Exp $
--- gcc/tree.c.orig Thu Mar 19 22:14:10 2009
+++ gcc/tree.c Mon Jun 22 00:54:05 2009
@@ -6931,11 +6931,11 @@ build_common_builtin_nodes (void)
$OpenBSD: patch-gcc_tree_c,v 1.2 2009/11/02 23:00:08 jsg Exp $
--- gcc/tree.c.orig Thu Aug 20 20:28:41 2009
+++ gcc/tree.c Sat Oct 31 03:54:34 2009
@@ -6938,11 +6938,11 @@ build_common_builtin_nodes (void)
*q = TOLOWER (*p);
*q = '\0';