* [gentoo-commits] gentoo commit in src/patchsets/gcc/4.2.2/gentoo: 00_all_gcc-4.1-alpha-mieee-default.patch 00_all_gcc-trampolinewarn.patch 01_all_gcc4-ice-hack.patch 02_all_gcc4-ppc64-m32-m64-multilib-only.patch 03_all_gcc4-java-nomulti.patch 06_all_gcc4-slow-pthread-self.patch 08_all_gcc-4.1-cross-compile.patch 10_all_gcc4-libltdl-multilib.patch 11_all_gcc-netbsd-symbolic.patch 14_all_gcc-sparc64-bsd.patch 18_all_904-flatten-switch-stmt-00.patch 20_all_cris-dont-force-limits-header.patch 34_all_arm-bigendian.patch 35_all_gcc-arm-pragma-pack.patch 36_all_gcc-arm-pr30486.patch 51_all_gcc-3.4-libiberty-pic.patch 53_all_gcc4-superh-default-multilib.patch 54_all_300-libstdc++-pic.patch 61_all_gcc4-ia64-noteGNUstack.patch 62_all_gcc4-noteGNUstack.patch 74_all_sh-pr24836.patch 85_all_gcc-ca-translation-typo.patch 90_all_mips-add-march-r10k.patch 91_all_mips-ip28_cache_barriers-v4.patch README.history
@ 2007-10-11 4:43 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2007-10-11 4:43 UTC (permalink / raw
To: gentoo-commits
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=utf8, Size: 84017 bytes --]
vapier 07/10/11 04:43:20
Added: 00_all_gcc-4.1-alpha-mieee-default.patch
00_all_gcc-trampolinewarn.patch
01_all_gcc4-ice-hack.patch
02_all_gcc4-ppc64-m32-m64-multilib-only.patch
03_all_gcc4-java-nomulti.patch
06_all_gcc4-slow-pthread-self.patch
08_all_gcc-4.1-cross-compile.patch
10_all_gcc4-libltdl-multilib.patch
11_all_gcc-netbsd-symbolic.patch
14_all_gcc-sparc64-bsd.patch
18_all_904-flatten-switch-stmt-00.patch
20_all_cris-dont-force-limits-header.patch
34_all_arm-bigendian.patch
35_all_gcc-arm-pragma-pack.patch
36_all_gcc-arm-pr30486.patch
51_all_gcc-3.4-libiberty-pic.patch
53_all_gcc4-superh-default-multilib.patch
54_all_300-libstdc++-pic.patch
61_all_gcc4-ia64-noteGNUstack.patch
62_all_gcc4-noteGNUstack.patch
74_all_sh-pr24836.patch
85_all_gcc-ca-translation-typo.patch
90_all_mips-add-march-r10k.patch
91_all_mips-ip28_cache_barriers-v4.patch
README.history
Log:
initial 4.2.2 patchset based on last 4.2.1 patchset
Revision Changes Path
1.1 src/patchsets/gcc/4.2.2/gentoo/00_all_gcc-4.1-alpha-mieee-default.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/00_all_gcc-4.1-alpha-mieee-default.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/00_all_gcc-4.1-alpha-mieee-default.patch?rev=1.1&content-type=text/plain
Index: 00_all_gcc-4.1-alpha-mieee-default.patch
===================================================================
Set the default behavior on alpha to use -mieee since the large majority of
time we want this (bad/weird things can happen with packages built without
-mieee).
To satisfy those people who may not want -mieee forced on them all the time,
we also provide -mno-ieee.
Patch by Mike Frysinger <vapier@gentoo.org>
--- gcc-4_1-branch/gcc/config/alpha/alpha.h
+++ gcc-4_1-branch/gcc/config/alpha/alpha.h
@@ -96,7 +96,7 @@
while (0)
#endif
-#define CPP_SPEC "%(cpp_subtarget)"
+#define CPP_SPEC "%(cpp_subtarget) %{!no-ieee:-mieee}"
#ifndef CPP_SUBTARGET_SPEC
#define CPP_SUBTARGET_SPEC ""
--- gcc-4_1-branch/gcc/config/alpha/alpha.opt
+++ gcc-4_1-branch/gcc/config/alpha/alpha.opt
@@ -40,7 +40,7 @@
Request IEEE-conformant math library routines (OSF/1)
mieee
-Target Report RejectNegative Mask(IEEE)
+Target Report Mask(IEEE)
Emit IEEE-conformant code, without inexact exceptions
mieee-with-inexact
1.1 src/patchsets/gcc/4.2.2/gentoo/00_all_gcc-trampolinewarn.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/00_all_gcc-trampolinewarn.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/00_all_gcc-trampolinewarn.patch?rev=1.1&content-type=text/plain
Index: 00_all_gcc-trampolinewarn.patch
===================================================================
This trivial patch causes gcc to emit a warning whenever
it generates a trampoline. These are otherwise hard to
locate. It is rigged to default ON - to have it default
to OFF remove the text 'Init(1)' from the common.opt
patch, leaving just 'Common Var(warn_trampolines)'.
Kevin F. Quinn <kevquinn@gentoo.org> 17 Jan 2006
--- gcc/gcc/common.opt
+++ gcc/gcc/common.opt
@@ -141,6 +141,10 @@
Common Var(warn_system_headers)
Do not suppress warnings from system headers
+Wtrampolines
+Common Var(warn_trampolines) Init(1)
+Warn whenever a trampoline is generated
+
Wuninitialized
Common Var(warn_uninitialized)
Warn about uninitialized automatic variables
--- gcc/gcc/builtins.c
+++ gcc/gcc/builtins.c
@@ -5224,6 +5224,9 @@
#endif
trampolines_created = 1;
INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
+
+ if (warn_trampolines)
+ warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
return const0_rtx;
}
1.1 src/patchsets/gcc/4.2.2/gentoo/01_all_gcc4-ice-hack.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/01_all_gcc4-ice-hack.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/01_all_gcc4-ice-hack.patch?rev=1.1&content-type=text/plain
Index: 01_all_gcc4-ice-hack.patch
===================================================================
2004-01-23 Jakub Jelinek <jakub@redhat.com>
* gcc.c (execute): Don't free first string early, but at the end
of the function. Call retry_ice if compiler exited with
ICE_EXIT_CODE.
(retry_ice): New function.
* diagnostic.c (diagnostic_count_diagnostic,
diagnostic_action_after_output, error_recursion): Exit with
ICE_EXIT_CODE instead of FATAL_EXIT_CODE.
--- gcc/gcc.c.jj 2004-01-21 11:45:20.000000000 +0100
+++ gcc/gcc.c 2004-01-21 11:56:46.000000000 +0100
@@ -346,6 +346,9 @@ static void init_gcc_specs (struct obsta
#if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)
static const char *convert_filename (const char *, int, int);
#endif
+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
+static void retry_ice (const char *prog, const char **argv);
+#endif
static const char *if_exists_spec_function (int, const char **);
static const char *if_exists_else_spec_function (int, const char **);
@@ -2841,7 +2844,7 @@ execute (void)
}
}
- if (string != commands[i].prog)
+ if (i && string != commands[i].prog)
free ((void *) string);
}
@@ -2897,6 +2900,17 @@ See %s for instructions.",
else if (WIFEXITED (status)
&& WEXITSTATUS (status) >= MIN_FATAL_STATUS)
{
+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
+ /* For ICEs in cc1, cc1obj, cc1plus see if it is
+ reproducible or not. */
+ char *p;
+ if (getenv("GCC_RETRY_ICE") == NULL
+ && WEXITSTATUS (status) == ICE_EXIT_CODE
+ && i == 0
+ && (p = strrchr (commands[0].argv[0], DIR_SEPARATOR))
+ && ! strncmp (p + 1, "cc1", 3))
+ retry_ice (commands[0].prog, commands[0].argv);
+#endif
if (WEXITSTATUS (status) > greatest_status)
greatest_status = WEXITSTATUS (status);
ret_code = -1;
@@ -2917,6 +2930,9 @@ See %s for instructions.",
}
}
+ if (commands[0].argv[0] != commands[0].prog)
+ free ((PTR) commands[0].argv[0]);
+
return ret_code;
}
}
@@ -5898,6 +5914,224 @@ give_switch (int switchnum, int omit_fir
switches[switchnum].validated = 1;
}
\f
+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
+#define RETRY_ICE_ATTEMPTS 2
+
+static void
+retry_ice (const char *prog, const char **argv)
+{
+ int nargs, out_arg = -1, quiet = 0, attempt;
+ int pid, retries, sleep_interval;
+ const char **new_argv;
+ char *temp_filenames[RETRY_ICE_ATTEMPTS * 2 + 2];
+
+ if (input_filename == NULL || ! strcmp (input_filename, "-"))
+ return;
+
+ for (nargs = 0; argv[nargs] != NULL; ++nargs)
+ /* Only retry compiler ICEs, not preprocessor ones. */
+ if (! strcmp (argv[nargs], "-E"))
+ return;
+ else if (argv[nargs][0] == '-' && argv[nargs][1] == 'o')
+ {
+ if (out_arg == -1)
+ out_arg = nargs;
+ else
+ return;
+ }
+ /* If the compiler is going to output any time information,
+ it might vary between invocations. */
+ else if (! strcmp (argv[nargs], "-quiet"))
+ quiet = 1;
+ else if (! strcmp (argv[nargs], "-ftime-report"))
+ return;
+
+ if (out_arg == -1 || !quiet)
+ return;
+
+ memset (temp_filenames, '\0', sizeof (temp_filenames));
+ new_argv = alloca ((nargs + 3) * sizeof (const char *));
+ memcpy (new_argv, argv, (nargs + 1) * sizeof (const char *));
+ new_argv[nargs++] = "-frandom-seed=0";
+ new_argv[nargs] = NULL;
+ if (new_argv[out_arg][2] == '\0')
+ new_argv[out_arg + 1] = "-";
+ else
+ new_argv[out_arg] = "-o-";
+
+ for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS + 1; ++attempt)
+ {
+ int fd = -1;
+ int status;
+
+ temp_filenames[attempt * 2] = make_temp_file (".out");
+ temp_filenames[attempt * 2 + 1] = make_temp_file (".err");
+
+ if (attempt == RETRY_ICE_ATTEMPTS)
+ {
+ int i;
+ int fd1, fd2;
+ struct stat st1, st2;
+ size_t n, len;
+ char *buf;
+
+ buf = xmalloc (8192);
+
+ for (i = 0; i < 2; ++i)
+ {
+ fd1 = open (temp_filenames[i], O_RDONLY);
+ fd2 = open (temp_filenames[2 + i], O_RDONLY);
+
+ if (fd1 < 0 || fd2 < 0)
+ {
+ i = -1;
+ close (fd1);
+ close (fd2);
+ break;
+ }
+
+ if (fstat (fd1, &st1) < 0 || fstat (fd2, &st2) < 0)
+ {
+ i = -1;
+ close (fd1);
+ close (fd2);
+ break;
+ }
+
+ if (st1.st_size != st2.st_size)
+ {
+ close (fd1);
+ close (fd2);
+ break;
+ }
+
+ len = 0;
+ for (n = st1.st_size; n; n -= len)
+ {
+ len = n;
+ if (len > 4096)
+ len = 4096;
+
+ if (read (fd1, buf, len) != (int) len
+ || read (fd2, buf + 4096, len) != (int) len)
+ {
+ i = -1;
+ break;
+ }
+
+ if (memcmp (buf, buf + 4096, len) != 0)
+ break;
+ }
+
+ close (fd1);
+ close (fd2);
+
+ if (n)
+ break;
+ }
+
+ free (buf);
+ if (i == -1)
+ break;
+
+ if (i != 2)
+ {
+ notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");
+ break;
+ }
+
+ fd = open (temp_filenames[attempt * 2], O_RDWR);
+ if (fd < 0)
+ break;
+ write (fd, "//", 2);
+ for (i = 0; i < nargs; i++)
+ {
+ write (fd, " ", 1);
+ write (fd, new_argv[i], strlen (new_argv[i]));
+ }
+ write (fd, "\n", 1);
+ new_argv[nargs] = "-E";
+ new_argv[nargs + 1] = NULL;
+ }
+
+ /* Fork a subprocess; wait and retry if it fails. */
+ sleep_interval = 1;
+ pid = -1;
+ for (retries = 0; retries < 4; retries++)
+ {
+ pid = fork ();
+ if (pid >= 0)
+ break;
+ sleep (sleep_interval);
+ sleep_interval *= 2;
+ }
+
+ if (pid < 0)
+ break;
+ else if (pid == 0)
+ {
+ if (attempt != RETRY_ICE_ATTEMPTS)
+ fd = open (temp_filenames[attempt * 2], O_RDWR);
+ if (fd < 0)
+ exit (-1);
+ if (fd != 1)
+ {
+ close (1);
+ dup (fd);
+ close (fd);
+ }
+
+ fd = open (temp_filenames[attempt * 2 + 1], O_RDWR);
+ if (fd < 0)
+ exit (-1);
+ if (fd != 2)
+ {
+ close (2);
+ dup (fd);
+ close (fd);
+ }
+
+ if (prog == new_argv[0])
+ execvp (prog, (char *const *) new_argv);
+ else
+ execv (new_argv[0], (char *const *) new_argv);
+ exit (-1);
+ }
+
+ if (waitpid (pid, &status, 0) < 0)
+ break;
+
+ if (attempt < RETRY_ICE_ATTEMPTS
+ && (! WIFEXITED (status) || WEXITSTATUS (status) != ICE_EXIT_CODE))
+ {
+ notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");
+ break;
+ }
+ else if (attempt == RETRY_ICE_ATTEMPTS)
+ {
+ close (fd);
+ if (WIFEXITED (status)
+ && WEXITSTATUS (status) == SUCCESS_EXIT_CODE)
+ {
+ notice ("Preprocessed source stored into %s file, please attach this to your bugreport.\n",
+ temp_filenames[attempt * 2]);
+ /* Make sure it is not deleted. */
+ free (temp_filenames[attempt * 2]);
+ temp_filenames[attempt * 2] = NULL;
+ break;
+ }
+ }
+ }
+
+ for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS * 2 + 2; attempt++)
+ if (temp_filenames[attempt])
+ {
+ unlink (temp_filenames[attempt]);
+ free (temp_filenames[attempt]);
+ }
+}
+#endif
+\f
/* Search for a file named NAME trying various prefixes including the
user's -B prefix and some standard ones.
Return the absolute file name found. If nothing is found, return NAME. */
--- gcc/diagnostic.c.jj 2003-10-01 12:09:21.000000000 +0200
+++ gcc/diagnostic.c 2004-01-21 11:54:47.000000000 +0100
@@ -237,7 +237,7 @@ diagnostic_action_after_output (diagnost
real_abort ();
fnotice (stderr, "compilation terminated.\n");
- exit (FATAL_EXIT_CODE);
+ exit (ICE_EXIT_CODE);
default:
gcc_unreachable ();
1.1 src/patchsets/gcc/4.2.2/gentoo/02_all_gcc4-ppc64-m32-m64-multilib-only.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/02_all_gcc4-ppc64-m32-m64-multilib-only.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/02_all_gcc4-ppc64-m32-m64-multilib-only.patch?rev=1.1&content-type=text/plain
Index: 02_all_gcc4-ppc64-m32-m64-multilib-only.patch
===================================================================
--- gcc/config/rs6000/t-linux64 2003-06-03 05:11:45.000000000 -0400
+++ gcc/config/rs6000/t-linux64 2003-06-11 17:07:16.000000000 -0400
@@ -4,13 +4,13 @@ LIB2FUNCS_EXTRA = tramp.S $(srcdir)/conf
# Modify the shared lib version file
SHLIB_MKMAP_OPTS = -v dotsyms=1
-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_OSDIRNAMES = ../lib64 ../lib nof
-MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
+MULTILIB_EXCEPTIONS =
+MULTILIB_EXCLUSIONS =
+MULTILIB_OSDIRNAMES = ../lib64 ../lib
+MULTILIB_MATCHES =
TARGET_LIBGCC2_CFLAGS = -mno-minimal-toc -fPIC
1.1 src/patchsets/gcc/4.2.2/gentoo/03_all_gcc4-java-nomulti.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/03_all_gcc4-java-nomulti.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/03_all_gcc4-java-nomulti.patch?rev=1.1&content-type=text/plain
Index: 03_all_gcc4-java-nomulti.patch
===================================================================
--- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200
+++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200
@@ -367,6 +367,10 @@ use_gtk_awt=""
TOOLKIT=
AC_SUBST(TOOLKIT)
+if test -n "${with_multisubdir}"; then
+ peerlibs=no
+fi
+
for peer in $peerlibs ; do
case $peer in
xlib)
--- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200
+++ libjava/configure 2004-08-21 11:45:16.260738060 +0200
@@ -4118,6 +4118,9 @@ use_gtk_awt=""
# The default toolkit to use is the first one specified.
TOOLKIT=
+if test -n "${with_multisubdir}"; then
+ peerlibs=no
+fi
for peer in $peerlibs ; do
case $peer in
1.1 src/patchsets/gcc/4.2.2/gentoo/06_all_gcc4-slow-pthread-self.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/06_all_gcc4-slow-pthread-self.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/06_all_gcc4-slow-pthread-self.patch?rev=1.1&content-type=text/plain
Index: 06_all_gcc4-slow-pthread-self.patch
===================================================================
2005-05-20 Jakub Jelinek <jakub@redhat.com>
* configure.host (slow_pthread_self): Set to empty unconditionally
on Linux targets.
--- libjava/configure.host 2005-03-15 18:05:24.000000000 +0100
+++ libjava/configure.host 2005-05-20 07:47:13.000000000 +0200
@@ -174,6 +174,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 <<EOF
1.1 src/patchsets/gcc/4.2.2/gentoo/08_all_gcc-4.1-cross-compile.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/08_all_gcc-4.1-cross-compile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/08_all_gcc-4.1-cross-compile.patch?rev=1.1&content-type=text/plain
Index: 08_all_gcc-4.1-cross-compile.patch
===================================================================
Some notes on the 'bootstrap with or without libc headers' debate:
http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
--- gcc/unwind-dw2.c
+++ gcc/unwind-dw2.c
@@ -253,9 +253,11 @@
}
#endif
+#ifndef inhibit_libc
#ifdef MD_UNWIND_SUPPORT
#include MD_UNWIND_SUPPORT
#endif
+#endif
\f
/* Extract any interesting information from the CIE for the translation
unit F belongs to. Return a pointer to the byte after the augmentation,
--- gcc/configure
+++ gcc/configure
@@ -12857,7 +12857,7 @@ then
| powerpc*-*-*,powerpc64*-*-*)
CROSS="$CROSS -DNATIVE_CROSS" ;;
esac
-elif test "x$TARGET_SYSTEM_ROOT" != x; then
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
SYSTEM_HEADER_DIR=$build_system_header_dir
fi
--- gcc/configure.ac
+++ gcc/configure.ac
@@ -1717,7 +1717,7 @@ then
| powerpc*-*-*,powerpc64*-*-*)
CROSS="$CROSS -DNATIVE_CROSS" ;;
esac
-elif test "x$TARGET_SYSTEM_ROOT" != x; then
+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
SYSTEM_HEADER_DIR=$build_system_header_dir
fi
1.1 src/patchsets/gcc/4.2.2/gentoo/10_all_gcc4-libltdl-multilib.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/10_all_gcc4-libltdl-multilib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/10_all_gcc4-libltdl-multilib.patch?rev=1.1&content-type=text/plain
Index: 10_all_gcc4-libltdl-multilib.patch
===================================================================
2005-06-17 Jakub Jelinek <jakub@redhat.com>
* acinclude.m4 (AC_LIBTOOL_SYS_DYNAMIC_LINKER): Set
sys_lib_dlsearch_path_spec on bi-arch linux architectures
for 64-bit builds.
* configure: Rebuilt.
--- libjava/libltdl/acinclude.m4.jj 2005-03-11 14:02:06.000000000 +0100
+++ libjava/libltdl/acinclude.m4 2005-06-17 14:37:06.000000000 +0200
@@ -1434,6 +1434,24 @@ linux*)
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
dynamic_linker='GNU/Linux ld.so'
+
+ # Find out which ABI we are using.
+ case "$host_cpu" in
+ x86_64*|s390*|sparc*|ppc*|powerpc*)
+ AC_LANG_PUSH(C)
+ lt_linux_biarch_save_CC="$CC"
+ CC="${LTCC-$CC}"
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case "`/usr/bin/file conftest.o`" in
+ *64-bit*) sys_lib_dlsearch_path_spec="/lib64 /usr/lib64";;
+ esac
+ fi
+ rm -rf conftest*
+ CC="$lt_linux_biarch_save_CC"
+ AC_LANG_POP
+ ;;
+ esac
;;
netbsd*)
--- libjava/libltdl/configure.jj 2005-03-11 14:02:07.000000000 +0100
+++ libjava/libltdl/configure 2005-06-17 14:37:11.000000000 +0200
@@ -8421,6 +8421,38 @@ linux*)
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
dynamic_linker='GNU/Linux ld.so'
+
+ # Find out which ABI we are using.
+ case "$host_cpu" in
+ x86_64*|s390*|sparc*|ppc*|powerpc*)
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ lt_linux_biarch_save_CC="$CC"
+ CC="${LTCC-$CC}"
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case "`/usr/bin/file conftest.o`" in
+ *64-bit*) sys_lib_dlsearch_path_spec="/lib64 /usr/lib64";;
+ esac
+ fi
+ rm -rf conftest*
+ CC="$lt_linux_biarch_save_CC"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ ;;
+ esac
;;
netbsd*)
@@ -12071,6 +12103,38 @@ linux*)
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
dynamic_linker='GNU/Linux ld.so'
+
+ # Find out which ABI we are using.
+ case "$host_cpu" in
+ x86_64*|s390*|sparc*|ppc*|powerpc*)
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ lt_linux_biarch_save_CC="$CC"
+ CC="${LTCC-$CC}"
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case "`/usr/bin/file conftest.o`" in
+ *64-bit*) sys_lib_dlsearch_path_spec="/lib64 /usr/lib64";;
+ esac
+ fi
+ rm -rf conftest*
+ CC="$lt_linux_biarch_save_CC"
+ ac_ext=cc
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ ;;
+ esac
;;
netbsd*)
@@ -15156,6 +15220,37 @@ linux*)
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
dynamic_linker='GNU/Linux ld.so'
+
+ # Find out which ABI we are using.
+ case "$host_cpu" in
+ x86_64*|s390*|sparc*|ppc*|powerpc*)
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ lt_linux_biarch_save_CC="$CC"
+ CC="${LTCC-$CC}"
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case "`/usr/bin/file conftest.o`" in
+ *64-bit*) sys_lib_dlsearch_path_spec="/lib64 /usr/lib64";;
+ esac
+ fi
+ rm -rf conftest*
+ CC="$lt_linux_biarch_save_CC"
+ ac_ext=f
+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+
+ ;;
+ esac
;;
netbsd*)
@@ -17441,6 +17536,38 @@ linux*)
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
dynamic_linker='GNU/Linux ld.so'
+
+ # Find out which ABI we are using.
+ case "$host_cpu" in
+ x86_64*|s390*|sparc*|ppc*|powerpc*)
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ lt_linux_biarch_save_CC="$CC"
+ CC="${LTCC-$CC}"
+ echo 'int i;' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case "`/usr/bin/file conftest.o`" in
+ *64-bit*) sys_lib_dlsearch_path_spec="/lib64 /usr/lib64";;
+ esac
+ fi
+ rm -rf conftest*
+ CC="$lt_linux_biarch_save_CC"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ ;;
+ esac
;;
netbsd*)
1.1 src/patchsets/gcc/4.2.2/gentoo/11_all_gcc-netbsd-symbolic.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/11_all_gcc-netbsd-symbolic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/11_all_gcc-netbsd-symbolic.patch?rev=1.1&content-type=text/plain
Index: 11_all_gcc-netbsd-symbolic.patch
===================================================================
http://bugs.gentoo.org/122698
--- gcc/config/netbsd-elf.h
+++ gcc/config/netbsd-elf.h
@@ -83,6 +83,7 @@
#define NETBSD_LINK_SPEC_ELF \
"%{assert*} %{R*} %{rpath*} \
%{shared:-shared} \
+ %{symbolic:-Bsymbolic} \
%{!shared: \
-dc -dp \
%{!nostdlib: \
1.1 src/patchsets/gcc/4.2.2/gentoo/14_all_gcc-sparc64-bsd.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/14_all_gcc-sparc64-bsd.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/14_all_gcc-sparc64-bsd.patch?rev=1.1&content-type=text/plain
Index: 14_all_gcc-sparc64-bsd.patch
===================================================================
diff -ur a/gcc/config/sparc/freebsd.h b/gcc/config/sparc/freebsd.h
--- a/gcc/config/sparc/freebsd.h 2006-02-02 19:55:09 +0000
+++ b/gcc/config/sparc/freebsd.h 2007-09-06 23:55:21 +0100
@@ -26,9 +26,22 @@
/* FreeBSD needs the platform name (sparc64) defined.
Emacs needs to know if the arch is 64 or 32-bits. */
-#undef CPP_CPU64_DEFAULT_SPEC
-#define CPP_CPU64_DEFAULT_SPEC \
- "-D__sparc64__ -D__sparc_v9__ -D__sparcv9 -D__arch64__"
+#undef FBSD_TARGET_CPU_CPP_BUILTINS
+#define FBSD_TARGET_CPU_CPP_BUILTINS() \
+ do \
+ { \
+ if (TARGET_ARCH64) \
+ { \
+ builtin_define ("__sparc64__"); \
+ builtin_define ("__sparc_v9__"); \
+ builtin_define ("__sparcv9"); \
+ } \
+ else \
+ builtin_define ("__sparc"); \
+ builtin_define ("__sparc__"); \
+ } \
+ while (0)
+
#define LINK_SPEC "%(link_arch) \
%{!mno-relax:%{!r:-relax}} \
1.1 src/patchsets/gcc/4.2.2/gentoo/18_all_904-flatten-switch-stmt-00.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/18_all_904-flatten-switch-stmt-00.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/18_all_904-flatten-switch-stmt-00.patch?rev=1.1&content-type=text/plain
Index: 18_all_904-flatten-switch-stmt-00.patch
===================================================================
http://gcc.gnu.org/ml/gcc-patches/2007-04/msg00927.html
Hi,
The attached patch makes sure that we create smaller object code for
simple switch statements. We just make sure to flatten the switch
statement into an if-else chain, basically.
This fixes a size-regression as compared to gcc-3.4, as can be seen
below.
2007-04-15 Bernhard Fischer <..>
* stmt.c (expand_case): Do not create a complex binary tree when
optimizing for size but rather use the simple ordered list.
(emit_case_nodes): do not emit jumps to the default_label when
optimizing for size.
Not regtested so far.
Comments?
Attached is the test switch.c mentioned below.
$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done
$ size switch-*.o
text data bss dec hex filename
169 0 0 169 a9 switch-2.95.o
115 0 0 115 73 switch-3.3.o
103 0 0 103 67 switch-3.4.o
124 0 0 124 7c switch-4.0.o
124 0 0 124 7c switch-4.1.o
124 0 0 124 7c switch-4.2.orig-HEAD.o
95 0 0 95 5f switch-4.3-HEAD.o
124 0 0 124 7c switch-4.3.orig-HEAD.o
166 0 0 166 a6 switch-CHAIN-2.95.o
111 0 0 111 6f switch-CHAIN-3.3.o
95 0 0 95 5f switch-CHAIN-3.4.o
95 0 0 95 5f switch-CHAIN-4.0.o
95 0 0 95 5f switch-CHAIN-4.1.o
95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o
95 0 0 95 5f switch-CHAIN-4.3-HEAD.o
95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
Index: gcc-4.2.0/gcc/stmt.c
===================================================================
--- gcc-4.2.0.orig/gcc/stmt.c (revision 123843)
+++ gcc-4.2.0/gcc/stmt.c (working copy)
@@ -2517,7 +2517,11 @@ expand_case (tree exp)
use_cost_table
= (TREE_CODE (orig_type) != ENUMERAL_TYPE
&& estimate_case_costs (case_list));
- balance_case_nodes (&case_list, NULL);
+ /* When optimizing for size, we want a straight list to avoid
+ jumps as much as possible. This basically creates an if-else
+ chain. */
+ if (!optimize_size)
+ balance_case_nodes (&case_list, NULL);
emit_case_nodes (index, case_list, default_label, index_type);
emit_jump (default_label);
}
@@ -3075,6 +3079,7 @@ emit_case_nodes (rtx index, case_node_pt
{
if (!node_has_low_bound (node, index_type))
{
+ if (!optimize_size) /* don't jl to the .default_label. */
emit_cmp_and_jump_insns (index,
convert_modes
(mode, imode,
Content-Type: text/x-csrc; charset=us-ascii
Content-Disposition: attachment; filename="switch.c"
int
commutative_tree_code (int code)
{
#define CASE(val, ret) case val:/* __asm__("# val="#val ",ret="#ret);*/ return ret;
#ifndef CHAIN
switch (code)
{
# if 1
CASE(1,3)
CASE(3,2)
CASE(5,8)
CASE(7,1)
CASE(33,4)
CASE(44,9)
CASE(55,10)
CASE(66,-1)
CASE(77,99)
CASE(666,0)
# else
case 1:
return 3;
case 3:
return 2;
case 5:
return 8;
case 7:
return 1;
case 33:
return 4;
case 44:
return 9;
case 55:
return 10;
case 66:
return -1;
case 77:
return 99;
case 666:
return 0;
# endif
default:
break;
}
return 4711;
#else
if (code == 1)
return 3;
else if (code == 3)
return 2;
else if (code == 5)
return 8;
else if (code == 7)
return 1;
else if (code == 33)
return 4;
else if (code == 44)
return 9;
else if (code == 55)
return 10;
else if (code == 66)
return -1;
else if (code == 77)
return 99;
else if (code == 666)
return 0;
else
return 4711;
#endif
}
--AhhlLboLdkugWU4S--
1.1 src/patchsets/gcc/4.2.2/gentoo/20_all_cris-dont-force-limits-header.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/20_all_cris-dont-force-limits-header.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/20_all_cris-dont-force-limits-header.patch?rev=1.1&content-type=text/plain
Index: 20_all_cris-dont-force-limits-header.patch
===================================================================
Remove assumption since it breaks building --without-headers
--- gcc-4_1-branch/gcc/config/cris/t-linux
+++ gcc-4_1-branch/gcc/config/cris/t-linux
@@ -1,6 +1,2 @@
TARGET_LIBGCC2_CFLAGS += -fPIC
CRTSTUFF_T_CFLAGS_S = $(TARGET_LIBGCC2_CFLAGS)
-
-# We *know* we have a limits.h in the glibc library, with extra
-# definitions needed for e.g. libgfortran.
-LIMITS_H_TEST = :
1.1 src/patchsets/gcc/4.2.2/gentoo/34_all_arm-bigendian.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/34_all_arm-bigendian.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/34_all_arm-bigendian.patch?rev=1.1&content-type=text/plain
Index: 34_all_arm-bigendian.patch
===================================================================
By Lennert Buytenhek <buytenh@wantstofly.org>
Adds support for arm*b-linux* big-endian ARM targets
See http://gcc.gnu.org/PR16350
--- gcc-4.2.0/gcc/config/arm/linux-elf.h
+++ gcc-4.2.0/gcc/config/arm/linux-elf.h
@@ -28,19 +28,33 @@
#undef TARGET_VERSION
#define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr);
+/*
+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
+ * (big endian) configurations.
+ */
+#if TARGET_BIG_ENDIAN_DEFAULT
+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
+#define TARGET_ENDIAN_OPTION "mbig-endian"
+#define TARGET_LINKER_EMULATION "armelfb_linux"
+#else
+#define TARGET_ENDIAN_DEFAULT 0
+#define TARGET_ENDIAN_OPTION "mlittle-endian"
+#define TARGET_LINKER_EMULATION "armelf_linux"
+#endif
+
#undef TARGET_DEFAULT_FLOAT_ABI
#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
#undef TARGET_DEFAULT
-#define TARGET_DEFAULT (0)
+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
#undef MULTILIB_DEFAULTS
#define MULTILIB_DEFAULTS \
- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
/* Now we define the strings used to build the spec file. */
#undef LIB_SPEC
@@ -61,7 +75,7 @@
%{rdynamic:-export-dynamic} \
%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \
-X \
- %{mbig-endian:-EB}" \
+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
SUBTARGET_EXTRA_LINK_SPEC
#undef LINK_SPEC
--- gcc-4.2.0/gcc/config.gcc
+++ gcc-4.2.0/gcc/config.gcc
@@ -703,6 +703,11 @@
;;
arm*-*-linux*) # ARM GNU/Linux with ELF
tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
+ case $target in
+ arm*b-*)
+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
+ ;;
+ esac
tmake_file="${tmake_file} t-linux arm/t-arm"
case ${target} in
arm*-*-linux-*eabi)
--- gcc-4.2.0/gcc/config/arm/linux-eabi.h
+++ gcc-4.2.0/gcc/config/arm/linux-eabi.h
@@ -20,6 +20,17 @@
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */
+/*
+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
+ * (big endian) configurations.
+ */
+#undef TARGET_LINKER_EMULATION
+#if TARGET_BIG_ENDIAN_DEFAULT
+#define TARGET_LINKER_EMULATION "armelfb_linux_eabi"
+#else
+#define TARGET_LINKER_EMULATION "armelf_linux_eabi"
+#endif
+
/* On EABI GNU/Linux, we want both the BPABI builtins and the
GNU/Linux builtins. */
#undef TARGET_OS_CPP_BUILTINS
@@ -48,7 +59,7 @@
#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
#undef SUBTARGET_EXTRA_LINK_SPEC
-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
+#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. */
--- gcc-4.2.0/gcc/config/arm/bpabi.h
+++ gcc-4.2.0/gcc/config/arm/bpabi.h
@@ -33,9 +33,19 @@
#undef FPUTYPE_DEFAULT
#define FPUTYPE_DEFAULT FPUTYPE_VFP
+/*
+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
+ * (big endian) configurations.
+ */
+#if TARGET_BIG_ENDIAN_DEFAULT
+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
+#else
+#define TARGET_ENDIAN_DEFAULT 0
+#endif
+
/* EABI targets should enable interworking by default. */
#undef TARGET_DEFAULT
-#define TARGET_DEFAULT MASK_INTERWORK
+#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT)
/* The ARM BPABI functions return a boolean; they use no special
calling convention. */
1.1 src/patchsets/gcc/4.2.2/gentoo/35_all_gcc-arm-pragma-pack.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/35_all_gcc-arm-pragma-pack.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/35_all_gcc-arm-pragma-pack.patch?rev=1.1&content-type=text/plain
Index: 35_all_gcc-arm-pragma-pack.patch
===================================================================
http://gcc.gnu.org/ml/gcc-patches/2006-10/msg01115.html
From: Paul Brook <paul@codesourcery.com>
Sender: gcc-patches-owner@gcc.gnu.org
To: gcc-patches@gcc.gnu.org
Subject: [patch] #pragma pack vs. STRUCTURE_SIZE_BOUNDARY
Date: Sun, 22 Oct 2006 16:32:31 +0100
Currently STRUCTURE_SIZE_BOUNDARY is obeyed even when
#pragma pack(1) is in effect. By contrast __attribute__((packed)) overrides
STRUCTURE_SIZE_BOUNDARY.
This matters when odd sized packed structs are nested inside each other.
Given the purpose of #pragma pack is for compatibility with Win32, I think
#pragma pack(1) act the same as __attribute__((packed)).
The patch below fixes this.
Tested with cross to arm-none-eabi.
Ok?
Paul
2006-10-22 Paul Brook <paul@codesourcery.com>
gcc/
* stor-layout.c (start_record_layout): maximum_field_alignment
overrides STRUCTURE_SIZE_BOUNDARY.
gcc/testsuite/
* gcc.dg/pragma-pack-4.c: New test.
Index: gcc/stor-layout.c
===================================================================
--- gcc/stor-layout.c (revision 117906)
+++ gcc/stor-layout.c (working copy)
@@ -525,7 +525,15 @@ start_record_layout (tree t)
#ifdef STRUCTURE_SIZE_BOUNDARY
/* Packed structures don't need to have minimum size. */
if (! TYPE_PACKED (t))
- rli->record_align = MAX (rli->record_align, (unsigned) STRUCTURE_SIZE_BOUNDARY);
+ {
+ unsigned tmp;
+
+ /* #pragma pack overrides STRUCTURE_SIZE_BOUNDARY. */
+ tmp = (unsigned) STRUCTURE_SIZE_BOUNDARY;
+ if (maximum_field_alignment != 0)
+ tmp = MIN (tmp, maximum_field_alignment);
+ rli->record_align = MAX (rli->record_align, tmp);
+ }
#endif
rli->offset = size_zero_node;
Index: gcc/testsuite/gcc.dg/pragma-pack-4.c
===================================================================
--- gcc/testsuite/gcc.dg/pragma-pack-4.c (revision 0)
+++ gcc/testsuite/gcc.dg/pragma-pack-4.c (revision 0)
@@ -0,0 +1,10 @@
+/* Check that pragma pack overrides STRUCTURE_SIZE_BOUNDARY. */
+/* { dg-do compile } */
+
+#pragma pack(1)
+struct S
+{
+ char a;
+};
+
+int test[sizeof(struct S) == 1 ? 1: -1];
1.1 src/patchsets/gcc/4.2.2/gentoo/36_all_gcc-arm-pr30486.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/36_all_gcc-arm-pr30486.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/36_all_gcc-arm-pr30486.patch?rev=1.1&content-type=text/plain
Index: 36_all_gcc-arm-pr30486.patch
===================================================================
http://bugs.gentoo.org/194975
http://gcc.gnu.org/PR30486
--- trunk/gcc/fortran/trans-types.c
+++ trunk/gcc/fortran/trans-types.c
@@ -1800,6 +1800,13 @@ gfc_type_for_size (unsigned bits, int un
if (type && bits == TYPE_PRECISION (type))
return type;
}
+
+ /* Handle TImode as a special case because it is used by some backends
+ (eg. ARM) even though it is not available for normal use. */
+#if HOST_BITS_PER_WIDE_INT >= 64
+ if (bits == TYPE_PRECISION (intTI_type_node))
+ return intTI_type_node;
+#endif
}
else
{
1.1 src/patchsets/gcc/4.2.2/gentoo/51_all_gcc-3.4-libiberty-pic.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/51_all_gcc-3.4-libiberty-pic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/51_all_gcc-3.4-libiberty-pic.patch?rev=1.1&content-type=text/plain
Index: 51_all_gcc-3.4-libiberty-pic.patch
===================================================================
--- gcc-4.1.0-orig/libiberty/Makefile.in 2006-03-01 15:49:14.000000000 -0500
+++ gcc-4.1.0/libiberty/Makefile.in 2006-03-01 18:10:46.000000000 -0500
@@ -232,6 +232,7 @@
$(AR) $(AR_FLAGS) $(TARGETLIB) \
$(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
$(RANLIB) $(TARGETLIB); \
+ cp $(TARGETLIB) ../ ; \
cd ..; \
else true; fi
1.1 src/patchsets/gcc/4.2.2/gentoo/53_all_gcc4-superh-default-multilib.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/53_all_gcc4-superh-default-multilib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/53_all_gcc4-superh-default-multilib.patch?rev=1.1&content-type=text/plain
Index: 53_all_gcc4-superh-default-multilib.patch
===================================================================
The gcc-3.x toolchains would contain all the targets by default. With gcc-4,
you have to actually list out the multilibs you want or you will end up with
just one when using targets like 'sh4-linux-gnu'.
The resulting toolchain can't even build a kernel as the kernel needs to build
with the nofpu flag to be sure that no fpu ops are generated.
Here we restore the gcc-3.x behavior; the additional overhead of building all
of these multilibs by default is negligible.
http://bugs.gentoo.org/140205
--- gcc-4.2.0/gcc/config.gcc
+++ gcc-4.2.0/gcc/config.gcc
@@ -2092,7 +2092,7 @@
if test x${sh_multilibs} = x ; then
case ${target} in
sh64-superh-linux* | \
- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
+ sh[1234]*) sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
sh64* | sh5*) sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;;
sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;;
sh*-*-linux*) sh_multilibs=m1,m3e,m4 ;;
1.1 src/patchsets/gcc/4.2.2/gentoo/54_all_300-libstdc++-pic.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/54_all_300-libstdc++-pic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/54_all_300-libstdc++-pic.patch?rev=1.1&content-type=text/plain
Index: 54_all_300-libstdc++-pic.patch
===================================================================
install libstdc++_pic.a if we have pic objs
--- gcc/libstdc++-v3/src/Makefile.am
+++ gcc/libstdc++-v3/src/Makefile.am
@@ -214,6 +214,13 @@
$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+install-exec-local:
+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
+ if [ x"$$pic_objs" != x ]; then \
+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
+ fi
+
# Added bits to build debug library.
if GLIBCXX_BUILD_DEBUG
all-local: build_debug
--- gcc/libstdc++-v3/src/Makefile.in
+++ gcc/libstdc++-v3/src/Makefile.in
@@ -625,7 +625,7 @@
install-data-am: install-data-local
-install-exec-am: install-toolexeclibLTLIBRARIES
+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
install-info: install-info-am
@@ -664,7 +664,7 @@
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-info-am \
- uninstall-toolexeclibLTLIBRARIES
+ uninstall-toolexeclibLTLIBRARIES install-exec-local
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@libstdc++-symbol.ver: ${glibcxx_srcdir}/$(SYMVER_MAP)
@GLIBCXX_BUILD_VERSIONED_SHLIB_TRUE@ cp ${glibcxx_srcdir}/$(SYMVER_MAP) ./libstdc++-symbol.ver
@@ -743,6 +743,14 @@
install_debug:
(cd ${debugdir} && $(MAKE) \
toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
+
+install-exec-local:
+ pic_objs=`sed -n "s:'::g;s:^pic_object=::p" *.lo | grep -v '^none$$'`; \
+ if [ x"$$pic_objs" != x ]; then \
+ $(AR) cru libstdc++_pic.a $$pic_objs $(top_builddir)/libsupc++/*.o || exit 1; \
+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) || exit 1; \
+ fi
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
1.1 src/patchsets/gcc/4.2.2/gentoo/61_all_gcc4-ia64-noteGNUstack.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/61_all_gcc4-ia64-noteGNUstack.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/61_all_gcc4-ia64-noteGNUstack.patch?rev=1.1&content-type=text/plain
Index: 61_all_gcc4-ia64-noteGNUstack.patch
===================================================================
2004-09-20 Jakub Jelinek <jakub@redhat.com>
* config/rs6000/ppc-asm.h: Add .note.GNU-stack section also
on ppc64-linux.
* config/ia64/lib1funcs.asm: Add .note.GNU-stack section on
ia64-linux.
* config/ia64/crtbegin.asm: Likewise.
* config/ia64/crtend.asm: Likewise.
* config/ia64/crti.asm: Likewise.
* config/ia64/crtn.asm: Likewise.
2004-05-14 Jakub Jelinek <jakub@redhat.com>
* config/ia64/linux.h (TARGET_ASM_FILE_END): Define.
--- gcc/config/ia64/linux.h.jj 2004-05-14 07:21:27.000000000 -0400
+++ gcc/config/ia64/linux.h 2004-05-14 09:21:09.000000000 -0400
@@ -5,6 +5,8 @@
#define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
+#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+
/* This is for -profile to use -lc_p instead of -lc. */
#undef CC1_SPEC
#define CC1_SPEC "%{profile:-p} %{G*}"
--- gcc/config/rs6000/ppc-asm.h.jj 2003-06-04 18:40:59.000000000 +0200
+++ gcc/config/rs6000/ppc-asm.h 2004-09-20 14:17:47.259396058 +0200
@@ -158,7 +158,7 @@ GLUE(.L,name): \
.size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
#endif
-#if defined __linux__ && !defined __powerpc64__
+#if defined __linux__
.section .note.GNU-stack
.previous
#endif
--- gcc/config/ia64/lib1funcs.asm.jj 2003-10-27 11:45:17.000000000 +0100
+++ gcc/config/ia64/lib1funcs.asm 2004-09-20 14:26:28.094132706 +0200
@@ -741,3 +741,7 @@ __floattitf:
.endp __floattitf
#endif
+
+#ifdef __linux__
+.section .note.GNU-stack; .previous
+#endif
--- gcc/config/ia64/crtend.asm.jj 2004-05-20 14:36:14.000000000 +0200
+++ gcc/config/ia64/crtend.asm 2004-09-20 14:25:57.329580329 +0200
@@ -113,3 +113,7 @@ __do_global_ctors_aux:
br.ret.sptk.many rp
.endp __do_global_ctors_aux
+
+#ifdef __linux__
+.section .note.GNU-stack; .previous
+#endif
--- gcc/config/ia64/crti.asm.jj 2003-04-02 17:14:15.000000000 +0200
+++ gcc/config/ia64/crti.asm 2004-09-20 14:26:06.852894092 +0200
@@ -64,3 +64,7 @@ _fini:
.body
# end of crti.asm
+
+#ifdef __linux__
+.section .note.GNU-stack; .previous
+#endif
--- gcc/config/ia64/crtbegin.asm.jj 2004-05-20 14:36:14.000000000 +0200
+++ gcc/config/ia64/crtbegin.asm 2004-09-20 14:25:47.105390566 +0200
@@ -246,3 +246,7 @@ __do_jv_register_classes:
.weak __cxa_finalize
#endif
.weak _Jv_RegisterClasses
+
+#ifdef __linux__
+.section .note.GNU-stack; .previous
+#endif
--- gcc/config/ia64/crtn.asm.jj 2003-04-02 17:14:15.000000000 +0200
+++ gcc/config/ia64/crtn.asm 2004-09-20 14:26:16.381206878 +0200
@@ -54,3 +54,7 @@
br.ret.sptk.many b0
# end of crtn.asm
+
+#ifdef __linux__
+.section .note.GNU-stack; .previous
+#endif
1.1 src/patchsets/gcc/4.2.2/gentoo/62_all_gcc4-noteGNUstack.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/62_all_gcc4-noteGNUstack.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/62_all_gcc4-noteGNUstack.patch?rev=1.1&content-type=text/plain
Index: 62_all_gcc4-noteGNUstack.patch
===================================================================
2005-02-08 Jakub Jelinek <jakub@redhat.com>
* src/alpha/osf.S: Add .note.GNU-stack on Linux.
* src/s390/sysv.S: Likewise.
* src/powerpc/linux64.S: Likewise.
* src/powerpc/linux64_closure.S: Likewise.
* src/powerpc/ppc_closure.S: Likewise.
* src/powerpc/sysv.S: Likewise.
* src/x86/unix64.S: Likewise.
* src/x86/sysv.S: Likewise.
* src/sparc/v8.S: Likewise.
* src/sparc/v9.S: Likewise.
* src/m68k/sysv.S: Likewise.
* src/ia64/unix.S: Likewise.
* src/arm/sysv.S: Likewise.
* ia64_save_regs_in_stack.s: Moved to...
* ia64_save_regs_in_stack.S: ... this. Add .note.GNU-stack
on Linux.
--- libffi/src/alpha/osf.S.jj 2003-10-23 09:55:21.000000000 +0200
+++ libffi/src/alpha/osf.S 2005-02-08 16:12:40.215425842 +0100
@@ -352,4 +352,8 @@ $LASFDE3:
.byte 0x12 # uleb128 0x12
.align 3
$LEFDE3:
+
+#ifdef __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
#endif
--- libffi/src/s390/sysv.S.jj 2003-10-23 09:55:21.000000000 +0200
+++ libffi/src/s390/sysv.S 2005-02-08 16:22:30.810943388 +0100
@@ -427,3 +427,6 @@ ffi_closure_SYSV:
#endif
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/powerpc/linux64.S.jj 2004-09-03 12:35:54.000000000 +0200
+++ libffi/src/powerpc/linux64.S 2005-02-08 16:18:41.998808639 +0100
@@ -174,3 +174,7 @@ ffi_call_LINUX64:
.align 3
.LEFDE1:
#endif
+
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/powerpc/linux64_closure.S.jj 2004-09-03 12:35:54.000000000 +0200
+++ libffi/src/powerpc/linux64_closure.S 2005-02-08 16:18:53.821697060 +0100
@@ -203,3 +203,7 @@ ffi_closure_LINUX64:
.align 3
.LEFDE1:
#endif
+
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/powerpc/ppc_closure.S.jj 2004-09-03 12:35:54.000000000 +0200
+++ libffi/src/powerpc/ppc_closure.S 2005-02-08 16:18:25.734713428 +0100
@@ -248,3 +248,7 @@ END(ffi_closure_SYSV)
.LEFDE1:
#endif
+
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/powerpc/sysv.S.jj 2004-09-03 12:35:54.000000000 +0200
+++ libffi/src/powerpc/sysv.S 2005-02-08 16:18:13.673867518 +0100
@@ -187,3 +187,7 @@ END(ffi_call_SYSV)
.align 2
.LEFDE1:
#endif
+
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/x86/unix64.S.jj 2004-12-27 13:01:37.000000000 +0100
+++ libffi/src/x86/unix64.S 2005-02-08 16:25:38.656395947 +0100
@@ -373,3 +373,7 @@ ffi_closure_unix64:
.LEFDE3:
#endif /* __x86_64__ */
+
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/x86/sysv.S.jj 2003-10-23 09:55:21.000000000 +0200
+++ libffi/src/x86/sysv.S 2005-02-08 16:25:28.197263821 +0100
@@ -182,3 +182,7 @@ epilogue:
.LEFDE1:
#endif /* ifndef __x86_64__ */
+
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/sparc/v8.S.jj 2004-11-24 22:02:00.000000000 +0100
+++ libffi/src/sparc/v8.S 2005-02-08 16:22:55.220583988 +0100
@@ -265,3 +265,7 @@ done2:
.byte 0x1f ! uleb128 0x1f
.align WS
.LLEFDE2:
+
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/sparc/v9.S.jj 2004-01-26 11:34:57.000000000 +0100
+++ libffi/src/sparc/v9.S 2005-02-08 16:25:12.153129117 +0100
@@ -300,3 +300,7 @@ longdouble1:
.align 8
.LLEFDE2:
#endif
+
+#ifdef __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/m68k/sysv.S.jj 2003-10-23 09:55:21.000000000 +0200
+++ libffi/src/m68k/sysv.S 2005-02-08 16:16:18.341466343 +0100
@@ -95,3 +95,7 @@ epilogue:
unlk %a6
rts
.size ffi_call_SYSV,.-ffi_call_SYSV
+
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/ia64/unix.S.jj 2005-01-04 15:42:01.000000000 +0100
+++ libffi/src/ia64/unix.S 2005-02-08 16:16:01.253518356 +0100
@@ -572,3 +572,7 @@ ffi_closure_unix:
data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT
data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE
data8 @pcrel(.Lld_hfa_ldouble) // FFI_IA64_TYPE_HFA_LDOUBLE
+
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- libffi/src/arm/sysv.S.jj 2004-10-28 15:10:11.000000000 +0200
+++ libffi/src/arm/sysv.S 2005-02-08 16:14:02.282767581 +0100
@@ -207,3 +207,6 @@ LSYM(Lepilogue):
.ffi_call_SYSV_end:
.size CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
+#if defined __ELF__ && defined __linux__
+ .section .note.GNU-stack,"",%progbits
+#endif
--- boehm-gc/ia64_save_regs_in_stack.S.jj 2005-02-08 16:32:57.368040486 +0100
+++ boehm-gc/ia64_save_regs_in_stack.S 2005-02-08 16:33:36.243096641 +0100
@@ -0,0 +1,15 @@
+ .text
+ .align 16
+ .global GC_save_regs_in_stack
+ .proc GC_save_regs_in_stack
+GC_save_regs_in_stack:
+ .bodyfoo.mpg
+ flushrs
+ ;;
+ mov r8=ar.bsp
+ br.ret.sptk.few rp
+ .endp GC_save_regs_in_stack
+
+#ifdef __linux__
+ .section .note.GNU-stack,"",@progbits
+#endif
--- boehm-gc/ia64_save_regs_in_stack.s.jj 2004-06-30 09:32:52.000000000 +0200
+++ boehm-gc/ia64_save_regs_in_stack.s 2005-02-08 16:32:51.555078799 +0100
@@ -1,12 +0,0 @@
- .text
- .align 16
- .global GC_save_regs_in_stack
- .proc GC_save_regs_in_stack
-GC_save_regs_in_stack:
- .body
- flushrs
- ;;
- mov r8=ar.bsp
- br.ret.sptk.few rp
- .endp GC_save_regs_in_stack
-
1.1 src/patchsets/gcc/4.2.2/gentoo/74_all_sh-pr24836.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/74_all_sh-pr24836.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/74_all_sh-pr24836.patch?rev=1.1&content-type=text/plain
Index: 74_all_sh-pr24836.patch
===================================================================
http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836
--- gcc/gcc/configure.ac (revision 106699)
+++ gcc/gcc/configure.ac (working copy)
@@ -2446,7 +2446,7 @@
tls_first_minor=14
tls_as_opt="-m64 -Aesame --fatal-warnings"
;;
- sh-*-* | sh[34]-*-*)
+ sh-*-* | sh[34]*-*-*)
conftest_s='
.section ".tdata","awT",@progbits
foo: .long 25
--- gcc/gcc/configure
+++ gcc/gcc/configure
@@ -14846,7 +14846,7 @@
tls_first_minor=14
tls_as_opt="-m64 -Aesame --fatal-warnings"
;;
- sh-*-* | sh[34]-*-*)
+ sh-*-* | sh[34]*-*-*)
conftest_s='
.section ".tdata","awT",@progbits
foo: .long 25
1.1 src/patchsets/gcc/4.2.2/gentoo/85_all_gcc-ca-translation-typo.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/85_all_gcc-ca-translation-typo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/85_all_gcc-ca-translation-typo.patch?rev=1.1&content-type=text/plain
Index: 85_all_gcc-ca-translation-typo.patch
===================================================================
http://bugs.gentoo.org/127190
2006-03-28 Harald van Dijk <truedfx@gentoo.org>
* ca.po: Fix printf flag typo in negative value translation.
--- gcc-4_1-branch/gcc/po/ca.po
+++ gcc-4_1-branch/gcc/po/ca.po
@@ -31083,7 +31083,7 @@ msgstr "s'ignora l'atribut \"%s\""
#~ msgstr "passant el valor negatiu `%E' per a %s %P de \"%D\""
#~ msgid "%s of negative value `%E' to `%T'"
-#~ msgstr "%s de valor negatiu `%I' a \"%T\""
+#~ msgstr "%s de valor negatiu `%E' a \"%T\""
#~ msgid "initializing array with parameter list"
#~ msgstr "inicialitzant una matriu amb una llista de paràmetres"
1.1 src/patchsets/gcc/4.2.2/gentoo/90_all_mips-add-march-r10k.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/90_all_mips-add-march-r10k.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/90_all_mips-add-march-r10k.patch?rev=1.1&content-type=text/plain
Index: 90_all_mips-add-march-r10k.patch
===================================================================
--- gcc-4.2.0/gcc/config/mips/10000.md
+++ gcc-4.2.0/gcc/config/mips/10000.md
@@ -0,0 +1,248 @@
+;; VR1x000 pipeline description.
+;; Copyright (C) 2005, 2006 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.
+
+
+;; This file overrides parts of generic.md. It is derived from the
+;; old define_function_unit description.
+
+
+
+;; R12K/R14K/R16K are derivatives of R10K, thus copy its description
+;; until specific tuning for each is added
+
+
+;; R10000 has int queue, fp queue, address queue
+(define_automaton "r10k_int, r10k_fp, r10k_addr")
+
+;; R10000 has 2 integer ALUs, fp-adder and fp-multiplier, load/store
+(define_cpu_unit "r10k_alu1" "r10k_int")
+(define_cpu_unit "r10k_alu2" "r10k_int")
+(define_cpu_unit "r10k_fpadd" "r10k_fp")
+(define_cpu_unit "r10k_fpmpy" "r10k_fp")
+(define_cpu_unit "r10k_loadstore" "r10k_addr")
+
+;; R10000 has separate fp-div and fp-sqrt units as well and these can
+;; execute in parallel, however their issue & completion logic is shared
+;; by the fp-multiplier
+(define_cpu_unit "r10k_fpdiv" "r10k_fp")
+(define_cpu_unit "r10k_fpsqrt" "r10k_fp")
+
+
+
+
+;; loader
+(define_insn_reservation "r10k_load" 2
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (eq_attr "type" "load,prefetch,prefetchx"))
+ "r10k_loadstore")
+
+(define_insn_reservation "r10k_store" 0
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (eq_attr "type" "store,fpstore,fpidxstore"))
+ "r10k_loadstore")
+
+(define_insn_reservation "r10k_fpload" 3
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (eq_attr "type" "fpload,fpidxload"))
+ "r10k_loadstore")
+
+
+
+
+;; Integer add/sub + logic ops, and mf/mt hi/lo can be done by alu1 or alu2
+;; Miscellaneous arith goes here too (this is a guess)
+(define_insn_reservation "r10k_arith" 1
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (eq_attr "type" "arith,mfhilo,mthilo,slt,clz,const,nop,trap"))
+ "r10k_alu1 | r10k_alu2")
+
+
+
+
+;; ALU1 handles shifts, branch eval, and condmove
+;;
+;; Brancher is separate, but part of ALU1, but can only
+;; do one branch per cycle (needs implementing??)
+;;
+;; jump, call - unsure if brancher handles these too (added for now)
+(define_insn_reservation "r10k_shift" 1
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (eq_attr "type" "shift,branch,jump,call"))
+ "r10k_alu1")
+
+(define_insn_reservation "r10k_int_cmove" 1
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "condmove")
+ (eq_attr "mode" "SI,DI")))
+ "r10k_alu1")
+
+
+
+
+;; Coprocessor Moves
+;; mtc1/dmtc1 are handled by ALU1
+;; mfc1/dmfc1 are handled by the fp-multiplier
+(define_insn_reservation "r10k_mt_xfer" 3
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "xfer")
+ (not (match_operand 0 "fpr_operand"))))
+ "r10k_alu1")
+
+(define_insn_reservation "r10k_mf_xfer" 2
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "xfer")
+ (match_operand 0 "fpr_operand")))
+ "r10k_fpmpy")
+
+
+
+
+;; Only ALU2 does int multiplications and divisions
+;; R10K allows an int insn using register Lo to be issued
+;; one cycle earlier than an insn using register Hi for
+;; the insns below, however, we skip on doing this
+;; for now until correct usage of lo_operand() is figured
+;; out.
+;;
+;; Divides keep ALU2 busy, but this isn't expressed here (I think...?)
+(define_insn_reservation "r10k_imul_single" 6
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "imul,imul3,imadd")
+ (eq_attr "mode" "SI")))
+ "r10k_alu2 * 6")
+
+(define_insn_reservation "r10k_imul_double" 10
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "imul,imul3,imadd")
+ (eq_attr "mode" "DI")))
+ "r10k_alu2 * 10")
+
+(define_insn_reservation "r10k_idiv_single" 35
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "idiv")
+ (eq_attr "mode" "SI")))
+ "r10k_alu2 * 35")
+
+(define_insn_reservation "r10k_idiv_double" 67
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "idiv")
+ (eq_attr "mode" "DI")))
+ "r10k_alu2 * 67")
+
+
+
+
+;; FP add/sub, mul, abs value, neg, comp, & moves
+(define_insn_reservation "r10k_fp_miscadd" 2
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (eq_attr "type" "fadd,fabs,fneg,fcmp"))
+ "r10k_fpadd")
+
+(define_insn_reservation "r10k_fp_miscmul" 2
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (eq_attr "type" "fmul,fmove"))
+ "r10k_fpmpy")
+
+(define_insn_reservation "r10k_fp_cmove" 2
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "condmove")
+ (eq_attr "mode" "SF,DF")))
+ "r10k_fpmpy")
+
+
+
+
+;; fcvt.s.[wl] has latency 4, repeat 2
+;; All other fcvt have latency 2, repeat 1
+(define_insn_reservation "r10k_fcvt_single" 4
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "fcvt")
+ (eq_attr "cnv_mode" "I2S")))
+ "r10k_fpadd * 2")
+
+(define_insn_reservation "r10k_fcvt_other" 2
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "fcvt")
+ (eq_attr "cnv_mode" "!I2S")))
+ "r10k_fpadd")
+
+
+
+
+;; fmadd - Runs through fp-adder first, then fp-multiplier
+;;
+;; The latency for fmadd is 2 cycles if the result is used
+;; by another fmadd instruction
+(define_insn_reservation "r10k_fmadd" 4
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (eq_attr "type" "fmadd"))
+ "r10k_fpadd, r10k_fpmpy")
+
+(define_bypass 2 "r10k_fmadd" "r10k_fmadd")
+
+
+
+
+;; fp Divisions & square roots
+(define_insn_reservation "r10k_fdiv_single" 12
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "fdiv,frdiv")
+ (eq_attr "mode" "SF")))
+ "r10k_fpdiv * 14")
+
+(define_insn_reservation "r10k_fdiv_double" 19
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "fdiv,frdiv")
+ (eq_attr "mode" "DF")))
+ "r10k_fpdiv * 21")
+
+(define_insn_reservation "r10k_fsqrt_single" 18
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "fsqrt")
+ (eq_attr "mode" "SF")))
+ "r10k_fpsqrt * 20")
+
+(define_insn_reservation "r10k_fsqrt_double" 33
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "fsqrt")
+ (eq_attr "mode" "DF")))
+ "r10k_fpsqrt * 35")
+
+(define_insn_reservation "r10k_frsqrt_single" 30
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "frsqrt")
+ (eq_attr "mode" "SF")))
+ "r10k_fpsqrt * 20")
+
+(define_insn_reservation "r10k_frsqrt_double" 52
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (and (eq_attr "type" "frsqrt")
+ (eq_attr "mode" "DF")))
+ "r10k_fpsqrt * 35")
+
+
+
+
+;; Unknown/multi (this is a guess)
+(define_insn_reservation "r10k_unknown" 1
+ (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
+ (eq_attr "type" "unknown,multi"))
+ "r10k_alu1 + r10k_alu2")
+
--- gcc-4.2.0/gcc/config/mips/mips.c
+++ gcc-4.2.0/gcc/config/mips/mips.c
@@ -736,6 +736,10 @@ const struct mips_cpu_info mips_cpu_info
/* MIPS IV */
{ "r8000", PROCESSOR_R8000, 4 },
+ { "r10000", PROCESSOR_R10000, 4 },
+ { "r12000", PROCESSOR_R12000, 4 },
+ { "r14000", PROCESSOR_R14000, 4 },
+ { "r16000", PROCESSOR_R16000, 4 },
{ "vr5000", PROCESSOR_R5000, 4 },
{ "vr5400", PROCESSOR_R5400, 4 },
{ "vr5500", PROCESSOR_R5500, 4 },
@@ -1016,6 +1020,58 @@ static struct mips_rtx_cost_data const m
1, /* branch_cost */
4 /* memory_latency */
},
+ { /* R10000 */
+ COSTS_N_INSNS (2), /* fp_add */
+ COSTS_N_INSNS (2), /* fp_mult_sf */
+ COSTS_N_INSNS (2), /* fp_mult_df */
+ COSTS_N_INSNS (12), /* fp_div_sf */
+ COSTS_N_INSNS (19), /* fp_div_df */
+ COSTS_N_INSNS (6), /* int_mult_si */
+ COSTS_N_INSNS (10), /* int_mult_di */
+ COSTS_N_INSNS (35), /* int_div_si */
+ COSTS_N_INSNS (67), /* int_div_di */
+ 1, /* branch_cost */
+ 4 /* memory_latency */
+ },
+ { /* R12000 */
+ COSTS_N_INSNS (2), /* fp_add */
+ COSTS_N_INSNS (2), /* fp_mult_sf */
+ COSTS_N_INSNS (2), /* fp_mult_df */
+ COSTS_N_INSNS (12), /* fp_div_sf */
+ COSTS_N_INSNS (19), /* fp_div_df */
+ COSTS_N_INSNS (6), /* int_mult_si */
+ COSTS_N_INSNS (10), /* int_mult_di */
+ COSTS_N_INSNS (35), /* int_div_si */
+ COSTS_N_INSNS (67), /* int_div_di */
+ 1, /* branch_cost */
+ 4 /* memory_latency */
+ },
+ { /* R14000 */
+ COSTS_N_INSNS (2), /* fp_add */
+ COSTS_N_INSNS (2), /* fp_mult_sf */
+ COSTS_N_INSNS (2), /* fp_mult_df */
+ COSTS_N_INSNS (12), /* fp_div_sf */
+ COSTS_N_INSNS (19), /* fp_div_df */
+ COSTS_N_INSNS (6), /* int_mult_si */
+ COSTS_N_INSNS (10), /* int_mult_di */
+ COSTS_N_INSNS (35), /* int_div_si */
+ COSTS_N_INSNS (67), /* int_div_di */
+ 1, /* branch_cost */
+ 4 /* memory_latency */
+ },
+ { /* R16000 */
+ COSTS_N_INSNS (2), /* fp_add */
+ COSTS_N_INSNS (2), /* fp_mult_sf */
+ COSTS_N_INSNS (2), /* fp_mult_df */
+ COSTS_N_INSNS (12), /* fp_div_sf */
+ COSTS_N_INSNS (19), /* fp_div_df */
+ COSTS_N_INSNS (6), /* int_mult_si */
+ COSTS_N_INSNS (10), /* int_mult_di */
+ COSTS_N_INSNS (35), /* int_div_si */
+ COSTS_N_INSNS (67), /* int_div_di */
+ 1, /* branch_cost */
+ 4 /* memory_latency */
+ },
{ /* SB1 */
/* These costs are the same as the SB-1A below. */
COSTS_N_INSNS (4), /* fp_add */
@@ -9938,6 +9994,12 @@ mips_issue_rate (void)
{
switch (mips_tune)
{
+ case PROCESSOR_R10000:
+ case PROCESSOR_R12000:
+ case PROCESSOR_R14000:
+ case PROCESSOR_R16000:
+ return 4;
+
case PROCESSOR_R4130:
case PROCESSOR_R5400:
case PROCESSOR_R5500:
--- gcc-4.2.0/gcc/config/mips/mips.h
+++ gcc-4.2.0/gcc/config/mips/mips.h
@@ -57,6 +57,10 @@ enum processor_type {
PROCESSOR_R7000,
PROCESSOR_R8000,
PROCESSOR_R9000,
+ PROCESSOR_R10000,
+ PROCESSOR_R12000,
+ PROCESSOR_R14000,
+ PROCESSOR_R16000,
PROCESSOR_SB1,
PROCESSOR_SB1A,
PROCESSOR_SR71000,
@@ -209,6 +213,10 @@ extern const struct mips_rtx_cost_data *
#define TARGET_MIPS5500 (mips_arch == PROCESSOR_R5500)
#define TARGET_MIPS7000 (mips_arch == PROCESSOR_R7000)
#define TARGET_MIPS9000 (mips_arch == PROCESSOR_R9000)
+#define TARGET_MIPS10000 (mips_arch == PROCESSOR_R10000)
+#define TARGET_MIPS12000 (mips_arch == PROCESSOR_R12000)
+#define TARGET_MIPS14000 (mips_arch == PROCESSOR_R14000)
+#define TARGET_MIPS16000 (mips_arch == PROCESSOR_R16000)
#define TARGET_SB1 (mips_arch == PROCESSOR_SB1 \
|| mips_arch == PROCESSOR_SB1A)
#define TARGET_SR71K (mips_arch == PROCESSOR_SR71000)
@@ -225,6 +233,10 @@ extern const struct mips_rtx_cost_data *
#define TUNE_MIPS6000 (mips_tune == PROCESSOR_R6000)
#define TUNE_MIPS7000 (mips_tune == PROCESSOR_R7000)
#define TUNE_MIPS9000 (mips_tune == PROCESSOR_R9000)
+#define TUNE_MIPS10000 (mips_tune == PROCESSOR_R10000)
+#define TUNE_MIPS12000 (mips_tune == PROCESSOR_R12000)
+#define TUNE_MIPS14000 (mips_tune == PROCESSOR_R14000)
+#define TUNE_MIPS16000 (mips_tune == PROCESSOR_R16000)
#define TUNE_SB1 (mips_tune == PROCESSOR_SB1 \
|| mips_tune == PROCESSOR_SB1A)
--- gcc-4.2.0/gcc/config/mips/mips.md
+++ gcc-4.2.0/gcc/config/mips/mips.md
@@ -341,7 +341,7 @@
;; Attribute describing the processor. This attribute must match exactly
;; with the processor_type enumeration in mips.h.
(define_attr "cpu"
- "r3000,4kc,4kp,5kc,5kf,20kc,24k,24kx,m4k,r3900,r6000,r4000,r4100,r4111,r4120,r4130,r4300,r4600,r4650,r5000,r5400,r5500,r7000,r8000,r9000,sb1,sb1a,sr71000"
+ "r3000,4kc,4kp,5kc,5kf,20kc,24k,24kx,m4k,r3900,r6000,r4000,r4100,r4111,r4120,r4130,r4300,r4600,r4650,r5000,r5400,r5500,r7000,r8000,r9000,r10000,r12000,r14000,r16000,sb1,sb1a,sr71000"
(const (symbol_ref "mips_tune")))
;; The type of hardware hazard associated with this instruction.
@@ -590,6 +590,7 @@
(include "6000.md")
(include "7000.md")
(include "9000.md")
+(include "10000.md")
(include "sb1.md")
(include "sr71k.md")
(include "generic.md")
1.1 src/patchsets/gcc/4.2.2/gentoo/91_all_mips-ip28_cache_barriers-v4.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/91_all_mips-ip28_cache_barriers-v4.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/91_all_mips-ip28_cache_barriers-v4.patch?rev=1.1&content-type=text/plain
Index: 91_all_mips-ip28_cache_barriers-v4.patch
===================================================================
--- gcc-4.2.0/gcc/config/mips/mips.c
+++ gcc-4.2.0/gcc/config/mips/mips.c
@@ -256,6 +256,9 @@ static const char *const mips_fp_conditi
MIPS_FP_CONDITIONS (STRINGIFY)
};
+/* R10K Cache Barrier Functions */
+#include "r10k-cacheb.c"
+
/* A function to save or store a register. The first argument is the
register and the second is the stack slot. */
typedef void (*mips_save_restore_fn) (rtx, rtx);
@@ -9079,6 +9082,10 @@ mips_reorg (void)
if (TUNE_MIPS4130 && TARGET_VR4130_ALIGN)
vr4130_align_insns ();
}
+ if (TARGET_R10K_SPECEX)
+ {
+ r10k_insert_cache_barriers ();
+ }
}
/* This function does three things:
--- gcc-4.2.0/gcc/config/mips/mips.opt
+++ gcc-4.2.0/gcc/config/mips/mips.opt
@@ -220,3 +220,13 @@ Perform VR4130-specific alignment optimi
mxgot
Target Report Var(TARGET_XGOT)
Lift restrictions on GOT size
+
+mr10k-cache-barrier=
+Target Report Joined UInteger Var(TARGET_R10K_SPECEX)
+-mr10k-cache-barrier[=1|2] Generate cache barriers for SGI Indigo2/O2 R10k
+
+mr10k-cache-barrier
+Target Undocumented Var(TARGET_R10K_SPECEX) VarExists
+
+mip28-cache-barrier
+Target Undocumented Var(TARGET_R10K_SPECEX) VarExists
--- gcc-4.2.0/gcc/config/mips/r10k-cacheb.c
+++ gcc-4.2.0/gcc/config/mips/r10k-cacheb.c
@@ -0,0 +1,298 @@
+/* Subroutines used for MIPS code generation: generate cache-barriers
+ for SiliconGraphics IP28 and IP32/R10000 kernel-code.
+ Copyright (C) 2005,2006 peter fuerst, pf@net.alphadv.de.
+
+This file is intended to become part of GCC.
+
+This file 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.
+
+This file 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. */
+
+
+#define ASM_R10K_CACHE_BARRIER "cache 0x14,0($sp)"
+
+static int is_stack_pointer (rtx *x, void *data);
+static int check_p_mem_expr (rtx *memx, void *data);
+static int check_p_pattern_for_store (rtx *body, void *data);
+static int strmatch (const char *txt, const char *match);
+static int check_insn_for_store (int state, rtx insn);
+static int bb_insert_store_cache_barrier (rtx head, rtx nxtb);
+static int scan_1_bb_for_store (rtx head, rtx end);
+static int r10k_insert_cache_barriers (void);
+
+
+/* Check, whether an instruction is a possibly harmful store instruction,
+ i.e. a store which might cause damage, if speculatively executed. */
+
+/* Return truth value whether the expression `*memx' instantiates
+ (mem:M (not (stackpointer_address or constant))). */
+
+static int
+is_stack_pointer (rtx *x, void *data)
+{
+ return (*x == stack_pointer_rtx);
+}
+
+static int
+check_p_mem_expr (rtx *memx, void *data)
+{
+ if (!MEM_P (*memx) || for_each_rtx (memx, is_stack_pointer, 0))
+ return 0;
+
+ /* Stores/Loads to/from constant addresses can be considered
+ harmless, since:
+ 1) the address is always valid, even when taken speculatively.
+ 2a) the location is (hopefully) never used as a dma-target, thus
+ there is no danger of cache-inconsistency.
+ 2b) uncached loads/stores are guaranteed to be non-speculative. */
+ if ( CONSTANT_P(XEXP (*memx, 0)) )
+ return 0;
+
+ return 1;
+}
+
+/* Return truth value whether we find (set (mem:M (non_stackpointer_address)
+ ...)) in instruction-pattern `body'.
+ Here we assume, that addressing with the stackpointer accesses neither
+ uncached-aliased nor invalid memory.
+ (May be, this applies to the global pointer and frame pointer also,
+ but its saver not to assume it. And probably it's not worthwile to
+ regard these registers)
+
+ Speculative loads from invalid addresses also cause bus errors...
+ So check for (set (reg:M ...) (mem:M (non_stackpointer_address)))
+ too, unless there is an enhanced bus-error handler. */
+
+static int
+check_p_pattern_for_store (rtx *body, void *data)
+{
+ if (*body && GET_CODE (*body) == SET)
+ {
+ /* Cache-barriers for SET_SRC may be requested as well. */
+ if (!(TARGET_R10K_SPECEX & 2))
+ body = &SET_DEST(*body);
+
+ if (for_each_rtx (body, check_p_mem_expr, 0))
+ return 1;
+
+ /* Don't traverse sub-expressions again. */
+ return -1;
+ }
+ return 0;
+}
+
+static int
+strmatch (const char *txt, const char *match)
+{
+ return !strncmp(txt, match, strlen (match));
+}
+
+/* Check for (ins (set (mem:M (dangerous_address)) ...)) or end of the
+ current basic block in instruction `insn'.
+ `state': (internal) recursion-counter and delayslot-flag
+ Criteria to recognize end-of/next basic-block are reduplicated here
+ from final_scan_insn.
+ return >0: `insn' is critical.
+ return <0: `insn' is at end of current basic-block.
+ return 0: `insn' can be ignored. */
+
+static int
+check_insn_for_store (int state, rtx insn)
+{
+ rtx body;
+
+ if (INSN_DELETED_P (insn))
+ return 0;
+
+ if (LABEL_P (insn))
+ return -1;
+
+ if (CALL_P (insn) || JUMP_P (insn) || NONJUMP_INSN_P (insn))
+ {
+ body = PATTERN (insn);
+ if (GET_CODE (body) == SEQUENCE)
+ {
+ /* A delayed-branch sequence. */
+ rtx insq;
+ FOR_EACH_SUBINSN(insq, insn)
+ if (! INSN_DELETED_P (insq))
+ {
+ /* |1: delay-slot completely contained in sequence. */
+ if (check_insn_for_store (8+state|1, insq) > 0)
+ return 1;
+ }
+ /* Following a (conditional) branch sequence, we have a new
+ basic block. */
+ if (JUMP_P (SEQ_BEGIN(insn)))
+ return -1;
+ /* Handle a call sequence like a conditional branch sequence. */
+ if (CALL_P (SEQ_BEGIN(insn)))
+ return -1;
+ }
+ if (GET_CODE (body) == PARALLEL)
+ if (for_each_rtx (&body, check_p_pattern_for_store, 0))
+ return 1;
+
+ /* Now, only a `simple' INSN or JUMP_INSN remains to be checked. */
+ if (NONJUMP_INSN_P (insn))
+ {
+ /* Since we don't know what's inside, we must take inline
+ assembly to be dangerous. */
+ if (GET_CODE (body) == ASM_INPUT)
+ {
+ const char *t = XSTR (body, 0);
+ if (t && !strmatch(t, ASM_R10K_CACHE_BARRIER))
+ return 1;
+ }
+
+ if (check_p_pattern_for_store (&body, 0) > 0)
+ return 1;
+ }
+ /* Handle a CALL_INSN instruction like a conditional branch. */
+ if (JUMP_P (insn) || CALL_P (insn))
+ {
+ /* Following a (conditional) branch, we have a new basic block. */
+ /* But check insn(s) in delay-slot first. If we could know in
+ advance that this jump is in `.reorder' mode, where gas will
+ insert a `nop' into the delay-slot, we could skip this test.
+ Since we don't know, always assume `.noreorder', sometimes
+ emitting a cache-barrier, that isn't needed. */
+ /* But if we are here recursively, already checking a (pseudo-)
+ delay-slot, we are done. */
+ if ( !(state & 1) )
+ for (insn = NEXT_INSN (insn); insn; insn = NEXT_INSN (insn))
+ {
+ if (LABEL_P (insn) || CALL_P (insn) || JUMP_P (insn))
+ /* Not in delay-slot at all. */
+ break;
+
+ if (NONJUMP_INSN_P (insn))
+ {
+ if (GET_CODE (PATTERN (insn)) == SEQUENCE)
+ /* Not in delay-slot at all. */
+ break;
+
+ if (check_insn_for_store (8+state|1, insn) > 0)
+ return 1;
+ /* We're done anyway. */
+ break;
+ }
+ /* skip NOTE,... */;
+ }
+ return -1;
+ }
+ }
+ return 0;
+}
+
+
+/* Scan a basic block, starting with `insn', for a possibly harmful store
+ instruction. If found, output a cache barrier at the start of this
+ block. */
+
+static int
+bb_insert_store_cache_barrier (rtx head, rtx nxtb)
+{
+ rtx insn = head;
+
+ if (!insn || insn == nxtb)
+ return 0;
+
+ while ((insn = NEXT_INSN (insn)) && insn != nxtb)
+ {
+ int found;
+
+ if (NOTE_INSN_BASIC_BLOCK_P(insn)) /* See scan_1_bb_for_store() */
+ break;
+
+ found = check_insn_for_store (0, insn);
+ if (found < 0)
+ break;
+ if (found > 0)
+ {
+ /* found critical store instruction */
+ insn = gen_rtx_ASM_INPUT (VOIDmode,
+ ASM_R10K_CACHE_BARRIER "\t"
+ ASM_COMMENT_START " Cache Barrier");
+ /* Here we rely on the assumption, that an explicit delay-slot
+ - if any - is already embedded (in a sequence) in 'head'! */
+ insn = emit_insn_after (insn, head);
+ return 1;
+ }
+ }
+ return 0;
+}
+
+
+/* Scan one basic block for a possibly harmful store instruction.
+ If found, insert a cache barrier at the start of this block,
+ return number of inserted cache_barriers. */
+
+static int
+scan_1_bb_for_store (rtx head, rtx end)
+{
+ rtx nxtb;
+ int count;
+ gcc_assert (head);
+ gcc_assert (end);
+
+ /* Note: 'end' is not necessarily reached from 'head' (hidden in
+ SEQUENCE, PARALLEL), but 'nxtb' is. */
+ nxtb = NEXT_INSN (end);
+
+ /* Each basic block starts with zero or more CODE_LABEL(s), followed
+ by one NOTE_INSN_BASIC_BLOCK.
+ Note: bb_head may equal next_insn(bb_end) already ! */
+ while (head && head != nxtb && LABEL_P (head))
+ head = NEXT_INSN (head);
+
+ if (!head || head == nxtb)
+ return 0;
+
+ /* Handle the basic block itself, at most up to next CALL_INSN. */
+ count = bb_insert_store_cache_barrier (head, nxtb);
+
+ /* 1) Handle any CALL_INSN instruction like a conditional branch.
+ 2) There may be "basic blocks" in the list, which are no basic blocks
+ at all. (containing CODE_LABELs in the body or gathering several
+ other basic blocks (e.g. bb5 containing bb6,bb7,bb8)). */
+
+ while ((head = NEXT_INSN (head)) && head != nxtb)
+ {
+ if (INSN_DELETED_P (head))
+ continue;
+
+ /* Later we'll be called again for this bb on its own. */
+ if (NOTE_INSN_BASIC_BLOCK_P(head))
+ break;
+
+ if (CALL_P (SEQ_BEGIN (head)) || LABEL_P (head))
+ count += bb_insert_store_cache_barrier (head, nxtb);
+ }
+ return count;
+}
+
+static int
+r10k_insert_cache_barriers (void)
+{
+ if (TARGET_R10K_SPECEX)
+ {
+ basic_block bb;
+
+ FOR_EACH_BB (bb)
+ if (0 <= bb->index)
+ scan_1_bb_for_store (BB_HEAD (bb), BB_END (bb));
+ }
+ return 0;
+}
1.1 src/patchsets/gcc/4.2.2/gentoo/README.history
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/README.history?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/gcc/4.2.2/gentoo/README.history?rev=1.1&content-type=text/plain
Index: README.history
===================================================================
1.0 11.10.2007
+ 00_all_gcc-4.1-alpha-mieee-default.patch
+ 00_all_gcc-trampolinewarn.patch
+ 01_all_gcc4-ice-hack.patch
+ 02_all_gcc4-ppc64-m32-m64-multilib-only.patch
+ 03_all_gcc4-java-nomulti.patch
+ 06_all_gcc4-slow-pthread-self.patch
+ 08_all_gcc-4.1-cross-compile.patch
+ 10_all_gcc4-libltdl-multilib.patch
+ 11_all_gcc-netbsd-symbolic.patch
+ 14_all_gcc-sparc64-bsd.patch
+ 18_all_904-flatten-switch-stmt-00.patch
+ 20_all_cris-dont-force-limits-header.patch
+ 34_all_arm-bigendian.patch
+ 35_all_gcc-arm-pragma-pack.patch
+ 36_all_gcc-arm-pr30486.patch
+ 51_all_gcc-3.4-libiberty-pic.patch
+ 53_all_gcc4-superh-default-multilib.patch
+ 54_all_300-libstdc++-pic.patch
+ 61_all_gcc4-ia64-noteGNUstack.patch
+ 62_all_gcc4-noteGNUstack.patch
+ 74_all_sh-pr24836.patch
+ 85_all_gcc-ca-translation-typo.patch
+ 90_all_mips-add-march-r10k.patch
+ 91_all_mips-ip28_cache_barriers-v4.patch
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-10-11 4:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-11 4:43 [gentoo-commits] gentoo commit in src/patchsets/gcc/4.2.2/gentoo: 00_all_gcc-4.1-alpha-mieee-default.patch 00_all_gcc-trampolinewarn.patch 01_all_gcc4-ice-hack.patch 02_all_gcc4-ppc64-m32-m64-multilib-only.patch 03_all_gcc4-java-nomulti.patch 06_all_gcc4-slow-pthread-self.patch 08_all_gcc-4.1-cross-compile.patch 10_all_gcc4-libltdl-multilib.patch 11_all_gcc-netbsd-symbolic.patch 14_all_gcc-sparc64-bsd.patch 18_all_904-flatten-switch-stmt-00.patch 20_all_cris-dont-force-limits-header.patch 34_all_arm-bigendian.patch 35_all_gcc-arm-pragma-pack.patch 36_all_gcc-arm-pr30486.patch 51_all_gcc-3.4-libiberty-pic.patch 53_all_gcc4-superh-default-multilib.patch 54_all_300-libstdc++-pic.patch 61_all_gcc4-ia64-noteGNUstack.patch 62_all_gcc4-noteGNUstack.patch 74_all_sh-pr24836.patch 85_all_gcc-ca-translation-typo.patch 90_all_mips-add-march-r10k.patch 91_all_mips-ip28_cache_barriers-v4.patch README.history Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox