gcc 3.0.2. Some patches gone.

Rename packages for various reasons.
This commit is contained in:
espie 2001-10-31 18:46:28 +00:00
parent 67a38a8606
commit f5575afe98
11 changed files with 27 additions and 181 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.50 2001/10/08 19:10:03 espie Exp $
# $OpenBSD: Makefile,v 1.51 2001/10/31 18:46:28 espie Exp $
# This is a configuration file for egcs
@ -10,19 +10,19 @@ COMMENT-g77= ${COM}: f77 compiler
COMMENT-java= ${COM}: java compiler
COMMENT-objc= ${COM}: obj C compiler
PKGNAME= ${DISTNAME}-core
PKGNAME-c++ = ${DISTNAME}-c++
PKGNAME-chill= ${DISTNAME}-chill
PKGNAME-g77= ${DISTNAME}-g77
PKGNAME-java= ${DISTNAME}-java
PKGNAME-objc= ${DISTNAME}-objc
PKGNAME= gcc-$V
PKGNAME-c++ = g++-$V
PKGNAME-chill= gchill-$V
PKGNAME-g77= g77-$V
PKGNAME-java= gcj-$V
PKGNAME-objc= gobjc-$V
# we could remove this dependency by patching configure, but this is not
# reasonable...
BUILD_DEPENDS= ::devel/autoconf
# This should be patched out later.
BUILD_DEPENDS+= bison:bison-*:devel/bison
BUILD_DEPENDS+= :bison-*:devel/bison
CATEGORIES= lang
NEED_VERSION= 1.474
@ -63,7 +63,7 @@ BUILD_DEPENDS+=:bison-*:devel/bison
#### fetch section
V=3.0.1
V=3.0.2
DIRECTORY=releases/${DISTNAME}/
DISTNAME= gcc-$V
@ -283,7 +283,7 @@ TEST_RESULT=${WRKBUILD}/test.result
do-regress:
@cd ${WRKBUILD}; ulimit -c 0; \
${MAKE_ENV} make -f ${MAKE_FILE} check && \
${MAKE_ENV} ${MAKE_PROGRAM} -k -f ${MAKE_FILE} check && \
${WRKSRC}/contrib/test_summary >${TEST_RESULT}
@echo "Please send the tests results to the gcc project"
@echo "By invoking make send-results"
@ -300,7 +300,7 @@ GCC_NAME=${WRKBUILD}/gcc/xgcc
.if defined(PACKAGING) && defined(SUBPACKAGE)
. if !empty(SUBPACKAGE)
RUN_DEPENDS+=egcc::lang/egcs/stable
RUN_DEPENDS+=::lang/egcs/stable
. endif
.endif

View File

@ -1,3 +1,3 @@
MD5 (egcs/gcc-3.0.1.tar.gz) = 9d34758cdc6194e115513c95d8dac824
RMD160 (egcs/gcc-3.0.1.tar.gz) = 90f72f27b88579f4fe68d38dbdcb5d30076b89eb
SHA1 (egcs/gcc-3.0.1.tar.gz) = f7492884a2d37a11ffdefb2c6174f89ff03ef00f
MD5 (egcs/gcc-3.0.2.tar.gz) = 129edec1d543d0ca1aeedaf4b49e8d45
RMD160 (egcs/gcc-3.0.2.tar.gz) = c23a18346178173d558a3a8fb6fc45d719550303
SHA1 (egcs/gcc-3.0.2.tar.gz) = 55d98bf8ac96d10aea7a5965f086ea8b8cf16f7e

View File

