diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/Makefile.am | 2 | ||||
| -rw-r--r-- | libgo/Makefile.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index b185c9e..14baef5 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -d16e370c93e2866a961847a15f5001413e66d179 +c02de8ca63f52a2475ce8645edee3203a3c908ac The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/Makefile.am b/libgo/Makefile.am index 7be4997..85c5c77 100644 --- a/libgo/Makefile.am +++ b/libgo/Makefile.am @@ -40,7 +40,7 @@ AM_CPPFLAGS = -I $(srcdir)/runtime $(LIBFFIINCS) $(PTHREAD_CFLAGS) ACLOCAL_AMFLAGS = -I ./config -I ../config -AM_CFLAGS = -fexceptions -fnon-call-exceptions -fplan9-extensions \ +AM_CFLAGS = -fexceptions -fnon-call-exceptions \ $(SPLIT_STACK) $(WARN_CFLAGS) \ $(STRINGOPS_FLAG) $(HWCAP_CFLAGS) $(OSCFLAGS) \ -I $(srcdir)/../libgcc -I $(srcdir)/../libbacktrace \ diff --git a/libgo/Makefile.in b/libgo/Makefile.in index ac9f529..3cf1daa 100644 --- a/libgo/Makefile.in +++ b/libgo/Makefile.in @@ -458,7 +458,7 @@ WARN_CFLAGS = $(WARN_FLAGS) $(WERROR) # -I/-D flags to pass when compiling. AM_CPPFLAGS = -I $(srcdir)/runtime $(LIBFFIINCS) $(PTHREAD_CFLAGS) ACLOCAL_AMFLAGS = -I ./config -I ../config -AM_CFLAGS = -fexceptions -fnon-call-exceptions -fplan9-extensions \ +AM_CFLAGS = -fexceptions -fnon-call-exceptions \ $(SPLIT_STACK) $(WARN_CFLAGS) \ $(STRINGOPS_FLAG) $(HWCAP_CFLAGS) $(OSCFLAGS) \ -I $(srcdir)/../libgcc -I $(srcdir)/../libbacktrace \ |