Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2025-01-15 15:33:44 +00:00
Code Issues Projects Releases Wiki Activity

conflict resolution

Browse Source
This commit is contained in:
Wolfgang Thaller 2019-06-20 20:48:48 +02:00
parent a49302b4ee
commit d29b12e18a
15 changed files with 9 additions and 8906 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/gcc/c-family/c-common.c
View File

@ -753,17 +753,15 @@ fix_string_type (tree value)
charsz = 1;
e_type = char_type_node;
}
<<<<<<< HEAD
else if (TREE_TYPE (value) == uchar_array_type_node)
{
nchars = length;
charsz = 1;
e_type = unsigned_char_type_node;
=======
}
else if (flag_char8_t && TREE_TYPE (value) == char8_array_type_node)
{
charsz = TYPE_PRECISION (char8_type_node) / BITS_PER_UNIT;
e_type = char8_type_node;
>>>>>>> upstream
}
else if (TREE_TYPE (value) == char16_array_type_node)
{

6
gcc/gcc/c-family/c-common.h
View File

@ -334,11 +334,8 @@ enum c_tree_index
CTI_UINTPTR_TYPE,
CTI_CHAR_ARRAY_TYPE,
<<<<<<< HEAD
CTI_UCHAR_ARRAY_TYPE,
=======
CTI_CHAR8_ARRAY_TYPE,
>>>>>>> upstream
CTI_CHAR16_ARRAY_TYPE,
CTI_CHAR32_ARRAY_TYPE,
CTI_WCHAR_ARRAY_TYPE,
@ -487,11 +484,8 @@ extern const unsigned int num_c_common_reswords;
#define truthvalue_false_node c_global_trees[CTI_TRUTHVALUE_FALSE]
#define char_array_type_node c_global_trees[CTI_CHAR_ARRAY_TYPE]
<<<<<<< HEAD
#define uchar_array_type_node c_global_trees[CTI_UCHAR_ARRAY_TYPE]
=======
#define char8_array_type_node c_global_trees[CTI_CHAR8_ARRAY_TYPE]
>>>>>>> upstream
#define char16_array_type_node c_global_trees[CTI_CHAR16_ARRAY_TYPE]
#define char32_array_type_node c_global_trees[CTI_CHAR32_ARRAY_TYPE]
#define wchar_array_type_node c_global_trees[CTI_WCHAR_ARRAY_TYPE]

13
gcc/gcc/c-family/c-lex.c
View File

@ -1295,19 +1295,10 @@ lex_string (const cpp_token *tok, tree *valp, bool objc_string, bool translate)
{
default:
case CPP_STRING:
<<<<<<< HEAD
case CPP_UTF8STRING:
if (pascal_string)
{
TREE_TYPE (value) = uchar_array_type_node;
}
TREE_TYPE (value) = uchar_array_type_node;
else
{
TREE_TYPE (value) = char_array_type_node;
}
=======
TREE_TYPE (value) = char_array_type_node;
>>>>>>> upstream
TREE_TYPE (value) = char_array_type_node;
break;
case CPP_UTF8STRING:
if (flag_char8_t)

24
gcc/gcc/c/c-typeck.c
View File

@ -7738,32 +7738,8 @@ digest_init (location_t init_loc, tree type, tree init, tree origtype,
if (char_array)
{
<<<<<<< HEAD
if (typ2 != char_type_node && typ2 != unsigned_char_type_node)
{
error_init (init_loc, "char-array initialized from wide "
"string");
return error_mark_node;
}
}
else
{
if (typ2 == char_type_node || typ2 == unsigned_char_type_node)
{
error_init (init_loc, "wide character array initialized "
"from non-wide string");
return error_mark_node;
}
else if (!comptypes(typ1, typ2))
{
error_init (init_loc, "wide character array initialized "
"from incompatible wide string");
return error_mark_node;
}
=======
if (typ2 != char_type_node)
incompat_string_cst = true;
>>>>>>> upstream
}
else if (!comptypes (typ1, typ2))
incompat_string_cst = true;

19
gcc/gcc/calls.c
View File

@ -1934,26 +1934,7 @@ initialize_argument_information (int num_actuals ATTRIBUTE_UNUSED,
if (struct_value_addr_value)
{
args[j].tree_value = struct_value_addr_value;
<<<<<<< HEAD
j += inc;
/* If we pass structure address then we need to
create bounds for it. Since created bounds is
a call statement, we expand it right here to avoid
fixing all other places where it may be expanded. */
if (CALL_WITH_BOUNDS_P (exp))
{
args[j].value = gen_reg_rtx (targetm.chkp_bound_mode ());
args[j].tree_value
= chkp_make_bounds_for_struct_addr (struct_value_addr_value);
expand_expr_real (args[j].tree_value, args[j].value, VOIDmode,
EXPAND_NORMAL, 0, false);
args[j].pointer_arg = j + 1; // ### ???
j += inc;
}
=======
j--;
>>>>>>> upstream
}
argpos = 0;
FOR_EACH_CALL_EXPR_ARG (arg, iter, exp)

39
gcc/gcc/config.gcc
View File

@ -2784,7 +2784,6 @@ powerpcle-*-eabi*)
extra_options="${extra_options} rs6000/sysv4.opt"
use_gcc_stdint=wrap
;;
<<<<<<< HEAD
powerpc-apple-macos*)
tm_file="${tm_file} rs6000/xcoff.h rs6000/aix-stdint.h rs6000/macos.h"
tmake_file="rs6000/t-macos"
@ -2794,44 +2793,6 @@ powerpc-apple-macos*)
use_gcc_stdint=provide
extra_headers=
;;
rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h rs6000/aix-stdint.h"
tmake_file="rs6000/t-aix43 t-slibgcc"
extra_options="${extra_options} rs6000/aix64.opt"
use_collect2=yes
thread_file='aix'
use_gcc_stdint=provide
extra_headers=
;;
rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h rs6000/aix-stdint.h"
extra_options="${extra_options} rs6000/aix64.opt"
tmake_file="rs6000/t-aix43 t-slibgcc"
use_collect2=yes
thread_file='aix'
use_gcc_stdint=wrap
extra_headers=
;;
rs6000-ibm-aix5.2.* | powerpc-ibm-aix5.2.*)
tm_file="${tm_file} rs6000/aix.h rs6000/aix52.h rs6000/xcoff.h rs6000/aix-stdint.h"
tmake_file="rs6000/t-aix52 t-slibgcc"
extra_options="${extra_options} rs6000/aix64.opt"
use_collect2=yes
thread_file='aix'
use_gcc_stdint=wrap
extra_headers=
;;
rs6000-ibm-aix5.3.* | powerpc-ibm-aix5.3.*)
tm_file="${tm_file} rs6000/aix.h rs6000/aix53.h rs6000/xcoff.h rs6000/aix-stdint.h"
tmake_file="rs6000/t-aix52 t-slibgcc"
extra_options="${extra_options} rs6000/aix64.opt"
use_collect2=yes
thread_file='aix'
use_gcc_stdint=wrap
extra_headers=altivec.h
;;
=======
>>>>>>> upstream
rs6000-ibm-aix6.* | powerpc-ibm-aix6.*)
tm_file="${tm_file} rs6000/aix.h rs6000/aix61.h rs6000/xcoff.h rs6000/aix-stdint.h"
tmake_file="rs6000/t-aix52 t-slibgcc"