@ -1,122 +0,0 @@
$OpenBSD: patch-gcc_config_i386_i386_c,v 1.1 2001/09/12 22:12:54 espie Exp $
--- gcc/config/i386/i386.c.orig Mon Aug 6 23:26:24 2001
+++ gcc/config/i386/i386.c Wed Sep 12 20:38:45 2001
@@ -417,7 +417,12 @@ int ix86_align_loops;
/* Power of two alignment for non-loop jumps. */
int ix86_align_jumps;
+
+/* Prefix built by ASM_GENERATE_INTERNAL_LABEL. */
+static char internal_label_prefix[16];
+static int internal_label_prefix_len;
+static int local_symbolic_operand PARAMS ((rtx, enum machine_mode));
static void output_pic_addr_const PARAMS ((FILE *, rtx, int));
static void put_condition_code PARAMS ((enum rtx_code, enum machine_mode,
int, int, FILE *));
@@ -693,6 +698,15 @@ override_options ()
on by -msse. */
if (TARGET_SSE)
target_flags |= MASK_MMX;
+
+ /* Figure out what ASM_GENERATE_INTERNAL_LABEL builds as a prefix. */
+ {
+ char *p;
+ ASM_GENERATE_INTERNAL_LABEL (internal_label_prefix, "LX", 0);
+ p = strchr (internal_label_prefix, 'X');
+ internal_label_prefix_len = p - internal_label_prefix;
+ *p = '\0';
+ }
}
/* A C statement (sans semicolon) to choose the order in which to
@@ -1128,6 +1142,40 @@ pic_symbolic_operand (op, mode)
return 0;
}
+/* Return true if OP is a symbolic operand that resolves locally. */
+
+static int
+local_symbolic_operand (op, mode)
+ rtx op;
+ enum machine_mode mode ATTRIBUTE_UNUSED;
+{
+ if (GET_CODE (op) == LABEL_REF)
+ return 1;
+
+ if (GET_CODE (op) == CONST
+ && GET_CODE (XEXP (op, 0)) == PLUS
+ && GET_CODE (XEXP (XEXP (op, 0), 1)) == CONST_INT)
+ op = XEXP (XEXP (op, 0), 0);
+
+ if (GET_CODE (op) != SYMBOL_REF)
+ return 0;
+
+ /* These we've been told are local by varasm and encode_section_info
+ respectively. */
+ if (CONSTANT_POOL_ADDRESS_P (op) || SYMBOL_REF_FLAG (op))
+ return 1;
+
+ /* There is, however, a not insubstantial body of code in the rest of
+ the compiler that assumes it can just stick the results of
+ ASM_GENERATE_INTERNAL_LABEL in a symbol_ref and have done. */
+
+ if (strncmp (XSTR (op, 0), internal_label_prefix,
+ internal_label_prefix_len) == 0)
+ return 1;
+
+ return 0;
+}
+
/* Test for a valid operand for a call instruction. Don't allow the
arg pointer register or virtual regs since they may decay into
reg + const, which the patterns can't handle. */
@@ -2530,15 +2578,16 @@ legitimate_pic_address_disp_p (disp)
return 0;
/* Must be @GOT or @GOTOFF. */
- if (XINT (disp, 1) != 6
- && XINT (disp, 1) != 7)
- return 0;
-
- if (GET_CODE (XVECEXP (disp, 0, 0)) != SYMBOL_REF
- && GET_CODE (XVECEXP (disp, 0, 0)) != LABEL_REF)
- return 0;
+ switch (XINT (disp, 1))
+ {
+ case 6: /* @GOT */
+ return GET_CODE (XVECEXP (disp, 0, 0)) == SYMBOL_REF;
- return 1;
+ case 7: /* @GOTOFF */
+ return local_symbolic_operand (XVECEXP (disp, 0, 0), Pmode);
+ }
+
+ return 0;
}
/* GO_IF_LEGITIMATE_ADDRESS recognizes an RTL expression that is a valid
@@ -2767,10 +2816,7 @@ legitimize_pic_address (orig, reg)
rtx new = orig;
rtx base;
- if (GET_CODE (addr) == LABEL_REF
- || (GET_CODE (addr) == SYMBOL_REF
- && (CONSTANT_POOL_ADDRESS_P (addr)
- || SYMBOL_REF_FLAG (addr))))
+ if (local_symbolic_operand (addr, Pmode))
{
/* This symbol may be referenced via a displacement from the PIC
base address (@GOTOFF). */
@@ -2822,10 +2868,7 @@ legitimize_pic_address (orig, reg)
/* Check first to see if this is a constant offset from a @GOTOFF
symbol reference. */
- if ((GET_CODE (op0) == LABEL_REF
- || (GET_CODE (op0) == SYMBOL_REF
- && (CONSTANT_POOL_ADDRESS_P (op0)
- || SYMBOL_REF_FLAG (op0))))
+ if (local_symbolic_operand (op0, Pmode)
&& GET_CODE (op1) == CONST_INT)
{
current_function_uses_pic_offset_table = 1;

View File

@ -1,29 +0,0 @@
$OpenBSD: patch-gcc_config_i386_unix_h,v 1.1 2001/09/12 22:15:53 espie Exp $
--- gcc/config/i386/unix.h.orig Wed Sep 12 21:28:57 2001
+++ gcc/config/i386/unix.h Wed Sep 12 22:23:47 2001
@@ -87,7 +87,7 @@ Boston, MA 02111-1307, USA. */
#define ASM_OUTPUT_MI_THUNK(FILE, THUNK_FNDECL, DELTA, FUNCTION) \
do { \
tree parm; \
- rtx xops[2]; \
+ rtx xops[3]; \
\
if (ix86_regparm > 0) \
parm = TYPE_ARG_TYPES (TREE_TYPE (function)); \
@@ -110,6 +110,7 @@ do { \
{ \
xops[0] = pic_offset_table_rtx; \
xops[1] = gen_label_rtx (); \
+ xops[2] = gen_rtx_SYMBOL_REF (Pmode, "_GLOBAL_OFFSET_TABLE_"); \
\
if (ix86_regparm > 2) \
abort (); \
@@ -117,7 +118,7 @@ do { \
output_asm_insn ("call\t%P1", xops); \
ASM_OUTPUT_INTERNAL_LABEL (FILE, "L", CODE_LABEL_NUMBER (xops[1])); \
output_asm_insn ("pop{l}\t%0", xops); \
- output_asm_insn ("add{l}\t{$_GLOBAL_OFFSET_TABLE_+[.-%P1], %0|%0, OFFSET FLAT: _GLOBAL_OFFSET_TABLE_+[.-%P1]}", xops); \
+ output_asm_insn ("add{l}\t{%2+[.-%P1], %0|%0, OFFSET FLAT: %2+[.-%P1]}", xops); \
xops[0] = gen_rtx_MEM (SImode, XEXP (DECL_RTL (FUNCTION), 0)); \
output_asm_insn ("mov{l}\t{%0@GOT(%%ebx), %%ecx|%%ecx, %0@GOT[%%ebx]}",\
xops); \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libstdc++-v3_libmath_Makefile_am,v 1.1 2001/09/15 11:51:35 espie Exp $
$OpenBSD: patch-libstdc++-v3_libmath_Makefile_am,v 1.2 2001/10/31 18:46:29 espie Exp $
--- libstdc++-v3/libmath/Makefile.am.orig Thu Jul 26 20:25:42 2001
+++ libstdc++-v3/libmath/Makefile.am Fri Sep 14 23:13:05 2001
+++ libstdc++-v3/libmath/Makefile.am Sat Sep 15 15:15:28 2001
@@ -39,7 +39,11 @@ libmath_la_DEPENDENCIES = $(libmath_la_L
libmath_la_SOURCES = signbit.c signbitf.c stubs.c

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libstdc++-v3_libmath_Makefile_in,v 1.3 2001/09/15 11:51:35 espie Exp $
$OpenBSD: patch-libstdc++-v3_libmath_Makefile_in,v 1.4 2001/10/31 18:46:29 espie Exp $
--- libstdc++-v3/libmath/Makefile.in.orig Tue Aug 14 00:22:26 2001
+++ libstdc++-v3/libmath/Makefile.in Fri Sep 14 23:13:05 2001
+++ libstdc++-v3/libmath/Makefile.in Sat Sep 15 15:15:29 2001
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared-c++,v 1.1 2001/09/15 11:51:35 espie Exp $
lib/libstdc++.so.3.1
@comment $OpenBSD: PFRAG.shared-c++,v 1.2 2001/10/31 18:46:29 espie Exp $
lib/libstdc++.so.3.2

View File

@ -1,7 +1,5 @@
@comment $OpenBSD: PLIST,v 1.7 2001/09/15 11:51:35 espie Exp $
@option no-default-conflict
@comment $OpenBSD: PLIST,v 1.8 2001/10/31 18:46:29 espie Exp $
@pkgcfl egcs-*-core
@pkgcfl gcc-*-core
@unexec install-info --delete --info-dir=%D/info %D/info/cpp.info
@unexec install-info --delete --info-dir=%D/info %D/info/cppinternals.info
@unexec install-info --delete --info-dir=%D/info %D/info/gcc.info
@ -66,6 +64,7 @@ lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/float.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/limits.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/machine/ansi.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/stdarg.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/stdbool.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/syslimits.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/include/varargs.h
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/libgcc.a

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST-c++,v 1.3 2001/08/22 09:03:04 espie Exp $
@option no-default-conflict
@comment $OpenBSD: PLIST-c++,v 1.4 2001/10/31 18:46:29 espie Exp $
@pkgcfl egcs-*-c++
@pkgcfl gcc-*-c++
bin/ec++
@ -237,6 +236,8 @@ lib/libsupc++.a
lib/libsupc++.la
man/man1/eg++.1
@dirrm include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}/bits
@dirrm include/g++-v3/${MACHINE_ARCH}-unknown-openbsd${OSREV}
@dirrm include/g++-v3/ext
@dirrm include/g++-v3/bits
@dirrm include/g++-v3/backward
@dirrm include/g++-v3

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST-g77,v 1.3 2001/08/22 09:03:04 espie Exp $
@option no-default-conflict
@comment $OpenBSD: PLIST-g77,v 1.4 2001/10/31 18:46:29 espie Exp $
@pkgcfl egcs-*-g77
@pkgcfl gcc-*-g77
@unexec install-info --delete --info-dir=%D/info %D/info/g77.info
@ -18,7 +17,6 @@ info/g77.info-18
info/g77.info-19
info/g77.info-2
info/g77.info-20
info/g77.info-21
info/g77.info-3
info/g77.info-4
info/g77.info-5

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST-objc,v 1.3 2001/08/22 09:03:04 espie Exp $
@option no-default-conflict
@comment $OpenBSD: PLIST-objc,v 1.4 2001/10/31 18:46:29 espie Exp $
@pkgcfl egcs-*-objc
@pkgcfl gcc-*-objc
lib/gcc-lib/${MACHINE_ARCH}-unknown-openbsd${OSREV}/${V}/cc1obj