From 7d3fd1a879ed4222530b5d7bde64ecce552f7e4d Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 17 Nov 2012 09:53:57 -0800 Subject: [PATCH] add packaging --- packaging/Wunprototyped-calls.diff | 95 +++ packaging/baselibs.conf | 9 + packaging/gcc-add-defaultsspec.diff | 51 ++ packaging/gcc-arm-linker.patch | 53 ++ packaging/gcc-dir-version.patch | 144 ++++ packaging/gcc-noalias-warn.diff | 38 + packaging/gcc-sles-version.patch | 13 + packaging/gcc4-ppc64-m32-m64-multilib-only.patch | 19 + packaging/gcc41-ia64-stack-protector.patch | 145 ++++ packaging/gcc41-java-slow_pthread_self.patch | 17 + packaging/gcc41-ppc32-retaddr.patch | 90 +++ packaging/gcc43-no-unwind-tables.diff | 13 + packaging/gcc44-rename-info-files.patch | 922 +++++++++++++++++++++++ packaging/gcc44-textdomain.patch | 116 +++ packaging/libjava-no-multilib.diff | 31 + packaging/pr33763.diff | 19 + packaging/pr49484.diff | 229 ++++++ packaging/program-transform-name.diff | 198 +++++ packaging/sap303956-uchar.diff | 55 ++ packaging/suse-record-gcc-opts.diff | 65 ++ packaging/tls-no-direct.diff | 17 + 21 files changed, 2339 insertions(+) create mode 100644 packaging/Wunprototyped-calls.diff create mode 100644 packaging/baselibs.conf create mode 100644 packaging/gcc-add-defaultsspec.diff create mode 100644 packaging/gcc-arm-linker.patch create mode 100644 packaging/gcc-dir-version.patch create mode 100644 packaging/gcc-noalias-warn.diff create mode 100644 packaging/gcc-sles-version.patch create mode 100644 packaging/gcc4-ppc64-m32-m64-multilib-only.patch create mode 100644 packaging/gcc41-ia64-stack-protector.patch create mode 100644 packaging/gcc41-java-slow_pthread_self.patch create mode 100644 packaging/gcc41-ppc32-retaddr.patch create mode 100644 packaging/gcc43-no-unwind-tables.diff create mode 100644 packaging/gcc44-rename-info-files.patch create mode 100644 packaging/gcc44-textdomain.patch create mode 100644 packaging/libjava-no-multilib.diff create mode 100644 packaging/pr33763.diff create mode 100644 packaging/pr49484.diff create mode 100644 packaging/program-transform-name.diff create mode 100644 packaging/sap303956-uchar.diff create mode 100644 packaging/suse-record-gcc-opts.diff create mode 100644 packaging/tls-no-direct.diff diff --git a/packaging/Wunprototyped-calls.diff b/packaging/Wunprototyped-calls.diff new file mode 100644 index 0000000..b389f18 --- /dev/null +++ b/packaging/Wunprototyped-calls.diff @@ -0,0 +1,95 @@ +Index: gcc/c-family/c.opt +=================================================================== +*** gcc/c-family/c.opt.orig 2012-02-07 11:33:52.000000000 +0100 +--- gcc/c-family/c.opt 2012-02-08 12:54:08.000000000 +0100 +*************** Wunused-local-typedefs +*** 665,670 **** +--- 665,674 ---- + C ObjC C++ ObjC++ Var(warn_unused_local_typedefs) Warning + Warn when typedefs locally defined in a function are not used + ++ Wunprototyped-calls ++ C Var(warn_unprototyped_calls) Warning ++ Warn about calls to unprototyped functions with at least one argument ++ + Wunused-macros + C ObjC C++ ObjC++ Warning + Warn about macros defined in the main file that are not used +Index: gcc/testsuite/gcc.dg/cleanup-1.c +=================================================================== +*** gcc/testsuite/gcc.dg/cleanup-1.c.orig 2010-02-23 12:43:21.000000000 +0100 +--- gcc/testsuite/gcc.dg/cleanup-1.c 2012-02-08 12:54:08.000000000 +0100 +*************** +*** 6,12 **** + #define C(x) __attribute__((cleanup(x))) + + static int f1(void *x U) { return 0; } +! static void f2() { } + static void f3(void) { } /* { dg-message "note: declared here" } */ + static void f4(void *x U) { } + static void f5(int *x U) { } +--- 6,12 ---- + #define C(x) __attribute__((cleanup(x))) + + static int f1(void *x U) { return 0; } +! static void f2() { } /* { dg-message "declared here" "" } */ + static void f3(void) { } /* { dg-message "note: declared here" } */ + static void f4(void *x U) { } + static void f5(int *x U) { } +*************** static void f9(int x U) { } /* { dg-mess +*** 18,24 **** + void test(void) + { + int o1 C(f1); +! int o2 C(f2); + int o3 C(f3); /* { dg-error "too many arguments" } */ + int o4 C(f4); + int o5 C(f5); +--- 18,24 ---- + void test(void) + { + int o1 C(f1); +! int o2 C(f2); /* { dg-warning "without a real prototype" } */ + int o3 C(f3); /* { dg-error "too many arguments" } */ + int o4 C(f4); + int o5 C(f5); +Index: gcc/c-typeck.c +=================================================================== +*** gcc/c-typeck.c.orig 2012-02-07 11:34:02.000000000 +0100 +--- gcc/c-typeck.c 2012-02-08 12:54:08.000000000 +0100 +*************** build_function_call_vec (location_t loc, +*** 2823,2828 **** +--- 2823,2841 ---- + && !check_builtin_function_arguments (fundecl, nargs, argarray)) + return error_mark_node; + ++ /* If we cannot check function arguments because a prototype is ++ missing for the callee, warn here. */ ++ if (warn_unprototyped_calls ++ && nargs > 0 && !TYPE_ARG_TYPES (fntype) ++ && fundecl && !DECL_BUILT_IN (fundecl) && !C_DECL_IMPLICIT (fundecl) ++ && !DECL_ARGUMENTS (fundecl)) ++ { ++ if (warning (OPT_Wunprototyped_calls, ++ "call to function %qD without a real prototype", fundecl)) ++ inform (DECL_SOURCE_LOCATION (fundecl), "%qD was declared here", ++ fundecl); ++ } ++ + /* Check that the arguments to the function are valid. */ + check_function_arguments (fntype, nargs, argarray); + +Index: gcc/c-family/c-opts.c +=================================================================== +*** gcc/c-family/c-opts.c.orig 2012-01-18 15:23:58.000000000 +0100 +--- gcc/c-family/c-opts.c 2012-02-08 12:54:08.000000000 +0100 +*************** c_common_handle_option (size_t scode, co +*** 392,397 **** +--- 392,398 ---- + can turn it off only if it's not explicit. */ + if (warn_main == -1) + warn_main = (value ? 2 : 0); ++ warn_unprototyped_calls = 1; + + /* In C, -Wall turns on -Wenum-compare, which we do here. + In C++ it is on by default, which is done in diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf new file mode 100644 index 0000000..0acfb6e --- /dev/null +++ b/packaging/baselibs.conf @@ -0,0 +1,9 @@ +targettype x86 package libgcc47 +targettype x86 package libstdc++47 +libgcj47 + requires "libgcj47" +libgcj47-devel +gcc47-gij + requires "libgcj47-" + +/usr/bin/gij-4.7 -> /usr/bin/gij-4.7 + +/usr/bin/grmiregistry-4.7 -> /usr/bin/grmiregistry-4.7 diff --git a/packaging/gcc-add-defaultsspec.diff b/packaging/gcc-add-defaultsspec.diff new file mode 100644 index 0000000..dc30d87 --- /dev/null +++ b/packaging/gcc-add-defaultsspec.diff @@ -0,0 +1,51 @@ +Index: gcc/gcc.c +=================================================================== +--- gcc/gcc.c.orig 2011-11-03 16:27:42.000000000 +0100 ++++ gcc/gcc.c 2011-11-03 17:08:03.000000000 +0100 +@@ -260,6 +260,7 @@ static const char *replace_outfile_spec_ + static const char *remove_outfile_spec_function (int, const char **); + static const char *version_compare_spec_function (int, const char **); + static const char *include_spec_function (int, const char **); ++static const char *include_noerr_spec_function (int, const char **); + static const char *find_file_spec_function (int, const char **); + static const char *find_plugindir_spec_function (int, const char **); + static const char *print_asm_header_spec_function (int, const char **); +@@ -1247,6 +1248,7 @@ static const struct spec_function static + { "remove-outfile", remove_outfile_spec_function }, + { "version-compare", version_compare_spec_function }, + { "include", include_spec_function }, ++ { "include_noerr", include_noerr_spec_function }, + { "find-file", find_file_spec_function }, + { "find-plugindir", find_plugindir_spec_function }, + { "print-asm-header", print_asm_header_spec_function }, +@@ -6240,6 +6242,8 @@ main (int argc, char **argv) + if (access (specs_file, R_OK) == 0) + read_specs (specs_file, TRUE); + ++ do_self_spec ("%:include_noerr(defaults.spec)%(default_spec)"); ++ + /* Process any configure-time defaults specified for the command line + options, via OPTION_DEFAULT_SPECS. */ + for (i = 0; i < ARRAY_SIZE (option_default_specs); i++) +@@ -8088,6 +8092,21 @@ get_random_number (void) + return ret ^ getpid(); + } + ++static const char * ++include_noerr_spec_function (int argc, const char **argv) ++{ ++ char *file; ++ ++ if (argc != 1) ++ abort (); ++ ++ file = find_a_file (&startfile_prefixes, argv[0], R_OK, 0); ++ if (file) ++ read_specs (file, FALSE); ++ ++ return NULL; ++} ++ + /* %:compare-debug-dump-opt spec function. Save the last argument, + expected to be the last -fdump-final-insns option, or generate a + temporary. */ diff --git a/packaging/gcc-arm-linker.patch b/packaging/gcc-arm-linker.patch new file mode 100644 index 0000000..9fcb8d1 --- /dev/null +++ b/packaging/gcc-arm-linker.patch @@ -0,0 +1,53 @@ +2012-05-01 Richard Earnshaw + + * arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_DEFAULT): Avoid ifdef + comparing enumeration values. Update comments. + +2012-04-26 Michael Hope + Richard Earnshaw + + * config/arm/linux-eabi.h (GLIBC_DYNAMIC_LINKER_SOFT_FLOAT): Define. + (GLIBC_DYNAMIC_LINKER_HARD_FLOAT): Define. + (GLIBC_DYNAMIC_LINKER_DEFAULT): Define. + (GLIBC_DYNAMIC_LINKER): Redefine to use the hard float path. + + +--- gcc-4_7-branch/gcc/config/arm/linux-eabi.h 2012-03-02 13:36:59.221206250 +0100 ++++ trunk/gcc/config/arm/linux-eabi.h 2012-05-03 19:41:43.484057843 +0200 +@@ -32,7 +32,8 @@ + while (false) + + /* We default to a soft-float ABI so that binaries can run on all +- target hardware. */ ++ target hardware. If you override this to use the hard-float ABI then ++ change the setting of GLIBC_DYNAMIC_LINKER_DEFAULT as well. */ + #undef TARGET_DEFAULT_FLOAT_ABI + #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT + +@@ -59,10 +60,23 @@ + #undef SUBTARGET_EXTRA_LINK_SPEC + #define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION + +-/* Use ld-linux.so.3 so that it will be possible to run "classic" +- GNU/Linux binaries on an EABI system. */ ++/* GNU/Linux on ARM currently supports three dynamic linkers: ++ - ld-linux.so.2 - for the legacy ABI ++ - ld-linux.so.3 - for the EABI-derived soft-float ABI ++ - ld-linux-armhf.so.3 - for the EABI-derived hard-float ABI. ++ All the dynamic linkers live in /lib. ++ We default to soft-float, but this can be overridden by changing both ++ GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ ++ + #undef GLIBC_DYNAMIC_LINKER +-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3" ++#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" ++#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" ++#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT ++ ++#define GLIBC_DYNAMIC_LINKER \ ++ "%{mfloat-abi=hard:" GLIBC_DYNAMIC_LINKER_HARD_FLOAT "} \ ++ %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ ++ %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" + + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ diff --git a/packaging/gcc-dir-version.patch b/packaging/gcc-dir-version.patch new file mode 100644 index 0000000..eb830df --- /dev/null +++ b/packaging/gcc-dir-version.patch @@ -0,0 +1,144 @@ +Index: gcc/Makefile.in +=================================================================== +--- gcc/Makefile.in.orig 2011-11-08 16:23:29.000000000 +0100 ++++ gcc/Makefile.in 2011-11-09 11:59:34.000000000 +0100 +@@ -792,12 +792,14 @@ GTM_H = tm.h $(tm_file_list) in + TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H) + + # Variables for version information. +-BASEVER := $(srcdir)/BASE-VER # 4.x.y ++BASEVER := $(srcdir)/BASE-VER # 4.x ++FULLVER := $(srcdir)/FULL-VER # 4.x.y + DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, "" + DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty + REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX] + + BASEVER_c := $(shell cat $(BASEVER)) ++FULLVER_c := $(shell cat $(FULLVER)) + DEVPHASE_c := $(shell cat $(DEVPHASE)) + DATESTAMP_c := $(shell cat $(DATESTAMP)) + +@@ -816,6 +818,7 @@ version := $(BASEVER_c) + # (i.e. if DEVPHASE_c is empty). The space immediately after the + # comma in the $(if ...) constructs is significant - do not remove it. + BASEVER_s := "\"$(BASEVER_c)\"" ++FULLVER_s := "\"$(FULLVER_c)\"" + DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\"" + DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\"" + PKGVERSION_s:= "\"@PKGVERSION@\"" +@@ -2146,11 +2149,11 @@ options-save.o: options-save.c $(CONFIG_ + + dumpvers: dumpvers.c + +-CFLAGS-version.o += -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ ++CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \ + -DREVISION=$(REVISION_s) \ + -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ + -DBUGURL=$(BUGURL_s) +-version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) ++version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) + + gtype-desc.o: gtype-desc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + $(HASHTAB_H) $(SPLAY_TREE_H) $(OBSTACK_H) $(BITMAP_H) \ +@@ -2736,10 +2739,10 @@ common/common-targhooks.o : common/commo + coretypes.h $(INPUT_H) $(TM_H) $(COMMON_TARGET_H) common/common-targhooks.h + + bversion.h: s-bversion; @true +-s-bversion: BASE-VER +- echo "#define BUILDING_GCC_MAJOR `echo $(BASEVER_c) | sed -e 's/^\([0-9]*\).*$$/\1/'`" > bversion.h +- echo "#define BUILDING_GCC_MINOR `echo $(BASEVER_c) | sed -e 's/^[0-9]*\.\([0-9]*\).*$$/\1/'`" >> bversion.h +- echo "#define BUILDING_GCC_PATCHLEVEL `echo $(BASEVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/'`" >> bversion.h ++s-bversion: FULL-VER ++ echo "#define BUILDING_GCC_MAJOR `echo $(FULLVER_c) | sed -e 's/^\([0-9]*\).*$$/\1/'`" > bversion.h ++ echo "#define BUILDING_GCC_MINOR `echo $(FULLVER_c) | sed -e 's/^[0-9]*\.\([0-9]*\).*$$/\1/'`" >> bversion.h ++ echo "#define BUILDING_GCC_PATCHLEVEL `echo $(FULLVER_c) | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/'`" >> bversion.h + echo "#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)" >> bversion.h + $(STAMP) s-bversion + +@@ -3811,9 +3814,9 @@ build/%.o : # dependencies provided by + ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs + ## several C macro definitions, just like version.o + build/version.o: version.c version.h \ +- $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) ++ $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) + $(COMPILER_FOR_BUILD) -c $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) \ +- -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ ++ -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \ + -DREVISION=$(REVISION_s) \ + -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ + -DBUGURL=$(BUGURL_s) -o $@ $< +@@ -3988,7 +3991,7 @@ PREPROCESSOR_DEFINES = \ + -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \ + @TARGET_SYSTEM_ROOT_DEFINE@ + +-CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(BASEVER_s) ++CFLAGS-cppbuiltin.o += $(PREPROCESSOR_DEFINES) -DBASEVER=$(FULLVER_s) + cppbuiltin.o: cppbuiltin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ + $(TREE_H) cppbuiltin.h Makefile + +@@ -4008,8 +4011,8 @@ build/gcov-iov$(build_exeext): build/gco + build/gcov-iov.o -o $@ + + gcov-iov.h: s-iov +-s-iov: build/gcov-iov$(build_exeext) $(BASEVER) $(DEVPHASE) +- build/gcov-iov$(build_exeext) '$(BASEVER_c)' '$(DEVPHASE_c)' \ ++s-iov: build/gcov-iov$(build_exeext) $(FULLVER) $(DEVPHASE) ++ build/gcov-iov$(build_exeext) '$(FULLVER_c)' '$(DEVPHASE_c)' \ + > tmp-gcov-iov.h + $(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h + $(STAMP) s-iov +Index: libjava/Makefile.am +=================================================================== +--- libjava/Makefile.am.orig 2011-11-03 16:30:42.000000000 +0100 ++++ libjava/Makefile.am 2011-11-09 11:59:34.000000000 +0100 +@@ -774,7 +774,7 @@ install_data_local_split = 50 + install-data-local: + $(PRE_INSTALL) + ## Install the .pc file. +- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ ++ @pc_version=`echo $(GCJVERSION)`; \ + file="libgcj-$${pc_version}.pc"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ + echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ +Index: libjava/Makefile.in +=================================================================== +--- libjava/Makefile.in.orig 2011-11-03 16:31:17.000000000 +0100 ++++ libjava/Makefile.in 2011-11-09 11:59:34.000000000 +0100 +@@ -12411,7 +12411,7 @@ install-exec-hook: install-binPROGRAMS i + @BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext) + install-data-local: + $(PRE_INSTALL) +- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ ++ @pc_version=`echo $(GCJVERSION)`; \ + file="libgcj-$${pc_version}.pc"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ + echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ +Index: libjava/testsuite/lib/libjava.exp +=================================================================== +--- libjava/testsuite/lib/libjava.exp.orig 2011-04-18 12:48:54.000000000 +0200 ++++ libjava/testsuite/lib/libjava.exp 2011-11-09 11:59:34.000000000 +0100 +@@ -177,7 +177,7 @@ proc libjava_init { args } { + + set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] + regexp " version \[^\n\r\]*" $text version +- set libjava_version [lindex $version 1] ++ set libjava_version 4.7 + + verbose "version: $libjava_version" + +Index: gcc/cppbuiltin.c +=================================================================== +--- gcc/cppbuiltin.c.orig 2011-03-14 15:04:06.000000000 +0100 ++++ gcc/cppbuiltin.c 2012-01-24 10:22:18.000000000 +0100 +@@ -38,9 +38,9 @@ parse_basever (int *major, int *minor, i + static int s_major = -1, s_minor, s_patchlevel; + + if (s_major == -1) +- if (sscanf (BASEVER, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3) ++ if (sscanf (version_string, "%d.%d.%d", &s_major, &s_minor, &s_patchlevel) != 3) + { +- sscanf (BASEVER, "%d.%d", &s_major, &s_minor); ++ sscanf (version_string, "%d.%d", &s_major, &s_minor); + s_patchlevel = 0; + } + diff --git a/packaging/gcc-noalias-warn.diff b/packaging/gcc-noalias-warn.diff new file mode 100644 index 0000000..90976fb --- /dev/null +++ b/packaging/gcc-noalias-warn.diff @@ -0,0 +1,38 @@ +Index: boehm-gc/finalize.c +=================================================================== +--- boehm-gc/finalize.c.orig 2007-03-11 13:17:59.000000000 +0100 ++++ boehm-gc/finalize.c 2010-07-01 16:26:16.000000000 +0200 +@@ -165,6 +165,7 @@ signed_word * log_size_ptr; + int index; + struct disappearing_link * new_dl; + DCL_LOCK_STATE; ++ struct disappearing_link *** dl_head_adr = &dl_head; + + if ((word)link & (ALIGNMENT-1)) + ABORT("Bad arg to GC_general_register_disappearing_link"); +@@ -177,7 +178,7 @@ signed_word * log_size_ptr; + # ifndef THREADS + DISABLE_SIGNALS(); + # endif +- GC_grow_table((struct hash_chain_entry ***)(&dl_head), ++ GC_grow_table((struct hash_chain_entry ***)dl_head_adr, + &log_dl_table_size); + # ifdef CONDPRINT + if (GC_print_stats) { +@@ -348,6 +349,7 @@ finalization_mark_proc * mp; + struct finalizable_object *new_fo; + hdr *hhdr; + DCL_LOCK_STATE; ++ struct finalizable_object *** fo_head_adr = &fo_head; + + # ifdef THREADS + DISABLE_SIGNALS(); +@@ -358,7 +360,7 @@ finalization_mark_proc * mp; + # ifndef THREADS + DISABLE_SIGNALS(); + # endif +- GC_grow_table((struct hash_chain_entry ***)(&fo_head), ++ GC_grow_table((struct hash_chain_entry ***)fo_head_adr, + &log_fo_table_size); + # ifdef CONDPRINT + if (GC_print_stats) { diff --git a/packaging/gcc-sles-version.patch b/packaging/gcc-sles-version.patch new file mode 100644 index 0000000..41b94f0 --- /dev/null +++ b/packaging/gcc-sles-version.patch @@ -0,0 +1,13 @@ +Index: gcc/Makefile.in +=================================================================== +--- gcc/Makefile.in.orig 2011-11-03 17:00:43.000000000 +0100 ++++ gcc/Makefile.in 2011-11-03 17:01:28.000000000 +0100 +@@ -2145,7 +2145,7 @@ dumpvers: dumpvers.c + + CFLAGS-version.o += -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \ + -DREVISION=$(REVISION_s) \ +- -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ ++ -DDEVPHASE="" -DPKGVERSION=$(PKGVERSION_s) \ + -DBUGURL=$(BUGURL_s) + version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) + diff --git a/packaging/gcc4-ppc64-m32-m64-multilib-only.patch b/packaging/gcc4-ppc64-m32-m64-multilib-only.patch new file mode 100644 index 0000000..a82cea2 --- /dev/null +++ b/packaging/gcc4-ppc64-m32-m64-multilib-only.patch @@ -0,0 +1,19 @@ +Index: gcc/config/rs6000/t-linux64 +=================================================================== +--- gcc/config/rs6000/t-linux64.orig 2011-11-03 16:27:34.000000000 +0100 ++++ gcc/config/rs6000/t-linux64 2011-11-03 17:08:21.000000000 +0100 +@@ -26,10 +26,10 @@ + # it doesn't tell anything about the 32bit libraries on those systems. Set + # MULTILIB_OSDIRNAMES according to what is found on the target. + +-MULTILIB_OPTIONS = m64/m32 msoft-float +-MULTILIB_DIRNAMES = 64 32 nof ++MULTILIB_OPTIONS = m64/m32 ++MULTILIB_DIRNAMES = 64 32 + MULTILIB_EXTRA_OPTS = fPIC mstrict-align +-MULTILIB_EXCEPTIONS = m64/msoft-float +-MULTILIB_EXCLUSIONS = m64/!m32/msoft-float ++MULTILIB_EXCEPTIONS = ++MULTILIB_EXCLUSIONS = + MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof + MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) diff --git a/packaging/gcc41-ia64-stack-protector.patch b/packaging/gcc41-ia64-stack-protector.patch new file mode 100644 index 0000000..b80cf59 --- /dev/null +++ b/packaging/gcc41-ia64-stack-protector.patch @@ -0,0 +1,145 @@ +2005-07-08 Jakub Jelinek + + * config/ia64/ia64.h (FRAME_GROWS_DOWNWARD): Define to 1 if + -fstack-protect. + * config/ia64/ia64.c (ia64_compute_frame_size): Make sure + size is a multiple of 16 if FRAME_GROWS_DOWNWARD. + (ia64_initial_elimination_offset): Support FRAME_GROWS_DOWNWARD + layout. + * config/ia64/linux.h (TARGET_LIBC_PROVIDES_SSP): Define. + * config/ia64/ia64.md (stack_protect_set, stack_protect_test): New + expanders. + +Index: gcc/config/ia64/linux.h +=================================================================== +--- gcc/config/ia64/linux.h.orig 2011-11-03 16:27:28.000000000 +0100 ++++ gcc/config/ia64/linux.h 2011-11-04 11:39:46.000000000 +0100 +@@ -77,6 +77,11 @@ do { \ + #undef LINK_EH_SPEC + #define LINK_EH_SPEC "" + ++#ifdef TARGET_LIBC_PROVIDES_SSP ++/* IA-64 glibc provides __stack_chk_guard in [r13-8]. */ ++#define TARGET_THREAD_SSP_OFFSET -8 ++#endif ++ + /* Put all *tf routines in libgcc. */ + #undef LIBGCC2_HAS_TF_MODE + #define LIBGCC2_HAS_TF_MODE 1 +Index: gcc/config/ia64/ia64.c +=================================================================== +--- gcc/config/ia64/ia64.c.orig 2011-11-03 16:27:28.000000000 +0100 ++++ gcc/config/ia64/ia64.c 2011-11-04 11:39:47.000000000 +0100 +@@ -2797,6 +2797,9 @@ ia64_compute_frame_size (HOST_WIDE_INT s + else + pretend_args_size = crtl->args.pretend_args_size; + ++ if (FRAME_GROWS_DOWNWARD) ++ size = IA64_STACK_ALIGN (size); ++ + total_size = (spill_size + extra_spill_size + size + pretend_args_size + + crtl->outgoing_args_size); + total_size = IA64_STACK_ALIGN (total_size); +@@ -2829,32 +2832,19 @@ ia64_can_eliminate (const int from ATTRI + HOST_WIDE_INT + ia64_initial_elimination_offset (int from, int to) + { +- HOST_WIDE_INT offset; ++ HOST_WIDE_INT offset, size = get_frame_size (); + +- ia64_compute_frame_size (get_frame_size ()); ++ ia64_compute_frame_size (size); + switch (from) + { + case FRAME_POINTER_REGNUM: +- switch (to) +- { +- case HARD_FRAME_POINTER_REGNUM: +- if (current_function_is_leaf) +- offset = -current_frame_info.total_size; +- else +- offset = -(current_frame_info.total_size +- - crtl->outgoing_args_size - 16); +- break; +- +- case STACK_POINTER_REGNUM: +- if (current_function_is_leaf) +- offset = 0; +- else +- offset = 16 + crtl->outgoing_args_size; +- break; +- +- default: +- gcc_unreachable (); +- } ++ offset = FRAME_GROWS_DOWNWARD ? IA64_STACK_ALIGN (size) : 0; ++ if (!current_function_is_leaf) ++ offset += 16 + crtl->outgoing_args_size; ++ if (to == HARD_FRAME_POINTER_REGNUM) ++ offset -= current_frame_info.total_size; ++ else ++ gcc_assert (to == STACK_POINTER_REGNUM); + break; + + case ARG_POINTER_REGNUM: +Index: gcc/config/ia64/ia64.md +=================================================================== +--- gcc/config/ia64/ia64.md.orig 2011-11-03 16:27:28.000000000 +0100 ++++ gcc/config/ia64/ia64.md 2011-11-04 11:39:47.000000000 +0100 +@@ -5180,6 +5180,43 @@ + "mov %0 = ip" + [(set_attr "itanium_class" "frbr")]) + ++;; ++;; Stack guard expanders ++ ++(define_expand "stack_protect_set" ++ [(set (match_operand 0 "memory_operand" "") ++ (match_operand 1 "memory_operand" ""))] ++ "" ++{ ++#ifdef TARGET_THREAD_SSP_OFFSET ++ rtx thread_pointer_rtx = gen_rtx_REG (Pmode, 13); ++ rtx canary = gen_rtx_MEM (Pmode, gen_rtx_PLUS (Pmode, thread_pointer_rtx, ++ GEN_INT (TARGET_THREAD_SSP_OFFSET))); ++ MEM_VOLATILE_P (canary) = MEM_VOLATILE_P (operands[1]); ++ operands[1] = canary; ++#endif ++ emit_move_insn (operands[0], operands[1]); ++ DONE; ++}) ++ ++(define_expand "stack_protect_test" ++ [(match_operand 0 "memory_operand" "") ++ (match_operand 1 "memory_operand" "") ++ (match_operand 2 "" "")] ++ "" ++{ ++#ifdef TARGET_THREAD_SSP_OFFSET ++ rtx thread_pointer_rtx = gen_rtx_REG (Pmode, 13); ++ rtx canary = gen_rtx_MEM (Pmode, gen_rtx_PLUS (Pmode, thread_pointer_rtx, ++ GEN_INT (TARGET_THREAD_SSP_OFFSET))); ++ MEM_VOLATILE_P (canary) = MEM_VOLATILE_P (operands[1]); ++ operands[1] = canary; ++#endif ++ emit_cmp_and_jump_insns (operands[0], operands[1], EQ, NULL_RTX, ++ ptr_mode, 1, operands[2]); ++ DONE; ++}) ++ + ;; Vector operations + (include "vect.md") + ;; Atomic operations +Index: gcc/config/ia64/ia64.h +=================================================================== +--- gcc/config/ia64/ia64.h.orig 2011-04-28 15:02:22.000000000 +0200 ++++ gcc/config/ia64/ia64.h 2011-11-04 11:39:47.000000000 +0100 +@@ -872,7 +872,7 @@ enum reg_class + + /* Define this macro to nonzero if the addresses of local variable slots + are at negative offsets from the frame pointer. */ +-#define FRAME_GROWS_DOWNWARD 0 ++#define FRAME_GROWS_DOWNWARD (flag_stack_protect != 0) + + /* Offset from the frame pointer to the first local variable slot to + be allocated. */ diff --git a/packaging/gcc41-java-slow_pthread_self.patch b/packaging/gcc41-java-slow_pthread_self.patch new file mode 100644 index 0000000..c3e5681 --- /dev/null +++ b/packaging/gcc41-java-slow_pthread_self.patch @@ -0,0 +1,17 @@ +2005-05-20 Jakub Jelinek + + * configure.host (slow_pthread_self): Set to empty unconditionally + on Linux targets. + +Index: libjava/configure.host +=================================================================== +--- libjava/configure.host.orig 2011-11-03 16:30:42.000000000 +0100 ++++ libjava/configure.host 2011-11-04 11:39:57.000000000 +0100 +@@ -227,6 +227,7 @@ case "${host}" in + sh-linux* | sh[34]*-linux*) + can_unwind_signal=yes + libgcj_ld_symbolic='-Wl,-Bsymbolic' ++ slow_pthread_self= + if test x$slow_pthread_self = xyes \ + && test x$cross_compiling != xyes; then + cat > conftest.c < + + * config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0, + read word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx + instead of doing an extran indirection from frame_pointer_rtx. + + * gcc.dg/20051128-1.c: New test. + +Index: gcc/config/rs6000/rs6000.c +=================================================================== +--- gcc/config/rs6000/rs6000.c.orig 2011-11-03 16:27:33.000000000 +0100 ++++ gcc/config/rs6000/rs6000.c 2011-11-04 11:40:05.000000000 +0100 +@@ -18653,17 +18653,22 @@ rs6000_return_addr (int count, rtx frame + don't try to be too clever here. */ + if (count != 0 || (DEFAULT_ABI != ABI_AIX && flag_pic)) + { ++ rtx x; + cfun->machine->ra_needs_full_frame = 1; + +- return +- gen_rtx_MEM +- (Pmode, +- memory_address +- (Pmode, +- plus_constant (copy_to_reg +- (gen_rtx_MEM (Pmode, +- memory_address (Pmode, frame))), +- RETURN_ADDRESS_OFFSET))); ++ if (count == 0) ++ { ++ gcc_assert (frame == frame_pointer_rtx); ++ x = arg_pointer_rtx; ++ } ++ else ++ { ++ x = memory_address (Pmode, frame); ++ x = copy_to_reg (gen_rtx_MEM (Pmode, x)); ++ } ++ ++ x = plus_constant (x, RETURN_ADDRESS_OFFSET); ++ return gen_rtx_MEM (Pmode, memory_address (Pmode, x)); + } + + cfun->machine->ra_need_lr = 1; +Index: gcc/testsuite/gcc.dg/20051128-1.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gcc/testsuite/gcc.dg/20051128-1.c 2011-11-04 11:40:05.000000000 +0100 +@@ -0,0 +1,41 @@ ++/* { dg-do run } */ ++/* { dg-options "-O2 -fpic" } */ ++ ++extern void exit (int); ++extern void abort (void); ++ ++int b; ++ ++struct A ++{ ++ void *pad[147]; ++ void *ra, *h; ++ long o; ++}; ++ ++void ++__attribute__((noinline)) ++foo (struct A *a, void *x) ++{ ++ __builtin_memset (a, 0, sizeof (a)); ++ if (!b) ++ exit (0); ++} ++ ++void ++__attribute__((noinline)) ++bar (void) ++{ ++ struct A a; ++ ++ __builtin_unwind_init (); ++ foo (&a, __builtin_return_address (0)); ++} ++ ++int ++main (void) ++{ ++ bar (); ++ abort (); ++ return 0; ++} diff --git a/packaging/gcc43-no-unwind-tables.diff b/packaging/gcc43-no-unwind-tables.diff new file mode 100644 index 0000000..932b5f9 --- /dev/null +++ b/packaging/gcc43-no-unwind-tables.diff @@ -0,0 +1,13 @@ +Index: libgcc/Makefile.in +=================================================================== +--- libgcc/Makefile.in.orig 2011-11-03 16:29:25.000000000 +0100 ++++ libgcc/Makefile.in 2011-11-03 17:21:33.000000000 +0100 +@@ -279,7 +279,7 @@ INTERNAL_CFLAGS = $(CFLAGS) $(LIBGCC2_CF + CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ + -finhibit-size-directive -fno-inline -fno-exceptions \ + -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \ +- -fno-stack-protector \ ++ -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables \ + $(INHIBIT_LIBC_CFLAGS) + + # Extra flags to use when compiling crt{begin,end}.o. diff --git a/packaging/gcc44-rename-info-files.patch b/packaging/gcc44-rename-info-files.patch new file mode 100644 index 0000000..b4e0ce7 --- /dev/null +++ b/packaging/gcc44-rename-info-files.patch @@ -0,0 +1,922 @@ +#! /bin/sh -e + +# DP: Allow transformations on info file names. Reference the +# DP: transformed info file names in the texinfo files. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + + +gcc/ChangeLog: + +2004-02-17 Matthias Klose + + * Makefile.in: Allow transformations on info file names. + Define MAKEINFODEFS, macros to pass transformated info file + names to makeinfo. + * doc/cpp.texi: Use macros defined in MAKEINFODEFS for references. + * doc/cppinternals.texi: Likewise. + * doc/extend.texi: Likewise. + * doc/gcc.texi: Likewise. + * doc/gccint.texi: Likewise. + * doc/invoke.texi: Likewise. + * doc/libgcc.texi: Likewise. + * doc/makefile.texi: Likewise. + * doc/passes.texi: Likewise. + * doc/sourcebuild.texi: Likewise. + * doc/standards.texi: Likewise. + * doc/trouble.texi: Likewise. + +gcc/fortran/ChangeLog: + * Make-lang.in: Allow transformations on info file names. + Pass macros of transformated info file defined in MAKEINFODEFS + names to makeinfo. + * gfortran.texi: Use macros defined in MAKEINFODEFS for references. + +gcc/java/ChangeLog: + * Make-lang.in: Allow transformations on info file names. + Pass macros of transformated info file defined in MAKEINFODEFS + names to makeinfo. + * gcj.texi: Use macros defined in MAKEINFODEFS for references. + + +Index: libgomp/libgomp.texi +=================================================================== +*** libgomp/libgomp.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- libgomp/libgomp.texi 2012-02-21 14:34:15.000000000 +0100 +*************** texts being (a) (see below), and with th +*** 31,37 **** + @ifinfo + @dircategory GNU Libraries + @direntry +! * libgomp: (libgomp). GNU OpenMP runtime library + @end direntry + + This manual documents the GNU implementation of the OpenMP API for +--- 31,37 ---- + @ifinfo + @dircategory GNU Libraries + @direntry +! * @value{fnlibgomp}: (@value{fnlibgomp}). GNU OpenMP runtime library + @end direntry + + This manual documents the GNU implementation of the OpenMP API for +Index: libgomp/Makefile.am +=================================================================== +*** libgomp/Makefile.am.orig 2012-02-21 14:33:54.000000000 +0100 +--- libgomp/Makefile.am 2012-02-21 14:34:15.000000000 +0100 +*************** endif +*** 111,126 **** + + all-local: $(STAMP_GENINSRC) + +! stamp-geninsrc: libgomp.info +! cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info + @touch $@ + +! libgomp.info: $(STAMP_BUILD_INFO) + + stamp-build-info: libgomp.texi +! $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libgomp.info $(srcdir)/libgomp.texi + @touch $@ + + +! CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libgomp.info + MAINTAINERCLEANFILES = $(srcdir)/libgomp.info +--- 111,129 ---- + + all-local: $(STAMP_GENINSRC) + +! INFO_LIBGOMP_NAME = $(shell echo libgomp|sed '$(program_transform_name)') +! stamp-geninsrc: $(INFO_LIBGOMP_NAME).info +! cp -p $(top_builddir)/$(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.info + @touch $@ + +! libgomp.info: $(INFO_LIBGOMP_NAME).info +! cp $(INFO_LIBGOMP_NAME).info libgomp.info +! $(INFO_LIBGOMP_NAME).info: $(STAMP_BUILD_INFO) + + stamp-build-info: libgomp.texi +! $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -D 'fnlibgomp $(INFO_LIBGOMP_NAME)' -I $(srcdir) -o $(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.texi + @touch $@ + + +! CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) $(INFO_LIBGOMP_NAME).info + MAINTAINERCLEANFILES = $(srcdir)/libgomp.info +Index: libgomp/Makefile.in +=================================================================== +*** libgomp/Makefile.in.orig 2012-02-21 14:33:54.000000000 +0100 +--- libgomp/Makefile.in 2012-02-21 14:34:15.000000000 +0100 +*************** info_TEXINFOS = libgomp.texi +*** 343,349 **** + + # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO]) + @BUILD_INFO_TRUE@STAMP_BUILD_INFO = stamp-build-info +! CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libgomp.info + MAINTAINERCLEANFILES = $(srcdir)/libgomp.info + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive +--- 343,350 ---- + + # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO]) + @BUILD_INFO_TRUE@STAMP_BUILD_INFO = stamp-build-info +! INFO_LIBGOMP_NAME = $(shell echo libgomp|sed '$(program_transform_name)') +! CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) $(INFO_LIBGOMP_NAME).info + MAINTAINERCLEANFILES = $(srcdir)/libgomp.info + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive +*************** env.lo: libgomp_f.h +*** 1089,1103 **** + env.o: libgomp_f.h + + all-local: $(STAMP_GENINSRC) +! +! stamp-geninsrc: libgomp.info +! cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info + @touch $@ + +! libgomp.info: $(STAMP_BUILD_INFO) + + stamp-build-info: libgomp.texi +! $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libgomp.info $(srcdir)/libgomp.texi + @touch $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +--- 1090,1105 ---- + env.o: libgomp_f.h + + all-local: $(STAMP_GENINSRC) +! stamp-geninsrc: $(INFO_LIBGOMP_NAME).info +! cp -p $(top_builddir)/$(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.info + @touch $@ + +! libgomp.info: $(INFO_LIBGOMP_NAME).info +! cp $(INFO_LIBGOMP_NAME).info libgomp.info +! $(INFO_LIBGOMP_NAME).info: $(STAMP_BUILD_INFO) + + stamp-build-info: libgomp.texi +! $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -D 'fnlibgomp $(INFO_LIBGOMP_NAME)' -I $(srcdir) -o $(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.texi + @touch $@ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +Index: gcc/doc/cpp.texi +=================================================================== +*** gcc/doc/cpp.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/cpp.texi 2012-02-21 14:34:15.000000000 +0100 +*************** This manual contains no Invariant Sectio +*** 53,59 **** + @ifinfo + @dircategory Software development + @direntry +! * Cpp: (cpp). The GNU C preprocessor. + @end direntry + @end ifinfo + +--- 53,59 ---- + @ifinfo + @dircategory Software development + @direntry +! * @value{fncpp}: (@value{fncpp}). The GNU C preprocessor. + @end direntry + @end ifinfo + +Index: gcc/doc/cppinternals.texi +=================================================================== +*** gcc/doc/cppinternals.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/cppinternals.texi 2012-02-21 14:34:15.000000000 +0100 +*************** +*** 7,13 **** + @ifinfo + @dircategory Software development + @direntry +! * Cpplib: (cppinternals). Cpplib internals. + @end direntry + @end ifinfo + +--- 7,13 ---- + @ifinfo + @dircategory Software development + @direntry +! * @value{fncppint}: (@value{fncppint}). Cpplib internals. + @end direntry + @end ifinfo + +Index: gcc/doc/extend.texi +=================================================================== +*** gcc/doc/extend.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/extend.texi 2012-02-21 14:34:15.000000000 +0100 +*************** want to write code that checks whether t +*** 14788,14794 **** + test for the GNU compiler the same way as for C programs: check for a + predefined macro @code{__GNUC__}. You can also use @code{__GNUG__} to + test specifically for GNU C++ (@pxref{Common Predefined Macros,, +! Predefined Macros,cpp,The GNU C Preprocessor}). + + @menu + * C++ Volatiles:: What constitutes an access to a volatile object. +--- 14788,14794 ---- + test for the GNU compiler the same way as for C programs: check for a + predefined macro @code{__GNUC__}. You can also use @code{__GNUG__} to + test specifically for GNU C++ (@pxref{Common Predefined Macros,, +! Predefined Macros,@value{fncpp},The GNU C Preprocessor}). + + @menu + * C++ Volatiles:: What constitutes an access to a volatile object. +Index: gcc/doc/gcc.texi +=================================================================== +*** gcc/doc/gcc.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/gcc.texi 2012-02-21 14:34:15.000000000 +0100 +*************** Texts being (a) (see below), and with th +*** 65,72 **** + @ifnottex + @dircategory Software development + @direntry +! * gcc: (gcc). The GNU Compiler Collection. +! * g++: (gcc). The GNU C++ compiler. + @end direntry + This file documents the use of the GNU compilers. + @sp 1 +--- 65,72 ---- + @ifnottex + @dircategory Software development + @direntry +! * @value{fngcc}: (@value{fngcc}). The GNU Compiler Collection. +! * @value{fngxx}: (@value{fngcc}). The GNU C++ compiler. + @end direntry + This file documents the use of the GNU compilers. + @sp 1 +*************** version @value{version-GCC}. +*** 126,132 **** + The internals of the GNU compilers, including how to port them to new + targets and some information about how to write front ends for new + languages, are documented in a separate manual. @xref{Top,, +! Introduction, gccint, GNU Compiler Collection (GCC) Internals}. + + @menu + * G++ and GCC:: You can compile C or C++ programs. +--- 126,132 ---- + The internals of the GNU compilers, including how to port them to new + targets and some information about how to write front ends for new + languages, are documented in a separate manual. @xref{Top,, +! Introduction, @value{fngccint}, GNU Compiler Collection (GCC) Internals}. + + @menu + * G++ and GCC:: You can compile C or C++ programs. +Index: gcc/doc/gccint.texi +=================================================================== +*** gcc/doc/gccint.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/gccint.texi 2012-02-21 14:34:15.000000000 +0100 +*************** Texts being (a) (see below), and with th +*** 51,57 **** + @ifnottex + @dircategory Software development + @direntry +! * gccint: (gccint). Internals of the GNU Compiler Collection. + @end direntry + This file documents the internals of the GNU compilers. + @sp 1 +--- 51,57 ---- + @ifnottex + @dircategory Software development + @direntry +! * @value{fngccint}: (@value{fngccint}). Internals of the GNU Compiler Collection. + @end direntry + This file documents the internals of the GNU compilers. + @sp 1 +*************** write front ends for new languages. It +*** 83,89 **** + @value{VERSION_PACKAGE} + @end ifset + version @value{version-GCC}. The use of the GNU compilers is documented in a +! separate manual. @xref{Top,, Introduction, gcc, Using the GNU + Compiler Collection (GCC)}. + + This manual is mainly a reference manual rather than a tutorial. It +--- 83,89 ---- + @value{VERSION_PACKAGE} + @end ifset + version @value{version-GCC}. The use of the GNU compilers is documented in a +! separate manual. @xref{Top,, Introduction, @value{fngcc}, Using the GNU + Compiler Collection (GCC)}. + + This manual is mainly a reference manual rather than a tutorial. It +Index: gcc/doc/invoke.texi +=================================================================== +*** gcc/doc/invoke.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/invoke.texi 2012-02-21 14:34:15.000000000 +0100 +*************** One of the standard libraries bypassed b +*** 9434,9440 **** + @option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines + which GCC uses to overcome shortcomings of particular machines, or special + needs for some languages. +! (@xref{Interface,,Interfacing to GCC Output,gccint,GNU Compiler + Collection (GCC) Internals}, + for more discussion of @file{libgcc.a}.) + In most cases, you need @file{libgcc.a} even when you want to avoid +--- 9434,9440 ---- + @option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines + which GCC uses to overcome shortcomings of particular machines, or special + needs for some languages. +! (@xref{Interface,,Interfacing to GCC Output,@value{fngccint},GNU Compiler + Collection (GCC) Internals}, + for more discussion of @file{libgcc.a}.) + In most cases, you need @file{libgcc.a} even when you want to avoid +*************** other standard libraries. In other word +*** 9442,9448 **** + or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well. + This ensures that you have no unresolved references to internal GCC + library subroutines. (For example, @samp{__main}, used to ensure C++ +! constructors will be called; @pxref{Collect2,,@code{collect2}, gccint, + GNU Compiler Collection (GCC) Internals}.) + + @item -pie +--- 9442,9448 ---- + or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well. + This ensures that you have no unresolved references to internal GCC + library subroutines. (For example, @samp{__main}, used to ensure C++ +! constructors will be called; @pxref{Collect2,,@code{collect2}, @value{fngccint}, + GNU Compiler Collection (GCC) Internals}.) + + @item -pie +*************** Note that you can also specify places to +*** 19435,19441 **** + @option{-B}, @option{-I} and @option{-L} (@pxref{Directory Options}). These + take precedence over places specified using environment variables, which + in turn take precedence over those specified by the configuration of GCC@. +! @xref{Driver,, Controlling the Compilation Driver @file{gcc}, gccint, + GNU Compiler Collection (GCC) Internals}. + + @table @env +--- 19435,19441 ---- + @option{-B}, @option{-I} and @option{-L} (@pxref{Directory Options}). These + take precedence over places specified using environment variables, which + in turn take precedence over those specified by the configuration of GCC@. +! @xref{Driver,, Controlling the Compilation Driver @file{gcc}, @value{fngccint}, + GNU Compiler Collection (GCC) Internals}. + + @table @env +*************** the headers it contains change. +*** 19596,19602 **** + + A precompiled header file will be searched for when @code{#include} is + seen in the compilation. As it searches for the included file +! (@pxref{Search Path,,Search Path,cpp,The C Preprocessor}) the + compiler looks for a precompiled header in each directory just before it + looks for the include file in that directory. The name searched for is + the name specified in the @code{#include} with @samp{.gch} appended. If +--- 19596,19602 ---- + + A precompiled header file will be searched for when @code{#include} is + seen in the compilation. As it searches for the included file +! (@pxref{Search Path,,Search Path,@value{fncpp},The C Preprocessor}) the + compiler looks for a precompiled header in each directory just before it + looks for the include file in that directory. The name searched for is + the name specified in the @code{#include} with @samp{.gch} appended. If +Index: gcc/doc/libgcc.texi +=================================================================== +*** gcc/doc/libgcc.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/libgcc.texi 2012-02-21 14:34:15.000000000 +0100 +*************** that needs them. +*** 25,31 **** + GCC will also generate calls to C library routines, such as + @code{memcpy} and @code{memset}, in some cases. The set of routines + that GCC may possibly use is documented in @ref{Other +! Builtins,,,gcc, Using the GNU Compiler Collection (GCC)}. + + These routines take arguments and return values of a specific machine + mode, not a specific C type. @xref{Machine Modes}, for an explanation +--- 25,31 ---- + GCC will also generate calls to C library routines, such as + @code{memcpy} and @code{memset}, in some cases. The set of routines + that GCC may possibly use is documented in @ref{Other +! Builtins,,,@value{fngcc}, Using the GNU Compiler Collection (GCC)}. + + These routines take arguments and return values of a specific machine + mode, not a specific C type. @xref{Machine Modes}, for an explanation +Index: gcc/doc/makefile.texi +=================================================================== +*** gcc/doc/makefile.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/makefile.texi 2012-02-21 14:34:15.000000000 +0100 +*************** regardless of how it itself was compiled +*** 140,146 **** + Builds a compiler with profiling feedback information. In this case, + the second and third stages are named @samp{profile} and @samp{feedback}, + respectively. For more information, see +! @ref{Building,,Building with profile feedback,gccinstall,Installing GCC}. + + @item restrap + Restart a bootstrap, so that everything that was not built with +--- 140,146 ---- + Builds a compiler with profiling feedback information. In this case, + the second and third stages are named @samp{profile} and @samp{feedback}, + respectively. For more information, see +! @ref{Building,,Building with profile feedback,@value{fngccinstall},Installing GCC}. + + @item restrap + Restart a bootstrap, so that everything that was not built with +Index: gcc/doc/passes.texi +=================================================================== +*** gcc/doc/passes.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/passes.texi 2012-02-21 14:34:15.000000000 +0100 +*************** rid of it. This pass is located in @fil +*** 199,205 **** + @item Mudflap declaration registration + + If mudflap (@pxref{Optimize Options,,-fmudflap -fmudflapth +! -fmudflapir,gcc,Using the GNU Compiler Collection (GCC)}) is + enabled, we generate code to register some variable declarations with + the mudflap runtime. Specifically, the runtime tracks the lifetimes of + those variable declarations that have their addresses taken, or whose +--- 199,205 ---- + @item Mudflap declaration registration + + If mudflap (@pxref{Optimize Options,,-fmudflap -fmudflapth +! -fmudflapir,@value{fngcc},Using the GNU Compiler Collection (GCC)}) is + enabled, we generate code to register some variable declarations with + the mudflap runtime. Specifically, the runtime tracks the lifetimes of + those variable declarations that have their addresses taken, or whose +Index: gcc/doc/standards.texi +=================================================================== +*** gcc/doc/standards.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/standards.texi 2012-02-21 14:34:15.000000000 +0100 +*************** date that the release was frozen. +*** 295,302 **** + GNAT Reference Manual}, for information on standard + conformance and compatibility of the Ada compiler. + +! @xref{Standards,,Standards, gfortran, The GNU Fortran Compiler}, for details + of standards supported by GNU Fortran. + +! @xref{Compatibility,,Compatibility with the Java Platform, gcj, GNU gcj}, + for details of compatibility between @command{gcj} and the Java Platform. +--- 295,302 ---- + GNAT Reference Manual}, for information on standard + conformance and compatibility of the Ada compiler. + +! @xref{Standards,,Standards, @value{fngfortran}, The GNU Fortran Compiler}, for details + of standards supported by GNU Fortran. + +! @xref{Compatibility,,Compatibility with the Java Platform, @value{fngcj}, GNU gcj}, + for details of compatibility between @command{gcj} and the Java Platform. +Index: gcc/java/Make-lang.in +=================================================================== +*** gcc/java/Make-lang.in.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/java/Make-lang.in 2012-02-21 14:34:15.000000000 +0100 +*************** java.tags: force +*** 127,137 **** + etags --include TAGS.sub --include ../TAGS.sub + + +! java.info: doc/gcj.info + +! java.srcinfo: doc/gcj.info + -cp -p $^ $(srcdir)/doc + + java.dvi: doc/gcj.dvi + + JAVA_PDFFILES = doc/gcj.pdf +--- 127,149 ---- + etags --include TAGS.sub --include ../TAGS.sub + + +! TEXI_GCJ_FILES = java/gcj.texi \ +! $(gcc_docdir)/include/gpl.texi $(gcc_docdir)/include/funding.texi \ +! $(gcc_docdir)/include/fdl.texi $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi +! INFO_GCJ_NAME = $(shell echo gcj|sed '$(program_transform_name)') + +! java.info: doc/$(INFO_GCJ_NAME).info +! +! java.srcinfo: doc/$(INFO_GCJ_NAME).info + -cp -p $^ $(srcdir)/doc + ++ doc/$(INFO_GCJ_NAME).info: $(TEXI_GCJ_FILES) ++ if test "x$(BUILD_INFO)" = xinfo; then \ ++ rm -f $(@)*; \ ++ $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) \ ++ -I$(gcc_docdir)/include -I$(srcdir)/f -o$@ $<; \ ++ fi ++ + java.dvi: doc/gcj.dvi + + JAVA_PDFFILES = doc/gcj.pdf +*************** java.uninstall: +*** 194,201 **** + -rm -rf $(DESTDIR)$(man1dir)/gcj-dbtool$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/aot-compile$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/rebuild-gcj-db$(man1ext) + +! java.install-info: $(DESTDIR)$(infodir)/gcj.info + + java.install-pdf: $(JAVA_PDFFILES) + @$(NORMAL_INSTALL) +--- 206,214 ---- + -rm -rf $(DESTDIR)$(man1dir)/gcj-dbtool$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/aot-compile$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/rebuild-gcj-db$(man1ext) ++ -rm -f $(DESTDIR)$(infodir)/$(INFO_GCJ_NAME).info* + +! java.install-info: $(DESTDIR)$(infodir)/$(INFO_GCJ_NAME).info + + java.install-pdf: $(JAVA_PDFFILES) + @$(NORMAL_INSTALL) +Index: gcc/java/gcj.texi +=================================================================== +*** gcc/java/gcj.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/java/gcj.texi 2012-02-21 14:34:15.000000000 +0100 +*************** man page gfdl(7). +*** 55,75 **** + @format + @dircategory Software development + @direntry +! * Gcj: (gcj). Ahead-of-time compiler for the Java language + @end direntry + + @dircategory Individual utilities + @direntry +! * jcf-dump: (gcj)Invoking jcf-dump. + Print information about Java class files +! * gij: (gcj)Invoking gij. GNU interpreter for Java bytecode +! * gcj-dbtool: (gcj)Invoking gcj-dbtool. + Tool for manipulating class file databases. +! * jv-convert: (gcj)Invoking jv-convert. + Convert file from one encoding to another +! * grmic: (gcj)Invoking grmic. + Generate stubs for Remote Method Invocation. +! * gc-analyze: (gcj)Invoking gc-analyze. + Analyze Garbage Collector (GC) memory dumps. + * aot-compile: (gcj)Invoking aot-compile. + Compile bytecode to native and generate databases. +--- 55,75 ---- + @format + @dircategory Software development + @direntry +! * @value{fngcj}: (@value{fngcj}). Ahead-of-time compiler for the Java language + @end direntry + + @dircategory Individual utilities + @direntry +! * jcf-dump: (@value{fngcj}) Invoking jcf-dump. + Print information about Java class files +! * gij: (@value{fngcj}) Invoking gij. GNU interpreter for Java bytecode +! * gcj-dbtool: (@value{fngcj}) Invoking gcj-dbtool. + Tool for manipulating class file databases. +! * jv-convert: (@value{fngcj}) Invoking jv-convert. + Convert file from one encoding to another +! * grmic: (@value{fngcj}) Invoking grmic. + Generate stubs for Remote Method Invocation. +! * gc-analyze: (@value{fngcj}) Invoking gc-analyze. + Analyze Garbage Collector (GC) memory dumps. + * aot-compile: (gcj)Invoking aot-compile. + Compile bytecode to native and generate databases. +*************** and the Info entries for @file{gcj} and +*** 159,165 **** + + As @command{gcj} is just another front end to @command{gcc}, it supports many + of the same options as gcc. @xref{Option Summary, , Option Summary, +! gcc, Using the GNU Compiler Collection (GCC)}. This manual only documents the + options specific to @command{gcj}. + + @c man end +--- 159,165 ---- + + As @command{gcj} is just another front end to @command{gcc}, it supports many + of the same options as gcc. @xref{Option Summary, , Option Summary, +! @value{fngcc}, Using the GNU Compiler Collection (GCC)}. This manual only documents the + options specific to @command{gcj}. + + @c man end +Index: gcc/fortran/Make-lang.in +=================================================================== +*** gcc/fortran/Make-lang.in.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/fortran/Make-lang.in 2012-02-21 14:34:15.000000000 +0100 +*************** fortran.tags: force +*** 118,124 **** + cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \ + etags --include TAGS.sub --include ../TAGS.sub + +! fortran.info: doc/gfortran.info doc/gfc-internals.info + fortran.dvi: doc/gfortran.dvi doc/gfc-internals.dvi + + F95_HTMLFILES = $(build_htmldir)/gfortran +--- 118,125 ---- + cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \ + etags --include TAGS.sub --include ../TAGS.sub + +! INFO_FORTRAN_NAME = $(shell echo gfortran|sed '$(program_transform_name)') +! fortran.info: doc/$(INFO_FORTRAN_NAME).info + fortran.dvi: doc/gfortran.dvi doc/gfc-internals.dvi + + F95_HTMLFILES = $(build_htmldir)/gfortran +*************** GFORTRAN_TEXI = \ +*** 190,199 **** + $(srcdir)/doc/include/gcc-common.texi \ + gcc-vers.texi + +! doc/gfortran.info: $(GFORTRAN_TEXI) + if [ x$(BUILD_INFO) = xinfo ]; then \ + rm -f doc/gfortran.info-*; \ +! $(MAKEINFO) -I $(srcdir)/doc/include -I $(srcdir)/fortran \ + -o $@ $<; \ + else true; fi + +--- 191,200 ---- + $(srcdir)/doc/include/gcc-common.texi \ + gcc-vers.texi + +! doc/$(INFO_FORTRAN_NAME).info: $(GFORTRAN_TEXI) + if [ x$(BUILD_INFO) = xinfo ]; then \ + rm -f doc/gfortran.info-*; \ +! $(MAKEINFO) $(MAKEINFODEFS) -I $(srcdir)/doc/include -I $(srcdir)/fortran \ + -o $@ $<; \ + else true; fi + +*************** fortran.install-common: install-finclude +*** 261,267 **** + + fortran.install-plugin: + +! fortran.install-info: $(DESTDIR)$(infodir)/gfortran.info + + fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext) + +--- 262,268 ---- + + fortran.install-plugin: + +! fortran.install-info: $(DESTDIR)$(infodir)/$(INFO_FORTRAN_NAME).info + + fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext) + +*************** fortran.uninstall: +*** 279,285 **** + rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ + rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \ + rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ +! rm -rf $(DESTDIR)$(infodir)/gfortran.info* + + # + # Clean hooks: +--- 280,286 ---- + rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ + rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \ + rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ +! rm -rf $(DESTDIR)$(infodir)/$(INFO_FORTRAN_NAME).info* + + # + # Clean hooks: +Index: gcc/fortran/gfortran.texi +=================================================================== +*** gcc/fortran/gfortran.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/fortran/gfortran.texi 2012-02-21 14:34:15.000000000 +0100 +*************** Texts being (a) (see below), and with th +*** 101,107 **** + @ifinfo + @dircategory Software development + @direntry +! * gfortran: (gfortran). The GNU Fortran Compiler. + @end direntry + This file documents the use and the internals of + the GNU Fortran compiler, (@command{gfortran}). +--- 101,107 ---- + @ifinfo + @dircategory Software development + @direntry +! * @value{fngfortran}: (@value{fngfortran}). The GNU Fortran Compiler. + @end direntry + This file documents the use and the internals of + the GNU Fortran compiler, (@command{gfortran}). +Index: gcc/Makefile.in +=================================================================== +*** gcc/Makefile.in.orig 2012-02-21 14:34:13.000000000 +0100 +--- gcc/Makefile.in 2012-02-21 14:34:15.000000000 +0100 +*************** stmp-fixinc: gsyslimits.h macro_list fix +*** 4200,4207 **** + + doc: $(BUILD_INFO) $(GENERATED_MANPAGES) + +! INFOFILES = doc/cpp.info doc/gcc.info doc/gccint.info \ +! doc/gccinstall.info doc/cppinternals.info + + info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo + +--- 4200,4226 ---- + + doc: $(BUILD_INFO) $(GENERATED_MANPAGES) + +! INFO_CPP_NAME = $(shell echo cpp|sed '$(program_transform_name)') +! INFO_GCC_NAME = $(shell echo gcc|sed '$(program_transform_name)') +! INFO_GXX_NAME = $(shell echo g++|sed '$(program_transform_name)') +! INFO_GCCINT_NAME = $(shell echo gccint|sed '$(program_transform_name)') +! INFO_GCCINSTALL_NAME = $(shell echo gccinstall|sed '$(program_transform_name)') +! INFO_CPPINT_NAME = $(shell echo cppinternals|sed '$(program_transform_name)') +! +! INFO_FORTRAN_NAME = $(shell echo gfortran|sed '$(program_transform_name)') +! INFO_GCJ_NAME = $(shell echo gcj|sed '$(program_transform_name)') +! +! INFOFILES = doc/$(INFO_CPP_NAME).info doc/$(INFO_GCC_NAME).info \ +! doc/$(INFO_GCCINT_NAME).info \ +! doc/$(INFO_GCCINSTALL_NAME).info doc/$(INFO_CPPINT_NAME).info +! +! MAKEINFODEFS = -D 'fncpp $(INFO_CPP_NAME)' -D 'fngcc $(INFO_GCC_NAME)' \ +! -D 'fngxx $(INFO_GXX_NAME)' \ +! -D 'fngccint $(INFO_GCCINT_NAME)' \ +! -D 'fngccinstall $(INFO_GCCINSTALL_NAME)' \ +! -D 'fncppint $(INFO_CPPINT_NAME)' \ +! -D 'fngfortran $(INFO_FORTRAN_NAME)' \ +! -D 'fngcj $(INFO_GCJ_NAME)' + + info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo + +*************** gcc-vers.texi: $(BASEVER) $(DEVPHASE) +*** 4255,4275 **** + # patterns. To use them, put each of the specific targets with its + # specific dependencies but no build commands. + +! doc/cpp.info: $(TEXI_CPP_FILES) +! doc/gcc.info: $(TEXI_GCC_FILES) +! doc/gccint.info: $(TEXI_GCCINT_FILES) +! doc/cppinternals.info: $(TEXI_CPPINT_FILES) +! + doc/%.info: %.texi + if [ x$(BUILD_INFO) = xinfo ]; then \ + $(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \ + -I $(gcc_docdir)/include -o $@ $<; \ + fi + + # Duplicate entry to handle renaming of gccinstall.info +! doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES) + if [ x$(BUILD_INFO) = xinfo ]; then \ +! $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \ + -I $(gcc_docdir)/include -o $@ $<; \ + fi + +--- 4274,4314 ---- + # patterns. To use them, put each of the specific targets with its + # specific dependencies but no build commands. + +! # Generic entry to handle info files, which are not renamed (currently Ada) + doc/%.info: %.texi + if [ x$(BUILD_INFO) = xinfo ]; then \ + $(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \ + -I $(gcc_docdir)/include -o $@ $<; \ + fi + ++ doc/$(INFO_CPP_NAME).info: $(TEXI_CPP_FILES) ++ if [ x$(BUILD_INFO) = xinfo ]; then \ ++ $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ ++ -I $(gcc_docdir)/include -o $@ $<; \ ++ fi ++ ++ doc/$(INFO_GCC_NAME).info: $(TEXI_GCC_FILES) ++ if [ x$(BUILD_INFO) = xinfo ]; then \ ++ $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ ++ -I $(gcc_docdir)/include -o $@ $<; \ ++ fi ++ ++ doc/$(INFO_GCCINT_NAME).info: $(TEXI_GCCINT_FILES) ++ if [ x$(BUILD_INFO) = xinfo ]; then \ ++ $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ ++ -I $(gcc_docdir)/include -o $@ $<; \ ++ fi ++ ++ doc/$(INFO_CPPINT_NAME).info: $(TEXI_CPPINT_FILES) ++ if [ x$(BUILD_INFO) = xinfo ]; then \ ++ $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ ++ -I $(gcc_docdir)/include -o $@ $<; \ ++ fi ++ + # Duplicate entry to handle renaming of gccinstall.info +! doc/$(INFO_GCCINSTALL_NAME).info: $(TEXI_GCCINSTALL_FILES) + if [ x$(BUILD_INFO) = xinfo ]; then \ +! $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \ + -I $(gcc_docdir)/include -o $@ $<; \ + fi + +*************** install-driver: installdirs xgcc$(exeext +*** 4630,4640 **** + # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir + # to do the install. + install-info:: doc installdirs \ +! $(DESTDIR)$(infodir)/cpp.info \ +! $(DESTDIR)$(infodir)/gcc.info \ +! $(DESTDIR)$(infodir)/cppinternals.info \ +! $(DESTDIR)$(infodir)/gccinstall.info \ +! $(DESTDIR)$(infodir)/gccint.info \ + lang.install-info + + $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs +--- 4669,4679 ---- + # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir + # to do the install. + install-info:: doc installdirs \ +! $(DESTDIR)$(infodir)/$(INFO_CPP_NAME).info \ +! $(DESTDIR)$(infodir)/$(INFO_GCC_NAME).info \ +! $(DESTDIR)$(infodir)/$(INFO_CPPINT_NAME).info \ +! $(DESTDIR)$(infodir)/$(INFO_GCCINSTALL_NAME).info \ +! $(DESTDIR)$(infodir)/$(INFO_GCCINT_NAME).info \ + lang.install-info + + $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs +*************** uninstall: lang.uninstall +*** 4843,4850 **** + -rm -rf $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext) + -rm -rf $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext) +! -rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info* +! -rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info* + for i in ar nm ranlib ; do \ + install_name=`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ;\ + target_install_name=$(target_noncanonical)-`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ; \ +--- 4882,4892 ---- + -rm -rf $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext) + -rm -rf $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext) +! -rm -f $(DESTDIR)$(infodir)/$(INFO_CPP_NAME).info* +! -rm -f $(DESTDIR)$(infodir)/$(INFO_GCC_NAME).info* +! -rm -f $(DESTDIR)$(infodir)/$(INFO_CPPINT_NAME).info* +! -rm -f $(DESTDIR)$(infodir)/$(INFO_GCCINT_NAME).info* +! -rm -f $(DESTDIR)$(infodir)/$(INFO_GCCINSTALL_NAME).info* + for i in ar nm ranlib ; do \ + install_name=`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ;\ + target_install_name=$(target_noncanonical)-`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ; \ +Index: gcc/doc/install.texi +=================================================================== +*** gcc/doc/install.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/doc/install.texi 2012-02-21 14:34:15.000000000 +0100 +*************** Free Documentation License}''. +*** 98,104 **** + @end ifinfo + @dircategory Software development + @direntry +! * gccinstall: (gccinstall). Installing the GNU Compiler Collection. + @end direntry + + @c Part 3 Titlepage and Copyright +--- 98,104 ---- + @end ifinfo + @dircategory Software development + @direntry +! * @value{fngccinstall}: (@value{fngccinstall}). Installing the GNU Compiler Collection. + @end direntry + + @c Part 3 Titlepage and Copyright +Index: gcc/ada/gnat-style.texi +=================================================================== +*** gcc/ada/gnat-style.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/ada/gnat-style.texi 2012-02-21 14:34:15.000000000 +0100 +*************** Texts. A copy of the license is include +*** 31,37 **** + + @dircategory Software development + @direntry +! * gnat-style: (gnat-style). GNAT Coding Style + @end direntry + + @macro syntax{element} +--- 31,37 ---- + + @dircategory Software development + @direntry +! * gnat-style: (gnat-style-4.7). GNAT Coding Style + @end direntry + + @macro syntax{element} +Index: gcc/ada/gnat_rm.texi +=================================================================== +*** gcc/ada/gnat_rm.texi.orig 2012-02-21 14:33:54.000000000 +0100 +--- gcc/ada/gnat_rm.texi 2012-02-21 14:34:15.000000000 +0100 +*************** included in the section entitled ``GNU F +*** 38,44 **** + + @dircategory GNU Ada tools + @direntry +! * GNAT Reference Manual: (gnat_rm). Reference Manual for GNU Ada tools. + @end direntry + + @titlepage +--- 38,44 ---- + + @dircategory GNU Ada tools + @direntry +! * GNAT Reference Manual: (gnat_rm-4.7). Reference Manual for GNU Ada tools. + @end direntry + + @titlepage diff --git a/packaging/gcc44-textdomain.patch b/packaging/gcc44-textdomain.patch new file mode 100644 index 0000000..8746788 --- /dev/null +++ b/packaging/gcc44-textdomain.patch @@ -0,0 +1,116 @@ +#! /bin/sh -e + +# DP: Set gettext's domain and textdomain to the versioned package name. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + + +Index: gcc/Makefile.in +=================================================================== +--- gcc/Makefile.in.orig 2011-11-08 17:43:16.000000000 +0100 ++++ gcc/Makefile.in 2011-11-08 17:43:23.000000000 +0100 +@@ -5209,8 +5209,8 @@ install-po: + dir=$(localedir)/$$lang/LC_MESSAGES; \ + echo $(mkinstalldirs) $(DESTDIR)$$dir; \ + $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \ +- echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \ +- $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \ ++ echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.7.mo; \ ++ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.7.mo; \ + done + + # Rule for regenerating the message template (gcc.pot). +Index: gcc/intl.c +=================================================================== +--- gcc/intl.c.orig 2010-12-06 12:01:18.000000000 +0100 ++++ gcc/intl.c 2011-11-08 17:43:23.000000000 +0100 +@@ -56,8 +56,8 @@ gcc_init_libintl (void) + setlocale (LC_ALL, ""); + #endif + +- (void) bindtextdomain ("gcc", LOCALEDIR); +- (void) textdomain ("gcc"); ++ (void) bindtextdomain ("gcc-4.7", LOCALEDIR); ++ (void) textdomain ("gcc-4.7"); + + /* Opening quotation mark. */ + open_quote = _("`"); +Index: libcpp/Makefile.in +=================================================================== +--- libcpp/Makefile.in.orig 2011-11-08 16:24:10.000000000 +0100 ++++ libcpp/Makefile.in 2011-11-08 17:44:28.000000000 +0100 +@@ -49,6 +49,7 @@ LDFLAGS = @LDFLAGS@ + LIBICONV = @LIBICONV@ + LIBINTL = @LIBINTL@ + PACKAGE = @PACKAGE@ ++PACKAGE_SUFFIX = -4.7 + RANLIB = @RANLIB@ + SHELL = @SHELL@ + USED_CATALOGS = @USED_CATALOGS@ +@@ -73,8 +74,10 @@ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/. + -I$(srcdir)/include + + ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) ++ALL_CFLAGS += -DPACKAGE_SUFFIX=\"$(strip $(PACKAGE_SUFFIX))\" + ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \ + $(CPPFLAGS) ++ALL_CXXFLAGS += -DPACKAGE_SUFFIX=\"$(strip $(PACKAGE_SUFFIX))\" + + # The name of the compiler to use. + ENABLE_BUILD_WITH_CXX = @ENABLE_BUILD_WITH_CXX@ +@@ -170,8 +173,8 @@ install-strip install: all installdirs + else continue; \ + fi; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ +- echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ +- $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ ++ echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \ ++ $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \ + done + + mostlyclean: +Index: libcpp/system.h +=================================================================== +--- libcpp/system.h.orig 2011-11-03 16:30:43.000000000 +0100 ++++ libcpp/system.h 2011-11-08 17:43:23.000000000 +0100 +@@ -273,7 +273,7 @@ extern int errno; + #endif + + #ifndef _ +-# define _(msgid) dgettext (PACKAGE, msgid) ++# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid) + #endif + + #ifndef N_ +Index: libcpp/init.c +=================================================================== +--- libcpp/init.c.orig 2011-11-03 16:30:43.000000000 +0100 ++++ libcpp/init.c 2011-11-08 17:43:23.000000000 +0100 +@@ -140,7 +140,7 @@ init_library (void) + init_trigraph_map (); + + #ifdef ENABLE_NLS +- (void) bindtextdomain (PACKAGE, LOCALEDIR); ++ (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR); + #endif + } + } diff --git a/packaging/libjava-no-multilib.diff b/packaging/libjava-no-multilib.diff new file mode 100644 index 0000000..3ec0b48 --- /dev/null +++ b/packaging/libjava-no-multilib.diff @@ -0,0 +1,31 @@ +Index: libjava/configure +=================================================================== +--- libjava/configure.orig 2011-11-03 16:31:17.000000000 +0100 ++++ libjava/configure 2011-11-03 17:08:27.000000000 +0100 +@@ -3364,6 +3364,26 @@ else + fi + + ++# Default to --enable-libjava-multilib ++# Check whether --enable-libjava-multilib or --disable-libjava-multilib was given. ++if test "${enable_libjava_multilib+set}" = set; then ++ enableval="$enable_libjava_multilib" ++ case "${enableval}" in ++ yes) multilib=yes ;; ++ no) multilib=no ;; ++ *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for libjava-multilib option" >&5 ++echo "$as_me: error: bad value ${enableval} for libjava-multilib option" >&2;} ++ { (exit 1); exit 1; }; } ;; ++ esac ++else ++ multilib=yes ++fi; ++if test "$multilib" = no; then ++# Reset also --enable-multilib state, as that is what is looked at ++# by config-ml.in ++ ac_configure_args="$ac_configure_args --disable-multilib" ++fi ++ + # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. + + diff --git a/packaging/pr33763.diff b/packaging/pr33763.diff new file mode 100644 index 0000000..f0b63c7 --- /dev/null +++ b/packaging/pr33763.diff @@ -0,0 +1,19 @@ +Index: gcc/tree-inline.c +=================================================================== +*** gcc/tree-inline.c.orig 2011-11-03 16:27:43.000000000 +0100 +--- gcc/tree-inline.c 2011-11-04 11:37:21.000000000 +0100 +*************** expand_call_inline (basic_block bb, gimp +*** 3775,3780 **** +--- 3775,3786 ---- + goto egress; + + if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) ++ /* For extern inline functions that get redefined we always ++ silently ignored alway_inline flag. Better behaviour would ++ be to be able to keep both bodies and use extern inline body ++ for inlining, but we can't do that because frontends overwrite ++ the body. */ ++ && !cg_edge->callee->local.redefined_extern_inline + /* Avoid warnings during early inline pass. */ + && cgraph_global_info_ready + /* PR 20090218-1_0.c. Body can be provided by another module. */ diff --git a/packaging/pr49484.diff b/packaging/pr49484.diff new file mode 100644 index 0000000..893b978 --- /dev/null +++ b/packaging/pr49484.diff @@ -0,0 +1,229 @@ +2012-01-18 Richard Guenther + + * gthr.h (__GTHREAD_MUTEX_INIT_FUNCTION): Adjust specification. + * gthr-posix.h (__GTHREAD_MUTEX_INIT_FUNCTION): Define. + (__gthread_mutex_init_function): New function. + * gthr-single.h (__GTHREAD_MUTEX_INIT_FUNCTION): Define. + + PR gcov/49484 + * libgcov.c: Include gthr.h. + (__gcov_flush_mx): New global variable. + (init_mx, init_mx_once): New functions. + (__gcov_flush): Protect self with a mutex. + (__gcov_fork): Re-initialize mutex after forking. + * unwind-dw2-fde.c: Change condition under which to use + __GTHREAD_MUTEX_INIT_FUNCTION. + +Index: libgcc/libgcov.c +=================================================================== +*** libgcc/libgcov.c.orig 2012-03-02 12:02:35.000000000 +0100 +--- libgcc/libgcov.c 2012-03-14 13:01:34.000000000 +0100 +*************** see the files COPYING3 and COPYING.RUNTI +*** 30,35 **** +--- 30,36 ---- + #include "coretypes.h" + #include "tm.h" + #include "libgcc_tm.h" ++ #include "gthr.h" + + #if defined(inhibit_libc) + #define IN_LIBGCOV (-1) +*************** __gcov_init (struct gcov_info *info) +*** 705,710 **** +--- 706,730 ---- + info->version = 0; + } + ++ #ifdef __GTHREAD_MUTEX_INIT ++ ATTRIBUTE_HIDDEN __gthread_mutex_t __gcov_flush_mx = __GTHREAD_MUTEX_INIT; ++ #define init_mx_once() ++ #else ++ __gthread_mutex_t __gcov_flush_mx ATTRIBUTE_HIDDEN; ++ ++ static void ++ init_mx (void) ++ { ++ __GTHREAD_MUTEX_INIT_FUNCTION (&mx); ++ } ++ static void ++ init_mx_once (void) ++ { ++ static __gthread_once_t once = __GTHREAD_ONCE_INIT; ++ __gthread_once (&once, init_mx); ++ } ++ #endif ++ + /* Called before fork or exec - write out profile information gathered so + far and reset it to zero. This avoids duplication or loss of the + profile information gathered so far. */ +*************** __gcov_flush (void) +*** 714,719 **** +--- 734,742 ---- + { + const struct gcov_info *gi_ptr; + ++ init_mx_once (); ++ __gthread_mutex_lock (&__gcov_flush_mx); ++ + gcov_exit (); + for (gi_ptr = gcov_list; gi_ptr; gi_ptr = gi_ptr->next) + { +*************** __gcov_flush (void) +*** 737,742 **** +--- 760,767 ---- + } + } + } ++ ++ __gthread_mutex_unlock (&__gcov_flush_mx); + } + + #endif /* L_gcov */ +*************** __gcov_ior_profiler (gcov_type *counters +*** 975,982 **** + pid_t + __gcov_fork (void) + { + __gcov_flush (); +! return fork (); + } + #endif + +--- 1000,1012 ---- + pid_t + __gcov_fork (void) + { ++ pid_t pid; ++ extern __gthread_mutex_t __gcov_flush_mx; + __gcov_flush (); +! pid = fork (); +! if (pid == 0) +! __GTHREAD_MUTEX_INIT_FUNCTION (&__gcov_flush_mx); +! return pid; + } + #endif + +Index: libgcc/unwind-dw2-fde.c +=================================================================== +*** libgcc/unwind-dw2-fde.c.orig 2012-03-02 12:02:35.000000000 +0100 +--- libgcc/unwind-dw2-fde.c 2012-03-14 13:01:34.000000000 +0100 +*************** static struct object *seen_objects; +*** 47,57 **** + + #ifdef __GTHREAD_MUTEX_INIT + static __gthread_mutex_t object_mutex = __GTHREAD_MUTEX_INIT; + #else + static __gthread_mutex_t object_mutex; +- #endif + +- #ifdef __GTHREAD_MUTEX_INIT_FUNCTION + static void + init_object_mutex (void) + { +--- 47,56 ---- + + #ifdef __GTHREAD_MUTEX_INIT + static __gthread_mutex_t object_mutex = __GTHREAD_MUTEX_INIT; ++ #define init_object_mutex_once() + #else + static __gthread_mutex_t object_mutex; + + static void + init_object_mutex (void) + { +*************** init_object_mutex_once (void) +*** 64,71 **** + static __gthread_once_t once = __GTHREAD_ONCE_INIT; + __gthread_once (&once, init_object_mutex); + } +- #else +- #define init_object_mutex_once() + #endif + + /* Called from crtbegin.o to register the unwind info for an object. */ +--- 63,68 ---- +Index: libgcc/gthr-posix.h +=================================================================== +*** libgcc/gthr-posix.h.orig 2012-03-02 12:02:35.000000000 +0100 +--- libgcc/gthr-posix.h 2012-03-14 13:02:09.000000000 +0100 +*************** typedef struct timespec __gthread_time_t +*** 63,68 **** +--- 63,69 ---- + #define __GTHREAD_HAS_COND 1 + + #define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER ++ #define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function + #define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT + #if defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER) + #define __GTHREAD_RECURSIVE_MUTEX_INIT PTHREAD_RECURSIVE_MUTEX_INITIALIZER +*************** typedef struct timespec __gthread_time_t +*** 76,82 **** + + #ifdef _GTHREAD_USE_MUTEX_INIT_FUNC + # undef __GTHREAD_MUTEX_INIT +- # define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function + #endif + #ifdef _GTHREAD_USE_RECURSIVE_MUTEX_INIT_FUNC + # undef __GTHREAD_RECURSIVE_MUTEX_INIT +--- 77,82 ---- +*************** __gthread_setspecific (__gthread_key_t _ +*** 744,757 **** + return __gthrw_(pthread_setspecific) (__key, __ptr); + } + +- #ifdef _GTHREAD_USE_MUTEX_INIT_FUNC + static inline void + __gthread_mutex_init_function (__gthread_mutex_t *__mutex) + { + if (__gthread_active_p ()) + __gthrw_(pthread_mutex_init) (__mutex, NULL); + } +- #endif + + static inline int + __gthread_mutex_destroy (__gthread_mutex_t *__mutex) +--- 744,755 ---- +Index: libgcc/gthr-single.h +=================================================================== +*** libgcc/gthr-single.h.orig 2012-03-02 12:02:35.000000000 +0100 +--- libgcc/gthr-single.h 2012-03-14 13:01:34.000000000 +0100 +*************** typedef int __gthread_recursive_mutex_t; +*** 36,41 **** +--- 36,42 ---- + + #define __GTHREAD_ONCE_INIT 0 + #define __GTHREAD_MUTEX_INIT 0 ++ #define __GTHREAD_MUTEX_INIT_FUNCTION(mx) + #define __GTHREAD_RECURSIVE_MUTEX_INIT 0 + + #define UNUSED __attribute__((unused)) +Index: libgcc/gthr.h +=================================================================== +*** libgcc/gthr.h.orig 2012-03-02 12:02:35.000000000 +0100 +--- libgcc/gthr.h 2012-03-14 13:01:34.000000000 +0100 +*************** see the files COPYING3 and COPYING.RUNTI +*** 52,62 **** + to initialize __gthread_mutex_t to get a fast + non-recursive mutex. + __GTHREAD_MUTEX_INIT_FUNCTION +! some systems can't initialize a mutex without a +! function call. On such systems, define this to a +! function which looks like this: + void __GTHREAD_MUTEX_INIT_FUNCTION (__gthread_mutex_t *) +! Don't define __GTHREAD_MUTEX_INIT in this case + __GTHREAD_RECURSIVE_MUTEX_INIT + __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION + as above, but for a recursive mutex. +--- 52,63 ---- + to initialize __gthread_mutex_t to get a fast + non-recursive mutex. + __GTHREAD_MUTEX_INIT_FUNCTION +! to initialize __gthread_mutex_t to get a fast +! non-recursive mutex. +! Define this to a function which looks like this: + void __GTHREAD_MUTEX_INIT_FUNCTION (__gthread_mutex_t *) +! Some systems can't initialize a mutex without a +! function call. Don't define __GTHREAD_MUTEX_INIT in this case. + __GTHREAD_RECURSIVE_MUTEX_INIT + __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION + as above, but for a recursive mutex. diff --git a/packaging/program-transform-name.diff b/packaging/program-transform-name.diff new file mode 100644 index 0000000..6f821d0 --- /dev/null +++ b/packaging/program-transform-name.diff @@ -0,0 +1,198 @@ +Index: gcc/ada/gcc-interface/Make-lang.in +=================================================================== +--- gcc/ada/gcc-interface/Make-lang.in.orig 2011-11-03 16:26:46.000000000 +0100 ++++ gcc/ada/gcc-interface/Make-lang.in 2011-11-03 17:08:13.000000000 +0100 +@@ -758,6 +758,21 @@ doc/gnat-style.pdf: ada/gnat-style.texi + # likewise for gnatf, gnatchop, and gnatlink, gnatkr, gnatmake, gnat, + # gnatprep, gnatls, gnatxref, gnatfind, gnatname, gnatclean, + # gnatsym ++GNATBIND_INSTALL_NAME := $(shell echo gnatbind|sed '$(program_transform_name)') ++GNATCHOP_INSTALL_NAME := $(shell echo gnatchop|sed '$(program_transform_name)') ++GNAT_INSTALL_NAME := $(shell echo gnat|sed '$(program_transform_name)') ++GNATKR_INSTALL_NAME := $(shell echo gnatkr|sed '$(program_transform_name)') ++GNATLINK_INSTALL_NAME := $(shell echo gnatlink|sed '$(program_transform_name)') ++GNATLS_INSTALL_NAME := $(shell echo gnatls|sed '$(program_transform_name)') ++GNATMAKE_INSTALL_NAME := $(shell echo gnatmake|sed '$(program_transform_name)') ++GNATNAME_INSTALL_NAME := $(shell echo gnatname|sed '$(program_transform_name)') ++GNATPREP_INSTALL_NAME := $(shell echo gnatprep|sed '$(program_transform_name)') ++GNATXREF_INSTALL_NAME := $(shell echo gnatxref|sed '$(program_transform_name)') ++GNATFIND_INSTALL_NAME := $(shell echo gnatfind|sed '$(program_transform_name)') ++GNATCLEAN_INSTALL_NAME := $(shell echo gnatclean|sed '$(program_transform_name)') ++GNATSYM_INSTALL_NAME := $(shell echo gnatsym|sed '$(program_transform_name)') ++GNATDLL_INSTALL_NAME := $(shell echo gnatdll|sed '$(program_transform_name)') ++VXADDR2LINE_INSTALL_NAME := $(shell echo vxaddr2line|sed '$(program_transform_name)') + ada.install-common: + $(MKDIR) $(DESTDIR)$(bindir) + -if [ -f gnat1$(exeext) ] ; \ +@@ -771,8 +786,8 @@ ada.install-common: + $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ + fi; \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ +- $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATBIND_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/$(GNATBIND_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -786,8 +801,8 @@ ada.install-common: + $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \ + fi ; \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ +- $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATCHOP_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/$(GNATCHOP_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -801,8 +816,8 @@ ada.install-common: + $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ + fi; \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnat$(exeext); \ +- $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/gnat$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNAT_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/$(GNAT_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -816,8 +831,8 @@ ada.install-common: + $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ + fi; \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ +- $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATKR_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/$(GNATKR_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -831,8 +846,8 @@ ada.install-common: + $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ + fi; \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ +- $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATLINK_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/$(GNATLINK_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -846,8 +861,8 @@ ada.install-common: + $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ + fi; \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatls$(exeext); \ +- $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/gnatls$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATLS_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/$(GNATLS_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -861,8 +876,8 @@ ada.install-common: + $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ + fi; \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ +- $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATMAKE_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/$(GNATMAKE_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -872,8 +887,8 @@ ada.install-common: + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ + $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatname$(exeext); \ +- $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/gnatname$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATNAME_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/$(GNATNAME_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -887,8 +902,8 @@ ada.install-common: + $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ + fi; \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ +- $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATPREP_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/$(GNATPREP_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -898,8 +913,8 @@ ada.install-common: + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ + $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ +- $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATXREF_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/$(GNATXREF_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -909,8 +924,8 @@ ada.install-common: + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ + $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ +- $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATFIND_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/$(GNATFIND_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + -if [ -f gnat1$(exeext) ] ; \ +@@ -920,8 +935,8 @@ ada.install-common: + $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ + $(INSTALL_PROGRAM) gnatclean-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ + else \ +- $(RM) $(DESTDIR)$(bindir)/gnatclean$(exeext); \ +- $(INSTALL_PROGRAM) gnatclean$(exeext) $(DESTDIR)$(bindir)/gnatclean$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATCLEAN_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatclean$(exeext) $(DESTDIR)$(bindir)/$(GNATCLEAN_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + # +@@ -935,7 +950,7 @@ ada.install-common: + $(INSTALL_PROGRAM) gnatsym-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatsym$(exeext); \ + else \ + $(RM) $(DESTDIR)$(bindir)/gnatsym$(exeext); \ +- $(INSTALL_PROGRAM) gnatsym$(exeext) $(DESTDIR)$(bindir)/gnatsym$(exeext); \ ++ $(INSTALL_PROGRAM) gnatsym$(exeext) $(DESTDIR)$(bindir)/$(GNATSYM_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + # +@@ -943,8 +958,8 @@ ada.install-common: + # + -if [ -f gnat1$(exeext) ] ; \ + then \ +- $(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ +- $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(GNATDLL_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/$(GNATDLL_INSTALL_NAME)$(exeext); \ + fi + # + # vxaddr2line is only used for cross ports (it calls the underlying cross +@@ -954,8 +969,8 @@ ada.install-common: + then \ + if [ -f vxaddr2line$(exeext) ] ; \ + then \ +- $(RM) $(DESTDIR)$(bindir)/vxaddr2line$(exeext); \ +- $(INSTALL_PROGRAM) vxaddr2line$(exeext) $(DESTDIR)$(bindir)/vxaddr2line$(exeext); \ ++ $(RM) $(DESTDIR)$(bindir)/$(VXADDR2LINE_INSTALL_NAME)$(exeext); \ ++ $(INSTALL_PROGRAM) vxaddr2line$(exeext) $(DESTDIR)$(bindir)/$(VXADDR2LINE_INSTALL_NAME)$(exeext); \ + fi ; \ + fi + +@@ -1019,8 +1034,6 @@ ada.uninstall: + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatxref$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatclean$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatsym$(exeext) +-# Gnatchop is only used on VMS +- -$(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext) + + # Clean hooks: + # A lot of the ancillary files are deleted by the main makefile. diff --git a/packaging/sap303956-uchar.diff b/packaging/sap303956-uchar.diff new file mode 100644 index 0000000..f9c896c --- /dev/null +++ b/packaging/sap303956-uchar.diff @@ -0,0 +1,55 @@ +Index: gcc/ginclude/uchar.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gcc/ginclude/uchar.h 2011-11-09 12:00:01.000000000 +0100 +@@ -0,0 +1,38 @@ ++/* Copyright (C) 2008 Free Software Foundation, Inc. ++ ++This file is part of GCC. ++ ++GCC is free software; you can redistribute it and/or modify ++it under the terms of the GNU General Public License as published by ++the Free Software Foundation; either version 2, or (at your option) ++any later version. ++ ++GCC is distributed in the hope that it will be useful, ++but WITHOUT ANY WARRANTY; without even the implied warranty of ++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++GNU General Public License for more details. ++ ++You should have received a copy of the GNU General Public License ++along with GCC; see the file COPYING. If not, write to ++the Free Software Foundation, 51 Franklin Street, Fifth Floor, ++Boston, MA 02110-1301, USA. */ ++ ++/* As a special exception, if you include this header file into source ++ files compiled by GCC, this header file does not by itself cause ++ the resulting executable to be covered by the GNU General Public ++ License. This exception does not however invalidate any other ++ reasons why the executable file might be covered by the GNU General ++ Public License. */ ++ ++/* ++ * template header so that char16_t and char32_t are available ++ * in C (not only in C++). This is not a full implementation of ++ */ ++ ++#ifndef _UCHAR_H___ ++#define _UCHAR_H___ ++#ifndef __cplusplus ++typedef __CHAR16_TYPE__ char16_t; ++typedef __CHAR32_TYPE__ char32_t; ++#endif ++#endif +Index: gcc/Makefile.in +=================================================================== +--- gcc/Makefile.in.orig 2011-11-09 11:59:58.000000000 +0100 ++++ gcc/Makefile.in 2011-11-09 12:00:01.000000000 +0100 +@@ -375,6 +375,7 @@ USER_H = $(srcdir)/ginclude/float.h \ + $(srcdir)/ginclude/stddef.h \ + $(srcdir)/ginclude/varargs.h \ + $(srcdir)/ginclude/stdfix.h \ ++ $(srcdir)/ginclude/uchar.h \ + $(srcdir)/ginclude/stdnoreturn.h \ + $(srcdir)/ginclude/stdalign.h \ + $(EXTRA_HEADERS) diff --git a/packaging/suse-record-gcc-opts.diff b/packaging/suse-record-gcc-opts.diff new file mode 100644 index 0000000..6e864d2 --- /dev/null +++ b/packaging/suse-record-gcc-opts.diff @@ -0,0 +1,65 @@ +Index: gcc/varasm.c +=================================================================== +--- gcc/varasm.c.orig 2011-11-03 16:27:43.000000000 +0100 ++++ gcc/varasm.c 2011-11-03 17:07:57.000000000 +0100 +@@ -6979,6 +6979,35 @@ file_end_indicate_split_stack (void) + } + } + ++/* This is a generic routine emitting a SUSE specific section for ++ QA check marks. */ ++ ++void ++suse_file_end_indicate_optflags (void) ++{ ++ unsigned int flags = SECTION_DEBUG | SECTION_STRINGS | SECTION_MERGE | (SECTION_ENTSIZE & 1); ++ ++ /* ++ o/O: optimize was off/on ++ s/S: size optimisation was off/on ++ p/P: stack-protector was off/on ++ w/W: warnings were off/on ++ g/G: debug was off/on ++ */ ++ ++ char opts_buffer[6]; ++ ++ opts_buffer[0] = (optimize >= 2) ? 'O' : 'o'; ++ opts_buffer[1] = (optimize >= 1 && optimize_size) ? 'S' : 's'; ++ opts_buffer[2] = (flag_stack_protect >= 1) ? 'P' : 'p'; ++ opts_buffer[3] = (warn_uninitialized >= 1 && warn_sequence_point >= 1) ? 'W' : 'w'; ++ opts_buffer[4] = (debug_info_level > DINFO_LEVEL_NONE) ? 'G' : 'g'; ++ opts_buffer[5] = '\0'; ++ ++ switch_to_section (get_section (".comment.SUSE.OPTs", flags, NULL)); ++ ASM_OUTPUT_ASCII (asm_out_file, opts_buffer, strlen (opts_buffer) + 1); ++} ++ + /* Output DIRECTIVE (a C string) followed by a newline. This is used as + a get_unnamed_section callback. */ + +Index: gcc/output.h +=================================================================== +--- gcc/output.h.orig 2011-11-03 16:27:43.000000000 +0100 ++++ gcc/output.h 2011-11-03 17:07:57.000000000 +0100 +@@ -652,6 +652,7 @@ extern void default_asm_declare_constant + extern void default_file_start (void); + extern void file_end_indicate_exec_stack (void); + extern void file_end_indicate_split_stack (void); ++extern void suse_file_end_indicate_optflags (void); + + extern void default_elf_asm_output_external (FILE *file, tree, + const char *); +Index: gcc/toplev.c +=================================================================== +--- gcc/toplev.c.orig 2011-11-03 16:27:43.000000000 +0100 ++++ gcc/toplev.c 2011-11-03 17:07:57.000000000 +0100 +@@ -682,6 +682,8 @@ compile_file (void) + /* Invoke registered plugin callbacks. */ + invoke_plugin_callbacks (PLUGIN_FINISH_UNIT, NULL); + ++ suse_file_end_indicate_optflags (); ++ + /* This must be at the end. Some target ports emit end of file directives + into the assembly file here, and hence we can not output anything to the + assembly file after this point. */ diff --git a/packaging/tls-no-direct.diff b/packaging/tls-no-direct.diff new file mode 100644 index 0000000..547a91b --- /dev/null +++ b/packaging/tls-no-direct.diff @@ -0,0 +1,17 @@ +Index: gcc/config/i386/gnu-user.h +=================================================================== +--- gcc/config/i386/gnu-user.h.orig 2011-05-09 17:58:22.000000000 +0200 ++++ gcc/config/i386/gnu-user.h 2011-11-03 17:12:38.000000000 +0100 +@@ -30,8 +30,12 @@ along with GCC; see the file COPYING3. + #define DEFAULT_PCC_STRUCT_RETURN 1 + + /* We arrange for the whole %gs segment to map the tls area. */ ++/* This slows down Xen, so take a very small general performance hit ++ for not accessing the %gs segment with negative offsets by making ++ GCC not emit direct accesses to %gs at all. + #undef TARGET_TLS_DIRECT_SEG_REFS_DEFAULT + #define TARGET_TLS_DIRECT_SEG_REFS_DEFAULT MASK_TLS_DIRECT_SEG_REFS ++ */ + + #undef ASM_COMMENT_START + #define ASM_COMMENT_START "#" -- 2.7.4