7
gcc/gcc/config/m68k/m68k.c
View File

@ -69,11 +69,8 @@ along with GCC; see the file COPYING3. If not see
#include "optabs.h"
#include "builtins.h"
#include "rtl-iter.h"
<<<<<<< HEAD
#include "stringpool.h"
=======
#include "toplev.h"
>>>>>>> upstream
/* This file should be included last. */
#include "target-def.h"
@ -368,7 +365,6 @@ static machine_mode m68k_promote_function_mode (const_tree, machine_mode,
#undef TARGET_PROMOTE_FUNCTION_MODE
#define TARGET_PROMOTE_FUNCTION_MODE m68k_promote_function_mode
<<<<<<< HEAD
#undef TARGET_FUNCTION_VALUE
#define TARGET_FUNCTION_VALUE m68k_function_value
@ -377,10 +373,9 @@ static machine_mode m68k_promote_function_mode (const_tree, machine_mode,
#undef TARGET_FUNCTION_ARG_PADDING
#define TARGET_FUNCTION_ARG_PADDING m68k_function_arg_padding
=======
#undef TARGET_HAVE_SPECULATION_SAFE_VALUE
#define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed
>>>>>>> upstream
static const struct attribute_spec m68k_attribute_table[] =
{

13
gcc/gcc/cp/parser.c
View File

@ -4254,19 +4254,10 @@ cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok,
{
default:
case CPP_STRING:
<<<<<<< HEAD
case CPP_UTF8STRING:
if (pascal_string)
{
TREE_TYPE (value) = uchar_array_type_node;
}
TREE_TYPE (value) = uchar_array_type_node;
else
{
TREE_TYPE (value) = char_array_type_node;
}
=======
TREE_TYPE (value) = char_array_type_node;
>>>>>>> upstream
TREE_TYPE (value) = char_array_type_node;
break;
case CPP_UTF8STRING:
if (flag_char8_t)

26
gcc/gcc/cp/typeck2.c
View File

@ -1109,14 +1109,6 @@ digest_init_r (tree type, tree init, int nested, int flags,
if (typ1 != char_type)
{
<<<<<<< HEAD
if (char_type != char_type_node && char_type != unsigned_char_type_node)
{
if (complain & tf_error)
error_at (loc, "char-array initialized from wide string");
return error_mark_node;
}
=======
/* The array element type does not match the initializing string
literal element type; this is only allowed when both types are
ordinary character type. There are no string literals of
@ -1128,33 +1120,15 @@ digest_init_r (tree type, tree init, int nested, int flags,
/* OK */;
else
incompat_string_cst = true;
>>>>>>> upstream
}
if (incompat_string_cst)
{
<<<<<<< HEAD
if (char_type == char_type_node || char_type == unsigned_char_type_node)
{
if (complain & tf_error)
error_at (loc,
"int-array initialized from non-wide string");
return error_mark_node;
}
else if (char_type != typ1)
{
if (complain & tf_error)
error_at (loc, "int-array initialized from incompatible "
"wide string");
return error_mark_node;
}
=======
if (complain & tf_error)
error_at (loc, "cannot initialize array of %qT from "
"a string literal with type array of %qT",
typ1, char_type);
return error_mark_node;
>>>>>>> upstream
}
if (nested == 2 && !TYPE_DOMAIN (type))

194
gcc/intl/ChangeLog
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
2016-06-11 Daiki Ueno <ueno@gnu.org>
build: Fix unintentional soname bump
@ -9,32 +8,6 @@
2016-06-09 Daiki Ueno <ueno@gnu.org>
Prepare for 0.19.8
=======
2019-05-03 Release Manager
* GCC 9.1.0 released.
2018-11-07 Hafiz Abid Qadeer <abidh@codesourcery.com>
* configure: Regenerated.
2018-10-31 Joseph Myers <joseph@codesourcery.com>
PR bootstrap/82856
Merge from binutils-gdb:
2018-06-19 Simon Marchi <simon.marchi@ericsson.com>
* configure.ac: Add AC_USE_SYSTEM_EXTENSIONS, remove AC_PREREQ.
* configure: Re-generate.
* config.h.in: Re-generate.
* aclocal.m4: Re-generate.
2018-09-18 Simon Marchi <simon.marchi@ericsson.com>
* libgnuintl.h (_INTL_MAY_RETURN_STRING_ARG, gettext, dgettext,
dcgettext, ngettext, dngettext, dcngettext): Backport changes
from upstream gettext.
>>>>>>> upstream
2016-05-25 Daiki Ueno <ueno@gnu.org>
@ -95,177 +68,10 @@
2015-10-14 Mike Frysinger <vapier@chromium.org>
<<<<<<< HEAD
intl/localename: control langinfo.h inclusion
This header is only used to work around buggy behavior in old versions
of glibc, so do not include it all the time. Otherwise we get build
failures on systems that do not provide langinfo.h.
=======
* libgnuintl.h (_INTL_MAY_RETURN_STRING_ARG, gettext, dgettext)
(dcgettext, ngettext, dngettext, dcngettext): Backport changes
from current gettext to provide GCC format_arg attributes.
2009-08-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure.ac (AC_PREREQ): Bump to 2.64.
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* aclocal.m4: Regenerate.
* configure: Regenerate.
* config.h.in: Regenerate.
2009-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in (aclocal_deps): New variable.
($(srcdir)/aclocal.m4): Use it, for portable makefile syntax.
2008-06-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure: Regenerate.
2008-06-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Makefile.in (datarootdir): New variable.
2008-04-18 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/35457
* aclocal.m4: Regenerate.
* configure: Regenerate.
2008-03-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* aclocal.m4: Regenerate.
* configure: Likewise.
2006-09-27 Alan Modra <amodra@bigpond.net.au>
* Makefile.in (distclean): Delete config files.
2006-09-13 Eric Botcazou <ebotcazou@libertysurf.fr>
PR other/23541
PR other/26507
Backport from gettext repository:
2003-09-04 Bruno Haible <bruno@clisp.org>
* dgettext.c: Include <locale.h> after gettextP.h, not before. This
ensures that libintl_dcgettext is correctly declared on Solaris.
(Needed because Solaris <locale.h> includes libintl.h.)
* dngettext.c: Likewise, for the libintl_dcngettext declaration.
2006-06-07 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.in (install-info, install-dvi, install-ps, install-pdf):
New dummy targets.
2005-05-23 Carlos O'Donell <carlos@codesourcery.com>
* Makefile.in: Add info dvi ps pdf html install-html to .PHONY
Add install-html target.
2005-05-13 Nick Clifton <nickc@redhat.com>
* Update the address and phone number of the FSF organization in
the GPL notices in the following files:
Makefile.in, bindtextdom.c, dcgettext.c, dcigettext.c,
dcngettext.c, dgettext.c, dngettext.c, eval-plural.h,
explodename.c, finddomain.c, gettext.c, gettextP.h, gmo.h,
hash-string.h, intl-compat.c, l10nflist.c, libgnuintl.h,
loadinfo.h, loadmsgcat.c, localcharset.c, localcharset.h,
locale.alias, localealias.c, localename.c, log.c, ngettext.c,
osdep.c, plural-exp.c, plural-exp.h, plural.c, plural.y,
relocatable.c, relocatable.h, textdomain.c
2004-11-24 Kelley Cook <kcook@gcc.gnu.org>
* aclocal.m4: Regenerate.
2004-09-23 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.in (config.h.in): Correct dependencies.
(stamp-h1): Likewise.
(config.intl): Likewise.
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* configure.ac (AC_CONFIG_MACRO_DIR): New.
(ACLOCAL, AUTOCONF, AUTOHEADER, MAINT): Substitute.
* Makefile.in: Update with maintainer mode rules.
* README: Update aclocal regeneration instructions.
* aclocal.m4, configure: Regenerate.
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* .cvsignore: Ignore autom4te.cache
2004-04-25 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Point config.intl to the parent directory of
${top_builddir}.
* configure: Regenerate.
2004-03-10 Kelley Cook <kcook@gcc.gnu.org>
* configure.ac: Bump AC_PREREQ to 2.59.
* configure: Regenerate.
* config.h.in: Regenerate.
2004-02-29 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Convert to autoconf 2.57, gratuitous stylistic
cleanup, rename to configure.ac.
* configure.ac: Renamed from configure.in.
* config.h.in: Rebuilt with autoheader 2.57.
* configure: Rebuilt with autoconf 2.57
* README: Update to reflect rename of configure.in to configure.ac.
2003-07-07 Zack Weinberg <zack@codesourcery.com>
* README: Update.
* Makefile.in (INSTALL, INSTALL_DATA, MKINSTALLDIRS,
mkinstalldirs, gettextsrcdir, l): Delete.
(COMPILE): Add $(DEFS-$@), remove $(XCFLAGS).
(HEADERS): libgnuintl.h not libgnuintl.h.in. Remove os2compat.h.
(SOURCES): Remove os2compat.c.
(DEFS-dcigettext.o, DEFS-localealias.o, DEFS-localcharset.o,
DEFS-relocatable.o): New.
(all-yes): Add config.intl.
(libintl.h): Use cp, not cat.
(INCLUDES): Remove -I..
(TAGS, CTAGS, ID): Word wrap.
(mostlyclean, distclean): Remove junk.
(config.intl): New rule.
* aclocal.m4: sinclude ../config/progtest.m4 instead of
including it inline.
* config.intl.in: New file.
* configure.in: Take out unnecessary AC_CONFIG_AUX_DIR.
Take out AC_DEFINEs for LOCALEDIR, LOCALE_ALIAS_PATH,
LIBDIR, INSTALLDIR. Set LIBINTL_DEP and INCINTL and AC_SUBST
them. Add config.intl to AC_OUTPUT.
* os2compat.c, os2compat.h: Delete, unused.
2003-07-04 Zack Weinberg <zack@codesourcery.com>
* Makefile.in: Remove unnecessary capabilities for
installation, build of shared libraries, generation of
distribution tarballs, etc. Fix all the places that rely on
the parent directory. Don't generate libgnuintl.h from
anything; do generate $(objdir)/libintl.h from libgnuintl.h if
necessary. Adjust DEFS for use of config.h.
* libgnuintl.h.in: Rename libgnuintl.h.
* README: New file.
* config.charset, ref-add.sin, ref-del.sin: Delete (unused).
* COPYING.LIB-2.0, COPYING.LIB-2.1: Delete (redundant).
* aclocal.m4: New; generated per instructions in gettext manual.
* configure.in: New; written from scratch for this configuration.
* configure, config.h.in: Generated.
2003-05-22 GNU <bug-gnu-gettext@gnu.org>
* Version 0.12.1 released.
>>>>>>> upstream
* gettext-runtime/intl/localename.c: Wrap langinfo.h include with same
ifdefs used in the source later on.

33
gcc/intl/aclocal.m4 vendored
View File

@ -1,33 +0,0 @@
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_include([../config/codeset.m4])
m4_include([../config/gettext.m4])
m4_include([../config/glibc21.m4])
m4_include([../config/iconv.m4])
m4_include([../config/intdiv0.m4])
m4_include([../config/inttypes-pri.m4])
m4_include([../config/inttypes.m4])
m4_include([../config/inttypes_h.m4])
m4_include([../config/lcmessage.m4])
m4_include([../config/lib-ld.m4])
m4_include([../config/lib-link.m4])
m4_include([../config/lib-prefix.m4])
m4_include([../config/nls.m4])
m4_include([../config/override.m4])
m4_include([../config/po.m4])
m4_include([../config/progtest.m4])
m4_include([../config/stdint_h.m4])
m4_include([../config/uintmax_t.m4])
m4_include([../config/ulonglong.m4])

280
gcc/intl/config.h.in
View File

@ -1,280 +0,0 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
*/
#undef CRAY_STACKSEG_END
/* Define to 1 if using `alloca.c'. */
#undef C_ALLOCA
/* Define because we depend on libiconv. */
#undef DEPENDS_ON_LIBICONV
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
/* Define to enable relocation. */
#undef ENABLE_RELOCATABLE
/* Define to 1 if you have `alloca', as a function or macro. */
#undef HAVE_ALLOCA
/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
*/
#undef HAVE_ALLOCA_H
/* Define to 1 if you have the <argz.h> header file. */
#undef HAVE_ARGZ_H
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
#undef HAVE_DCGETTEXT
/* Define to 1 if you have the `feof_unlocked' function. */
#undef HAVE_FEOF_UNLOCKED
/* Define to 1 if you have the `fgets_unlocked' function. */
#undef HAVE_FGETS_UNLOCKED
/* Define to 1 if you have the `getcwd' function. */
#undef HAVE_GETCWD
/* Define to 1 if you have the `getc_unlocked' function. */
#undef HAVE_GETC_UNLOCKED
/* Define to 1 if you have the `getegid' function. */
#undef HAVE_GETEGID
/* Define to 1 if you have the `geteuid' function. */
#undef HAVE_GETEUID
/* Define to 1 if you have the `getgid' function. */
#undef HAVE_GETGID
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Define to 1 if you have the `getuid' function. */
#undef HAVE_GETUID
/* Define if you have the iconv() function. */
#undef HAVE_ICONV
/* Define if <inttypes.h> exists and doesn't clash with <sys/types.h>. */
#undef HAVE_INTTYPES_H
/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
declares uintmax_t. */
#undef HAVE_INTTYPES_H_WITH_UINTMAX
/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
#undef HAVE_LANGINFO_CODESET
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the `mempcpy' function. */
#undef HAVE_MEMPCPY
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
/* Define to 1 if you have the `munmap' function. */
#undef HAVE_MUNMAP
/* Define to 1 if you have the <nl_types.h> header file. */
#undef HAVE_NL_TYPES_H
/* Define to 1 if you have the `putenv' function. */
#undef HAVE_PUTENV
/* Define to 1 if you have the `setenv' function. */
#undef HAVE_SETENV
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
/* Define to 1 if you have the <stddef.h> header file. */
#undef HAVE_STDDEF_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
uintmax_t. */
#undef HAVE_STDINT_H_WITH_UINTMAX
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the `stpcpy' function. */
#undef HAVE_STPCPY
/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
/* Define to 1 if you have the `strdup' function. */
#undef HAVE_STRDUP
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the `strtoul' function. */
#undef HAVE_STRTOUL
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the `tsearch' function. */
#undef HAVE_TSEARCH
/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
#undef HAVE_UINTMAX_T
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define if you have the unsigned long long type. */
#undef HAVE_UNSIGNED_LONG_LONG
/* Define to 1 if you have the `__argz_count' function. */
#undef HAVE___ARGZ_COUNT
/* Define to 1 if you have the `__argz_next' function. */
#undef HAVE___ARGZ_NEXT
/* Define to 1 if you have the `__argz_stringify' function. */
#undef HAVE___ARGZ_STRINGIFY
/* Define to 1 if you have the `__fsetlocking' function. */
#undef HAVE___FSETLOCKING
/* Define as const if the declaration of iconv() needs const. */
#undef ICONV_CONST
/* Define if integer division by zero raises signal SIGFPE. */
#undef INTDIV0_RAISES_SIGFPE
/* Define because this is libintl. */
#undef IN_LIBINTL
/* Define because this is a library. */
#undef IN_LIBRARY
/* Define if there is no xmalloc. */
#undef NO_XMALLOC
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
#undef PRI_MACROS_BROKEN
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Define to 1 if on MINIX. */
#undef _MINIX
/* Define to 2 if the system does not provide POSIX.1 features except with
this defined. */
#undef _POSIX_1_SOURCE
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
/* Define to `__inline__' or `__inline' if that's what the C compiler
calls it, or to nothing if 'inline' is not supported under any name. */
#ifndef __cplusplus
#undef inline
#endif
/* Define to `long int' if <sys/types.h> does not define. */
#undef off_t
/* Define this entry point correctly. */
#undef relocate
/* Define this entry point correctly. */
#undef set_relocation_prefix
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
/* Define to unsigned long or unsigned long long if <stdint.h> and
<inttypes.h> don't define. */
#undef uintmax_t

8164
gcc/intl/configure vendored
View File

File diff suppressed because it is too large Load Diff

51
gcc/intl/configure.ac
View File

@ -1,51 +0,0 @@
AC_INIT
AC_USE_SYSTEM_EXTENSIONS
AC_CONFIG_SRCDIR(gettext.c)
AC_CONFIG_HEADER(config.h)
AC_CONFIG_MACRO_DIR(../config)
AM_GNU_GETTEXT_VERSION(0.12.1)
AM_GNU_GETTEXT([], [need-ngettext])
# This replaces the extensive use of DEFS in the original Makefile.in.
AC_DEFINE(IN_LIBINTL, 1, [Define because this is libintl.])
AC_DEFINE(IN_LIBRARY, 1, [Define because this is a library.])
AC_DEFINE(DEPENDS_ON_LIBICONV, 1, [Define because we depend on libiconv.])
AC_DEFINE(ENABLE_RELOCATABLE, 1, [Define to enable relocation.])
AC_DEFINE(NO_XMALLOC, 1, [Define if there is no xmalloc.])
AC_DEFINE(set_relocation_prefix, libintl_set_relocation_prefix,
[Define this entry point correctly.])
AC_DEFINE(relocate, libintl_relocate,
[Define this entry point correctly.])
MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
AC_CHECK_PROGS([ACLOCAL], [aclocal], [$MISSING aclocal])
AC_CHECK_PROGS([AUTOCONF], [autoconf], [$MISSING autoconf])
AC_CHECK_PROGS([AUTOHEADER], [autoheader], [$MISSING autoheader])
AC_ARG_ENABLE(maintainer-mode,
[ --enable-maintainer-mode enable rules only needed by maintainers],,
enable_maintainer_mode=no)
if test "x$enable_maintainer_mode" = xno; then
MAINT='#'
else
MAINT=
fi
AC_SUBST(MAINT)
# Additional info for config.intl.
AC_SUBST(LIBINTL_DEP)
AC_SUBST(INCINTL)
LIBINTL_DEP=
INCINTL=
case $USE_INCLUDED_LIBINTL in
yes)
LIBINTL=`echo $LIBINTL | sed 's,${top_builddir},&/..,' `
LTLIBINTL=`echo $LTLIBINTL | sed 's,${top_builddir},&/..,' `
LIBINTL_DEP='${top_builddir}/../intl/libintl.a'
INCINTL='-I${top_builddir}/../intl'
;;
esac
AC_CONFIG_FILES(Makefile config.intl)
AC_OUTPUT

40
gcc/intl/libgnuintl.in.h
View File

@ -111,11 +111,7 @@ extern int libintl_version;
/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
its n-th argument literally. This enables GCC to warn for example about
printf (gettext ("foo %y")). */
<<<<<<< HEAD:gcc/intl/libgnuintl.in.h
#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus)
=======
#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && !(defined __clang__ && __clang__ && __clang_major__ >= 3) && defined __cplusplus)
>>>>>>> upstream:gcc/intl/libgnuintl.h
# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
#else
# define _INTL_MAY_RETURN_STRING_ARG(n)
@ -127,9 +123,7 @@ extern int libintl_version;
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_gettext (const char *__msgid)
_INTL_MAY_RETURN_STRING_ARG (1);
static inline
_INTL_MAY_RETURN_STRING_ARG (1)
char *gettext (const char *__msgid)
static inline char *gettext (const char *__msgid)
{
return libintl_gettext (__msgid);
}
@ -147,9 +141,7 @@ extern char *gettext (const char *__msgid)
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_dgettext (const char *__domainname, const char *__msgid)
_INTL_MAY_RETURN_STRING_ARG (2);
static inline
_INTL_MAY_RETURN_STRING_ARG (2)
char *dgettext (const char *__domainname, const char *__msgid)
static inline char *dgettext (const char *__domainname, const char *__msgid)
{
return libintl_dgettext (__domainname, __msgid);
}
@ -168,14 +160,8 @@ extern char *dgettext (const char *__domainname, const char *__msgid)
extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
int __category)
_INTL_MAY_RETURN_STRING_ARG (2);
<<<<<<< HEAD:gcc/intl/libgnuintl.in.h
static inline char *dcgettext (const char *__domainname, const char *__msgid,
int __category)
=======
static inline
_INTL_MAY_RETURN_STRING_ARG (2)
char *dcgettext (const char *__domainname, const char *__msgid, int __category)
>>>>>>> upstream:gcc/intl/libgnuintl.h
{
return libintl_dcgettext (__domainname, __msgid, __category);
}
@ -196,15 +182,8 @@ extern char *dcgettext (const char *__domainname, const char *__msgid,
extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
_INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
<<<<<<< HEAD:gcc/intl/libgnuintl.in.h
static inline char *ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
=======
static inline
_INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2)
char *ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
>>>>>>> upstream:gcc/intl/libgnuintl.h
{
return libintl_ngettext (__msgid1, __msgid2, __n);
}
@ -224,15 +203,8 @@ extern char *ngettext (const char *__msgid1, const char *__msgid2,
extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
const char *__msgid2, unsigned long int __n)
_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
<<<<<<< HEAD:gcc/intl/libgnuintl.in.h
static inline char *dngettext (const char *__domainname, const char *__msgid1,
const char *__msgid2, unsigned long int __n)
=======
static inline
_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3)
char *dngettext (const char *__domainname, const char *__msgid1,
const char *__msgid2, unsigned long int __n)
>>>>>>> upstream:gcc/intl/libgnuintl.h
{
return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
}
@ -254,17 +226,9 @@ extern char *libintl_dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
<<<<<<< HEAD:gcc/intl/libgnuintl.in.h
static inline char *dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
=======
static inline
_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3)
char *dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
>>>>>>> upstream:gcc/intl/libgnuintl.h
{
return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
}