rpms/gcc/devel gcc41-pr25324.patch, NONE, 1.1 gcc41-rh176562.patch, NONE, 1.1 .cvsignore, 1.123, 1.124 gcc41.spec, 1.14, 1.15 sources, 1.125, 1.126 gcc41-pr25005.patch, 1.1, NONE gcc41-pr25307.patch, 1.1, NONE gcc41-pr25328-test.patch, 1.1, NONE gcc41-pr25364.patch, 1.1, NONE gcc41-pr25369.patch, 1.1, NONE gcc41-pr25432.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jan 5 10:57:30 UTC 2006
Author: jakub
Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9395
Modified Files:
.cvsignore gcc41.spec sources
Added Files:
gcc41-pr25324.patch gcc41-rh176562.patch
Removed Files:
gcc41-pr25005.patch gcc41-pr25307.patch
gcc41-pr25328-test.patch gcc41-pr25364.patch
gcc41-pr25369.patch gcc41-pr25432.patch
Log Message:
4.1.0-0.13
gcc41-pr25324.patch:
Make-lang.in | 1
gfortran.h | 2
lang-specs.h | 6 +-
lang.opt | 4 +
options.c | 34 ++++++++++--
scanner.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
6 files changed, 198 insertions(+), 14 deletions(-)
--- NEW FILE gcc41-pr25324.patch ---
2005-12-31 Jakub Jelinek <jakub at redhat.com>
PR fortran/25324
* Make-lang.in (fortran/scanner.o): Depend on toplev.h.
* lang.opt (fpreprocessed): New option.
* scanner.c: Include toplev.h.
(gfc_src_file, gfc_src_preprocessor_lines): New variables.
(preprocessor_line): Unescape filename if there were any
backslashes.
(load_file): If initial and gfc_src_file is not NULL,
use it rather than opening the file. If gfc_src_preprocessor_lines
has non-NULL elements, pass it to preprocessor_line.
(unescape_filename, gfc_read_orig_filename): New functions.
* gfortran.h (gfc_option_t): Add flag_preprocessed.
(gfc_read_orig_filename): New prototype.
* options.c (gfc_init_options): Clear flag_preprocessed.
(gfc_post_options): If flag_preprocessed, call
gfc_read_orig_filename.
(gfc_handle_option): Handle OPT_fpreprocessed.
* lang-specs.h: Pass -fpreprocessed to f951 if preprocessing
sources.
--- gcc/fortran/Make-lang.in.jj 2005-12-13 08:47:45.000000000 +0100
+++ gcc/fortran/Make-lang.in 2005-12-31 01:01:57.000000000 +0100
@@ -269,6 +269,7 @@ GFORTRAN_TRANS_DEPS = fortran/gfortran.h
fortran/f95-lang.o: $(GFORTRAN_TRANS_DEPS) fortran/mathbuiltins.def \
gt-fortran-f95-lang.h gtype-fortran.h cgraph.h $(TARGET_H)
+fortran/scanner.o: toplev.h
fortran/convert.o: $(GFORTRAN_TRANS_DEPS)
fortran/trans.o: $(GFORTRAN_TRANS_DEPS)
fortran/trans-decl.o: $(GFORTRAN_TRANS_DEPS) gt-fortran-trans-decl.h \
--- gcc/fortran/lang.opt.jj 2005-12-12 11:57:24.000000000 +0100
+++ gcc/fortran/lang.opt 2005-12-29 16:23:28.000000000 +0100
@@ -173,6 +173,10 @@ frepack-arrays
Fortran
Copy array sections into a contiguous block on procedure entry
+fpreprocessed
+Fortran
+Treat the input file as preprocessed
+
qkind=
Fortran RejectNegative Joined UInteger
-qkind=<n> Set the kind for a real with the 'q' exponent to 'n'
--- gcc/fortran/scanner.c.jj 2005-12-02 23:46:26.000000000 +0100
+++ gcc/fortran/scanner.c 2005-12-31 01:12:17.000000000 +0100
@@ -45,6 +45,7 @@ Software Foundation, 51 Franklin Street,
#include "config.h"
#include "system.h"
#include "gfortran.h"
+#include "toplev.h"
/* Structure for holding module and include file search path. */
typedef struct gfc_directorylist
@@ -66,7 +67,9 @@ static gfc_linebuf *line_head, *line_tai
locus gfc_current_locus;
const char *gfc_source_file;
-
+static FILE *gfc_src_file;
+static char *gfc_src_preprocessor_lines[2];
+
/* Main scanner initialization. */
@@ -859,7 +862,7 @@ preprocessor_line (char *c)
int i, line;
char *filename;
gfc_file *f;
- int escaped;
+ int escaped, unescape;
c++;
while (*c == ' ' || *c == '\t')
@@ -890,13 +893,17 @@ preprocessor_line (char *c)
filename = c;
/* Make filename end at quote. */
+ unescape = 0;
escaped = false;
while (*c && ! (! escaped && *c == '"'))
{
if (escaped)
escaped = false;
- else
- escaped = *c == '\\';
+ else if (*c == '\\')
+ {
+ escaped = true;
+ unescape++;
+ }
++c;
}
@@ -906,7 +913,23 @@ preprocessor_line (char *c)
*c++ = '\0';
+ /* Undo effects of cpp_quote_string. */
+ if (unescape)
+ {
+ char *s = filename;
+ char *d = gfc_getmem (c - filename - unescape);
+ filename = d;
+ while (*s)
+ {
+ if (*s == '\\')
+ *d++ = *++s;
+ else
+ *d++ = *s;
+ s++;
+ }
+ *d = '\0';
+ }
/* Get flags. */
@@ -942,6 +965,8 @@ preprocessor_line (char *c)
gfc_warning_now ("%s:%d: file %s left but not entered",
current_file->filename, current_file->line,
filename);
+ if (unescape)
+ gfc_free (filename);
return;
}
current_file = current_file->up;
@@ -959,6 +984,8 @@ preprocessor_line (char *c)
/* Set new line number. */
current_file->line = line;
+ if (unescape)
+ gfc_free (filename);
return;
bad_cpp_line:
@@ -1043,7 +1070,13 @@ load_file (const char *filename, bool in
if (initial)
{
- input = gfc_open_file (filename);
+ if (gfc_src_file)
+ {
+ input = gfc_src_file;
+ gfc_src_file = NULL;
+ }
+ else
+ input = gfc_open_file (filename);
if (input == NULL)
{
gfc_error_now ("Can't open file '%s'", filename);
@@ -1069,6 +1102,19 @@ load_file (const char *filename, bool in
line = NULL;
line_len = 0;
+ if (initial && gfc_src_preprocessor_lines[0])
+ {
+ preprocessor_line (gfc_src_preprocessor_lines[0]);
+ gfc_free (gfc_src_preprocessor_lines[0]);
+ gfc_src_preprocessor_lines[0] = NULL;
+ if (gfc_src_preprocessor_lines[1])
+ {
+ preprocessor_line (gfc_src_preprocessor_lines[1]);
+ gfc_free (gfc_src_preprocessor_lines[1]);
+ gfc_src_preprocessor_lines[1] = NULL;
+ }
+ }
+
for (;;)
{
int trunc = load_line (input, &line, &line_len);
@@ -1157,3 +1203,112 @@ gfc_new_file (void)
return result;
}
+
+static char *
+unescape_filename (const char *ptr)
+{
+ const char *p = ptr, *s;
+ char *d, *ret;
+ int escaped, unescape = 0;
+
+ /* Make filename end at quote. */
+ escaped = false;
+ while (*p && ! (! escaped && *p == '"'))
+ {
+ if (escaped)
+ escaped = false;
+ else if (*p == '\\')
+ {
+ escaped = true;
+ unescape++;
+ }
+ ++p;
+ }
+
+ if (! *p || p[1])
+ return NULL;
+
+ /* Undo effects of cpp_quote_string. */
+ s = ptr;
+ d = gfc_getmem (p + 1 - ptr - unescape);
+ ret = d;
+
+ while (s != p)
+ {
+ if (*s == '\\')
+ *d++ = *++s;
+ else
+ *d++ = *s;
+ s++;
+ }
+ *d = '\0';
+ return ret;
+}
+
+/* For preprocessed files, if the first tokens are of the form # NUM.
+ handle the directives so we know the original file name. */
+
+const char *
+gfc_read_orig_filename (const char *filename, const char **canon_source_file)
+{
+ int c, len;
+ char *dirname;
+
+ gfc_src_file = gfc_open_file (filename);
+ if (gfc_src_file == NULL)
+ return NULL;
+
+ c = fgetc (gfc_src_file);
+ ungetc (c, gfc_src_file);
+
+ if (c != '#')
+ return NULL;
+
+ len = 0;
+ load_line (gfc_src_file, &gfc_src_preprocessor_lines[0], &len);
+
+ if (strncmp (gfc_src_preprocessor_lines[0], "# 1 \"", 5) != 0)
+ return NULL;
+
+ filename = unescape_filename (gfc_src_preprocessor_lines[0] + 5);
+ if (filename == NULL)
+ return NULL;
+
+ c = fgetc (gfc_src_file);
+ ungetc (c, gfc_src_file);
+
+ if (c != '#')
+ return filename;
+
+ len = 0;
+ load_line (gfc_src_file, &gfc_src_preprocessor_lines[1], &len);
+
+ if (strncmp (gfc_src_preprocessor_lines[1], "# 1 \"", 5) != 0)
+ return filename;
+
+ dirname = unescape_filename (gfc_src_preprocessor_lines[1] + 5);
+ if (dirname == NULL)
+ return filename;
+
+ len = strlen (dirname);
+ if (len < 3 || dirname[len - 1] != '/' || dirname[len - 2] != '/')
+ {
+ gfc_free (dirname);
+ return filename;
+ }
+ dirname[len - 2] = '\0';
+ set_src_pwd (dirname);
+
+ if (! IS_ABSOLUTE_PATH (filename))
+ {
+ char *p = gfc_getmem (len + strlen (filename));
+
+ memcpy (p, dirname, len - 2);
+ p[len - 2] = '/';
+ strcpy (p + len - 1, filename);
+ *canon_source_file = p;
+ }
+
+ gfc_free (dirname);
+ return filename;
+}
--- gcc/fortran/gfortran.h.jj 2005-12-23 00:03:12.000000000 +0100
+++ gcc/fortran/gfortran.h 2005-12-31 01:05:01.000000000 +0100
@@ -1515,6 +1515,7 @@ typedef struct
int flag_no_backend;
int flag_pack_derived;
int flag_repack_arrays;
+ int flag_preprocessed;
int flag_f2c;
int flag_automatic;
int flag_backslash;
@@ -1595,6 +1596,7 @@ int gfc_peek_char (void);
void gfc_error_recovery (void);
void gfc_gobble_whitespace (void);
try gfc_new_file (void);
+const char * gfc_read_orig_filename (const char *, const char **);
extern gfc_source_form gfc_current_form;
extern const char *gfc_source_file;
--- gcc/fortran/options.c.jj 2005-12-02 23:46:26.000000000 +0100
+++ gcc/fortran/options.c 2005-12-31 01:03:52.000000000 +0100
@@ -72,6 +72,7 @@ gfc_init_options (unsigned int argc ATTR
gfc_option.flag_no_backend = 0;
gfc_option.flag_pack_derived = 0;
gfc_option.flag_repack_arrays = 0;
+ gfc_option.flag_preprocessed = 0;
gfc_option.flag_automatic = 1;
gfc_option.flag_backslash = 1;
gfc_option.flag_cray_pointer = 0;
@@ -172,7 +173,7 @@ form_from_filename (const char *filename
bool
gfc_post_options (const char **pfilename)
{
- const char *filename = *pfilename;
+ const char *filename = *pfilename, *canon_source_file = NULL;
char *source_path;
int i;
@@ -182,23 +183,40 @@ gfc_post_options (const char **pfilename
filename = "";
}
- gfc_source_file = filename;
+ if (gfc_option.flag_preprocessed)
+ {
+ /* For preprocessed files, if the first tokens are of the form # NUM.
+ handle the directives so we know the original file name. */
+ gfc_source_file = gfc_read_orig_filename (filename, &canon_source_file);
+ if (gfc_source_file == NULL)
+ gfc_source_file = filename;
+ else
+ *pfilename = gfc_source_file;
+ }
+ else
+ gfc_source_file = filename;
+
+ if (canon_source_file == NULL)
+ canon_source_file = gfc_source_file;
/* Adds the path where the source file is to the list of include files. */
- i = strlen(gfc_source_file);
- while (i > 0 && !IS_DIR_SEPARATOR(gfc_source_file[i]))
+ i = strlen (canon_source_file);
+ while (i > 0 && !IS_DIR_SEPARATOR (canon_source_file[i]))
i--;
if (i != 0)
{
source_path = alloca (i + 1);
- memcpy (source_path, gfc_source_file, i);
+ memcpy (source_path, canon_source_file, i);
source_path[i] = 0;
gfc_add_include_path (source_path);
}
else
gfc_add_include_path (".");
+ if (canon_source_file != gfc_source_file)
+ gfc_free ((void *) canon_source_file);
+
/* Decide which form the file will be read in as. */
if (gfc_option.source_form != FORM_UNKNOWN)
@@ -211,7 +229,7 @@ gfc_post_options (const char **pfilename
{
gfc_current_form = FORM_FREE;
gfc_warning_now ("Reading file '%s' as free form.",
- (filename[0] == '\0') ? "<stdin>" : filename);
+ (filename[0] == '\0') ? "<stdin>" : filename);
}
}
@@ -478,6 +496,10 @@ gfc_handle_option (size_t scode, const c
gfc_option.flag_repack_arrays = value;
break;
+ case OPT_fpreprocessed:
+ gfc_option.flag_preprocessed = value;
+ break;
+
case OPT_fmax_identifier_length_:
if (value > GFC_MAX_SYMBOL_LEN)
gfc_fatal_error ("Maximum supported idenitifier length is %d",
--- gcc/fortran/lang-specs.h.jj 2005-11-04 09:40:59.000000000 +0100
+++ gcc/fortran/lang-specs.h 2005-12-29 16:30:48.000000000 +0100
@@ -1,6 +1,6 @@
/* Contribution to the specs for the GNU Compiler Collection
from GNU Fortran 95 compiler.
- Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is licensed under the GPL. */
@@ -15,7 +15,7 @@ This file is licensed under the GPL. */
%{E|M|MM:%(cpp_debug_options)}\
%{!M:%{!MM:%{!E: -o %|.f |\n\
f951 %|.f %{!ffree-form:-ffixed-form} %(cc1_options) %{J*} %{I*}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
{".F90", "@f95-cpp-input", 0, 0, 0},
{".F95", "@f95-cpp-input", 0, 0, 0},
{"@f95-cpp-input",
@@ -23,7 +23,7 @@ This file is licensed under the GPL. */
%{E|M|MM:%(cpp_debug_options)}\
%{!M:%{!MM:%{!E: -o %|.f95 |\n\
f951 %|.f95 %(cc1_options) %{J*} %{I*}\
- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+ -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
{".f90", "@f95", 0, 0, 0},
{".f95", "@f95", 0, 0, 0},
{"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\
gcc41-rh176562.patch:
Makefile.am | 2 --
Makefile.in | 2 +-
configure | 11 ++++++++++-
configure.ac | 8 ++++++++
4 files changed, 19 insertions(+), 4 deletions(-)
--- NEW FILE gcc41-rh176562.patch ---
2006-01-05 Jakub Jelinek <jakub at redhat.com>
* configure.ac (dbexecdir): New substituted var.
* configure: Rebuilt.
* Makefile.am (dbexecdir): Remove.
* Makefile.in: Rebuilt.
--- libjava/configure.ac.jj 2005-10-28 23:13:27.000000000 +0200
+++ libjava/configure.ac 2006-01-05 11:18:48.000000000 +0100
@@ -1269,6 +1269,14 @@ AC_SUBST(toolexecdir)
AC_SUBST(toolexecmainlibdir)
AC_SUBST(toolexeclibdir)
+# Determine where the standard .db file is found.
+multi_os_directory=`$CC -print-multi-os-directory`
+case $multi_os_directory in
+ .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /.
+ *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;;
+esac
+AC_SUBST(dbexecdir)
+
# Determine gcj version number.
gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'`
GCJVERSION=$gcjversion
--- libjava/configure.jj 2005-10-28 23:13:27.000000000 +0200
+++ libjava/configure 2006-01-05 11:20:14.000000000 +0100
@@ -310,7 +310,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRU!
E am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING!
_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS TH!
READINCS
THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRU!
E am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING!
_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS TH!
READINCS
THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES here LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -14848,6 +14848,14 @@ esac
+# Determine where the standard .db file is found.
+multi_os_directory=`$CC -print-multi-os-directory`
+case $multi_os_directory in
+ .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /.
+ *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;;
+esac
+
+
# Determine gcj version number.
gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'`
GCJVERSION=$gcjversion
@@ -17895,6 +17903,7 @@ s, at GCC_UNWIND_INCLUDE@,$GCC_UNWIND_INCLU
s, at toolexecdir@,$toolexecdir,;t t
s, at toolexecmainlibdir@,$toolexecmainlibdir,;t t
s, at toolexeclibdir@,$toolexeclibdir,;t t
+s, at dbexecdir@,$dbexecdir,;t t
s, at GCJVERSION@,$GCJVERSION,;t t
s, at gxx_include_dir@,$gxx_include_dir,;t t
s, at libstdcxx_incdir@,$libstdcxx_incdir,;t t
--- libjava/Makefile.am.jj 2005-12-16 13:15:12.000000000 +0100
+++ libjava/Makefile.am 2006-01-05 11:14:18.000000000 +0100
@@ -64,8 +64,6 @@ secdir = $(libdir)/security
## Where to install default logging property file.
propdir = $(libdir)
-## Where the standard .db file is found.
-dbexecdir = $(libdir)/gcj-$(gcc_version)
## Name of the default .db.
db_name = classmap.db
## Compiler specific component of the .db file
--- libjava/Makefile.in.jj 2006-01-05 09:30:11.000000000 +0100
+++ libjava/Makefile.in 2006-01-05 11:25:10.000000000 +0100
@@ -626,6 +626,7 @@ target_vendor = @target_vendor@
toolexecdir = @toolexecdir@
toolexeclibdir = @toolexeclibdir@
toolexecmainlibdir = @toolexecmainlibdir@
+dbexecdir = @dbexecdir@
AUTOMAKE_OPTIONS = foreign subdir-objects
ACLOCAL_AMFLAGS = -I . -I .. -I ../config
@@ -654,7 +655,6 @@ jar_DATA = libgcj-$(gcc_version).jar
@JAVA_HOME_SET_TRUE at BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar
secdir = $(libdir)/security
propdir = $(libdir)
-dbexecdir = $(libdir)/gcj-$(gcc_version)
db_name = classmap.db
db_pathtail = gcj-$(gcc_version)/$(db_name)
@NATIVE_TRUE at dbexec_DATA = $(db_name)
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- .cvsignore 22 Dec 2005 20:24:04 -0000 1.123
+++ .cvsignore 5 Jan 2006 10:57:27 -0000 1.124
@@ -1 +1 @@
-gcc-4.1.0-20051222.tar.bz2
+gcc-4.1.0-20060105.tar.bz2
Index: gcc41.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gcc41.spec 4 Jan 2006 10:13:55 -0000 1.14
+++ gcc41.spec 5 Jan 2006 10:57:27 -0000 1.15
@@ -1,6 +1,6 @@
-%define DATE 20051222
+%define DATE 20060105
%define gcc_version 4.1.0
-%define gcc_release 0.12
+%define gcc_release 0.13
%define _unpackaged_files_terminate_build 0
%define multilib_64_archs sparc64 ppc64 s390x x86_64
%ifarch %{ix86} x86_64 ia64
@@ -96,13 +96,9 @@
Patch15: gcc41-ppc32-retaddr.patch
Patch16: gcc41-s390-atomic1.patch
Patch17: gcc41-gomp-lastprivate-static.patch
-Patch18: gcc41-pr25432.patch
-Patch19: gcc41-pr25005.patch
-Patch20: gcc41-pr25328-test.patch
-Patch21: gcc41-pr25535.patch
-Patch22: gcc41-pr25364.patch
-Patch23: gcc41-pr25307.patch
-Patch24: gcc41-pr25369.patch
+Patch18: gcc41-pr25535.patch
+Patch19: gcc41-pr25324.patch
+Patch20: gcc41-rh176562.patch
%define _gnu %{nil}
%ifarch sparc
@@ -450,13 +446,9 @@
%patch15 -p0 -b .ppc32-retaddr~
%patch16 -p0 -b .s390-atomic1~
%patch17 -p0 -b .gomp-lastprivate-static~
-%patch18 -p0 -b .pr25432~
-%patch19 -p0 -b .pr25005~
-%patch20 -p0 -b .pr25328-test~
-%patch21 -p0 -b .pr25535~
-%patch22 -p0 -b .pr25364~
-%patch23 -p0 -b .pr25307~
-%patch24 -p0 -b .pr25369~
+%patch18 -p0 -b .pr25535~
+%patch19 -p0 -b .pr25324~
+%patch20 -p0 -b .rh176562~
sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c
sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@@ -1542,7 +1534,29 @@
%endif
%changelog
+* Thu Jan 5 2006 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.13
+- update from gcc-4_1-branch (-r108957:109369)
+ - PRs c++/23171, c++/23172, c++/24671, c++/24782, c++/25294, c++/25417,
+ c++/25439, c++/25492, c++/25625, c++/25632, c++/25633, c++/25634,
+ c++/25635, c++/25637, c++/25638, c/25183, c/25559, debug/25562,
+ fortran/18990, fortran/19362, fortran/20244, fortran/20862,
+ fortran/20864, fortran/20889, fortran/22607, fortran/23152,
+ fortran/25018, fortran/25053, fortran/25055, fortran/25063,
+ fortran/25064, fortran/25066, fortran/25067, fortran/25068,
+ fortran/25069, fortran/25106, fortran/25391, fortran/25532,
+ fortran/25586, fortran/25587, libgcj/9715, libgcj/19132,
+ libgfortran/25139, libgfortran/25419, libgfortran/25510,
+ libgfortran/25550, libgfortran/25594, middle-end/24827, objc/25328,
+ rtl-optimization/21041, rtl-optimization/25130, target/24342,
+ target/25554, target/25572, testsuite/25214, testsuite/25441,
+ testsuite/25442, testsuite/25444, tree-opt/25513
+ - create java Package for compiled classes which are linked in but
+ loaded by the system class loader (#176956)
+ - fix posix_memalign prototype in <mm_malloc.h> (#176461)
+- update from gomp-20050608-branch (up to -r109349)
- buildrequire libXtst-devel (#176898)
+- fix built in path to classmap.db on x86_64, s390x and ppc64 (#176562)
+- fix debug info for preprocessed Fortran code (#175071, PR fortran/25324)
* Fri Dec 22 2005 Jakub Jelinek <jakub at redhat.com> 4.1.0-0.12
- make sure GCJFLAGS are propagated down to libjava's configure
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/sources,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- sources 22 Dec 2005 20:24:04 -0000 1.125
+++ sources 5 Jan 2006 10:57:27 -0000 1.126
@@ -1 +1 @@
-72aa5134005cfcd70e1f3f3df267f24b gcc-4.1.0-20051222.tar.bz2
+f27bdcb7a666c31dc20c41eced50decd gcc-4.1.0-20060105.tar.bz2
--- gcc41-pr25005.patch DELETED ---
--- gcc41-pr25307.patch DELETED ---
--- gcc41-pr25328-test.patch DELETED ---
--- gcc41-pr25364.patch DELETED ---
--- gcc41-pr25369.patch DELETED ---
--- gcc41-pr25432.patch DELETED ---
More information about the fedora-cvs-commits
mailing list