aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/ch/ChangeLog7
-rw-r--r--gcc/ch/Makefile.in31
-rw-r--r--gcc/ch/config-lang.in3
-rw-r--r--gcc/configure.in2
-rw-r--r--gcc/f/ChangeLog6
-rw-r--r--gcc/f/Makefile.in10
-rw-r--r--gcc/intl/ChangeLog16
-rw-r--r--gcc/intl/Makefile.in5
-rw-r--r--gcc/intl/dcgettext.c9
-rw-r--r--gcc/intl/explodename.c5
-rw-r--r--gcc/intl/l10nflist.c6
-rw-r--r--gcc/intl/loadmsgcat.c2
-rw-r--r--gcc/intl/localealias.c26
-rw-r--r--gcc/java/ChangeLog6
-rw-r--r--gcc/java/Make-lang.in2
-rw-r--r--gcc/java/Makefile.in10
-rw-r--r--gcc/po/ChangeLog4
-rw-r--r--gcc/po/Makefile.in.in2
18 files changed, 111 insertions, 41 deletions
diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog
index 708cba3..18e04ff 100644
--- a/gcc/ch/ChangeLog
+++ b/gcc/ch/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-04 Philipp Thomas <pthomas@suse.de>
+
+ * Makefile.in(INTLLIBS): New macro.
+ (LIBS): Add INTLLIBS.
+ (DEPLIBS): Likewise.
+ * config-lang(outputs): Specify ch/Makefile.
+
Sat Jun 3 15:31:07 2000 Jeffrey A Law (law@cygnus.com)
* chill.texi (INFO-DIR-ENTRY): Fix chill entry.
diff --git a/gcc/ch/Makefile.in b/gcc/ch/Makefile.in
index 7e9e229..65a2aa3 100644
--- a/gcc/ch/Makefile.in
+++ b/gcc/ch/Makefile.in
@@ -54,7 +54,7 @@ T_CFLAGS =
X_CPPFLAGS =
T_CPPFLAGS =
-CC = cc
+CC = @CC@
AR = ar
AR_FLAGS = rc
SHELL = /bin/sh
@@ -81,18 +81,25 @@ GCC_CFLAGS=$(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS)
program_transform_name =
objdir = .
-target= ... `configure' substitutes actual target name here.
-xmake_file= ... `configure' substitutes actual x- file name here.
-tmake_file= ... `configure' substitutes actual t- file name here.
+target=@target@
+xmake_file=@dep_host_xmake_file@
+tmake_file=@dep_tmake_file@
#version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c`
#mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c`
# Directory where sources are, from where we are.
-srcdir = .
+srcdir = @srcdir@
+VPATH = @srcdir@
# CYGNUS LOCAL
# Directory where texinfo.tex lives
-texidir = $(srcdir)/../../texinfo
+# texidir = $(srcdir)/../../texinfo
+
+# Top build directory, relative to here.
+top_builddir = ..
+
+# Internationalization library.
+INTLLIBS = @INTLLIBS@
# Additional system libraries to link with.
CLIB=
@@ -111,17 +118,23 @@ all: all.indirect
# sed inserts variable overrides after the following line.
####target overrides
+@target_overrides@
####host overrides
+@host_overrides@
####cross overrides
+@cross_defines@
+@cross_overrides@
####build overrides
+@build_overrides@
####site overrides
+# @site_overrides@
#
# Now figure out from those variables how to compile and link.
all.indirect: Makefile ../chill ../cc1chill$(exeext)
# IN_GCC tells obstack.h that we are using gcc's <stddef.h> file.
-INTERNAL_CFLAGS = $(CROSS) -DIN_GCC
+INTERNAL_CFLAGS = $(CROSS) -DIN_GCC @extra_c_flags@
# This is the variable actually used when we compile.
ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) $(CFLAGS) $(XCFLAGS)
@@ -134,8 +147,8 @@ LIBIBERTY = ../../libiberty/libiberty.a
# How to link with both our special library facilities
# and the system's installed libraries.
-LIBS = $(LIBIBERTY) $(CLIB)
-LIBDEPS = $(LIBIBERTY)
+LIBS = $(LIBIBERTY) $(CLIB) $(INTLLIBS)
+LIBDEPS = $(INTLLIBS) $(LIBIBERTY)
# Specify the directories to be searched for header files.
# Both . and srcdir are used, in that order,
diff --git a/gcc/ch/config-lang.in b/gcc/ch/config-lang.in
index 8c9aa95..1f2ebf6 100644
--- a/gcc/ch/config-lang.in
+++ b/gcc/ch/config-lang.in
@@ -33,3 +33,6 @@ compilers="cc1chill\$(exeext)"
stagestuff="chill chill-cross\$(exeext) cc1chill\$(exeext)"
diff_excludes="-x -x ch/chill.info*"
+
+outputs=ch/Makefile
+
diff --git a/gcc/configure.in b/gcc/configure.in
index 5c12b78..a49d88a 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -378,6 +378,8 @@ else
AC_MSG_RESULT(no)
fi
+AC_C_INLINE
+
# Find some useful tools
AC_PROG_AWK
AC_PROG_LEX
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index a37deec..a60d88c 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-04 Philipp Thomas <pthomas@suse.de>
+
+ * Makefile.in(INTLLIBS): New macro.
+ (LIBS): Add INTLLIBS.
+ (DEPLIBS): Likewise.
+
2000-06-02 Richard Henderson <rth@cygnus.com>
* com.c (lang_get_alias_set): New.
diff --git a/gcc/f/Makefile.in b/gcc/f/Makefile.in
index 1f93e55..301716b 100644
--- a/gcc/f/Makefile.in
+++ b/gcc/f/Makefile.in
@@ -88,6 +88,12 @@ VPATH = @srcdir@
# Additional system libraries to link with.
CLIB=
+# Top build directory, relative to here.
+top_builddir = ..
+
+# Internationalization library.
+INTLLIBS = @INTLLIBS@
+
# Choose the real default target.
ALL=all
@@ -135,8 +141,8 @@ LDFLAGS=$(BOOT_LDFLAGS)
# How to link with both our special library facilities
# and the system's installed libraries.
-LIBS = $(LIBIBERTY) $(CLIB)
-LIBDEPS = $(LIBIBERTY)
+LIBS = $(LIBIBERTY) $(CLIB) $(INTLLIBS)
+LIBDEPS = $(INTLLIBS) $(LIBIBERTY)
# Specify the directories to be searched for header files.
# Both . and srcdir are used, in that order,
diff --git a/gcc/intl/ChangeLog b/gcc/intl/ChangeLog
index 1989501..00452d8 100644
--- a/gcc/intl/ChangeLog
+++ b/gcc/intl/ChangeLog
@@ -1,3 +1,19 @@
+2000-06-06 Philipp Thomas <pthomas@suse.de>
+ * Makefile.in: Add -DIN_GCC to DEFS, add appropriate -I switches.
+ * dcgettext.c: Define _GNU_SOURCE before any system header is
+ included. Guard getcwd declaration with HAVE_DECL_GETCWD.
+ * loadmsgcat.c (_nl_load_domain): Cast st.st_size in compaison to
+ size_t.
+ * localealias.c: Define _GNU_SOURCE before any system header is
+ included. Don't use return value of memcpy because it could be a
+ macro defined in terms of bcopy.
+ (read_alias_file): Remove HAVE_MEMCPY guard and just don't use the
+ return value of memcpy. Cast argument to fgets and strlen to char *.
+ * explodename.c (_nl_explode_name): Cast codeset to unsigned char **
+ in call to _nl_normalize_codeset.
+ * l10nflist.c: Define _GNU_SOURCE before any system header is
+ included.
+
1998-04-29 Ulrich Drepper <drepper@cygnus.com>
* intl/localealias.c (read_alias_file): Use unsigned char for
diff --git a/gcc/intl/Makefile.in b/gcc/intl/Makefile.in
index 9a877c8..489adf9 100644
--- a/gcc/intl/Makefile.in
+++ b/gcc/intl/Makefile.in
@@ -48,7 +48,7 @@ CC = @CC@
LIBTOOL = @LIBTOOL@
RANLIB = @RANLIB@
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
+DEFS = -DIN_GCC -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
-DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@
CPPFLAGS = @CPPFLAGS@
CFLAGS = @CFLAGS@
@@ -79,7 +79,8 @@ DISTFILES.gettext = libintl.glibc intlh.inst.in
.c.lo:
$(LIBTOOL) --mode=compile $(COMPILE) $<
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
+INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib -I$(srcdir)/.. \
+-I$(srcdir)/../config -I$(srcdir)/../../include
all: all-@USE_INCLUDED_LIBINTL@
diff --git a/gcc/intl/dcgettext.c b/gcc/intl/dcgettext.c
index c4c7a2c..4399b71 100644
--- a/gcc/intl/dcgettext.c
+++ b/gcc/intl/dcgettext.c
@@ -19,6 +19,10 @@
# include <config.h>
#endif
+# ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+# endif
+
#include <sys/types.h>
#ifdef __GNUC__
@@ -58,9 +62,6 @@ void free ();
#endif
#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-# endif
# include <string.h>
#else
# include <strings.h>
@@ -98,7 +99,7 @@ void free ();
# if !defined HAVE_GETCWD
char *getwd ();
# define getcwd(buf, max) getwd (buf)
-# else
+# elif !defined (HAVE_DECL_GETCWD)
char *getcwd ();
# endif
# ifndef HAVE_STPCPY
diff --git a/gcc/intl/explodename.c b/gcc/intl/explodename.c
index 8066dc2..5186d1f 100644
--- a/gcc/intl/explodename.c
+++ b/gcc/intl/explodename.c
@@ -108,8 +108,9 @@ _nl_explode_name (name, language, modifier, territory, codeset,
if (*codeset != cp && (*codeset)[0] != '\0')
{
- *normalized_codeset = _nl_normalize_codeset (*codeset,
- cp - *codeset);
+ *normalized_codeset = _nl_normalize_codeset (
+ *((unsigned char **) codeset),
+ cp - *codeset);
if (strcmp (*codeset, *normalized_codeset) == 0)
free ((char *) *normalized_codeset);
else
diff --git a/gcc/intl/l10nflist.c b/gcc/intl/l10nflist.c
index 9c7dc18..f02d218 100644
--- a/gcc/intl/l10nflist.c
+++ b/gcc/intl/l10nflist.c
@@ -20,11 +20,11 @@
# include <config.h>
#endif
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-# endif
# include <string.h>
#else
# include <strings.h>
diff --git a/gcc/intl/loadmsgcat.c b/gcc/intl/loadmsgcat.c
index 4dfb687..f05946e 100644
--- a/gcc/intl/loadmsgcat.c
+++ b/gcc/intl/loadmsgcat.c
@@ -91,7 +91,7 @@ _nl_load_domain (domain_file)
/* We must know about the size of the file. */
if (fstat (fd, &st) != 0
- || (size = (size_t) st.st_size) != st.st_size
+ || (size = (size_t) st.st_size) != (size_t) st.st_size
|| size < sizeof (struct mo_file_header))
{
/* Something went wrong. */
diff --git a/gcc/intl/localealias.c b/gcc/intl/localealias.c
index bca555a..7c2f6cc 100644
--- a/gcc/intl/localealias.c
+++ b/gcc/intl/localealias.c
@@ -20,6 +20,10 @@
# include <config.h>
#endif
+# ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+# endif
+
#include <ctype.h>
#include <stdio.h>
#include <sys/types.h>
@@ -53,9 +57,6 @@ void free ();
#endif
#if defined HAVE_STRING_H || defined _LIBC
-# ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-# endif
# include <string.h>
#else
# include <strings.h>
@@ -227,13 +228,8 @@ read_alias_file (fname, fname_len)
full_fname = (char *) alloca (fname_len + sizeof aliasfile);
ADD_BLOCK (block_list, full_fname);
-#ifdef HAVE_MEMPCPY
- mempcpy (mempcpy (full_fname, fname, fname_len),
- aliasfile, sizeof aliasfile);
-#else
memcpy (full_fname, fname, fname_len);
memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
-#endif
fp = fopen (full_fname, "r");
if (fp == NULL)
@@ -255,7 +251,7 @@ read_alias_file (fname, fname_len)
unsigned char *value;
unsigned char *cp;
- if (fgets (buf, sizeof buf, fp) == NULL)
+ if (fgets ((char *)buf, sizeof buf, fp) == NULL)
/* EOF reached. */
break;
@@ -314,8 +310,8 @@ read_alias_file (fname, fname_len)
if (nmap >= maxmap)
extend_alias_table ();
- alias_len = strlen (alias) + 1;
- value_len = strlen (value) + 1;
+ alias_len = strlen ((char *)alias) + 1;
+ value_len = strlen ((char *)value) + 1;
if (string_space_act + alias_len + value_len > string_space_max)
{
@@ -333,12 +329,12 @@ read_alias_file (fname, fname_len)
string_space_max = new_size;
}
- map[nmap].alias = memcpy (&string_space[string_space_act],
- alias, alias_len);
+ memcpy (&string_space[string_space_act], alias, alias_len);
+ map[nmap].alias = &string_space[string_space_act];
string_space_act += alias_len;
- map[nmap].value = memcpy (&string_space[string_space_act],
- value, value_len);
+ memcpy (&string_space[string_space_act], value, value_len);
+ map[nmap].value = &string_space[string_space_act];
string_space_act += value_len;
++nmap;
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index ff312a12..3bb303d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-04 Philipp Thomas <pthomas@suse.de>
+
+ * Makefile.in (INTLLIBS): New.
+ (LIBS): Add above.
+ (DEPLIBS): Ditto.
+
Fri Jun 2 16:48:55 2000 Alexandre Petit-Bianco <apbianco@cygnus.com>
* class.c (get_dispatch_table): Build the vtable dummy entry list
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 7e72c9e..350398a 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -110,6 +110,8 @@ GCJH_SOURCES = $(srcdir)/java/gjavah.c $(srcdir)/java/jcf-io.c \
gcjh$(exeext): $(GCJH_SOURCES) $(LIBDEPS) $(TREE_H)
cd java && $(MAKE) $(LANG_FLAGS_TO_PASS) $(JAVA_FLAGS_TO_PASS) ../gcjh$(exeext)
+$(INTL_TARGETS): $(srcdir)/java/parse.c $(srcdir)/java/parse-scan.c
+
# This must be kept in sync with dependencies in Makefile.in.
JV_SCAN_SOURCES = $(srcdir)/java/parse-scan.y $(srcdir)/java/lex.c \
$(srcdir)/java/parse.h $(srcdir)/java/lex.h $(srcdir)/java/jv-scan.c
diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in
index e5c573c..bbb42d2 100644
--- a/gcc/java/Makefile.in
+++ b/gcc/java/Makefile.in
@@ -102,6 +102,12 @@ libgcj_zip = $(datadir)/libgcj.zip
# Additional system libraries to link with.
CLIB=
+# Top build directory, relative to here.
+top_builddir = ..
+
+# Internationalization library.
+INTLLIBS = @INTLLIBS@
+
# Choose the real default target.
ALL=all
@@ -144,8 +150,8 @@ LIBIBERTY = ../../libiberty/libiberty.a
# How to link with both our special library facilities
# and the system's installed libraries.
-LIBS = $(LIBIBERTY) $(CLIB)
-LIBDEPS = $(LIBIBERTY) ../errors.o
+LIBS = $(INTLLIBS) $(LIBIBERTY) $(CLIB)
+LIBDEPS = $(INTLLIBS) $(LIBIBERTY) ../errors.o
# Specify the directories to be searched for header files.
# Both . and srcdir are used, in that order,
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index d65ee37..448adf2 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-06 Philipp Thomas <pthomas@suse.de>
+
+ * Makefile.in.in: Add --define switch for xgettext.
+
2000-05-30 Philipp Thomas <pthomas@suse.de>
* Makefile.in.in: Create compiled catalogs in objdir, not
diff --git a/gcc/po/Makefile.in.in b/gcc/po/Makefile.in.in
index 1a01bb5..a2b0340 100644
--- a/gcc/po/Makefile.in.in
+++ b/gcc/po/Makefile.in.in
@@ -85,7 +85,7 @@ all-no:
$(srcdir)/$(PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword=_ --keyword=N_ \
- --files-from=$(srcdir)/POTFILES.in \
+ --files-from=$(srcdir)/POTFILES.in --defines \
&& test ! -f $(PACKAGE).po \
|| ( rm -f $(srcdir)/$(PACKAGE).pot \
&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
generated by cgit v1.1 at 2025-03-09 21:54:24 +0000