summaryrefslogtreecommitdiff
path: root/debian/patches/pr66368.diff
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/pr66368.diff')
-rw-r--r--debian/patches/pr66368.diff16
1 files changed, 6 insertions, 10 deletions
diff --git a/debian/patches/pr66368.diff b/debian/patches/pr66368.diff
index 8493272..87b4c2e 100644
--- a/debian/patches/pr66368.diff
+++ b/debian/patches/pr66368.diff
@@ -1,26 +1,22 @@
# DP: PR go/66368, build libgo with -fno-stack-protector
-Index: b/src/libgo/Makefile.am
-===================================================================
--- a/src/libgo/Makefile.am
+++ b/src/libgo/Makefile.am
-@@ -42,6 +42,7 @@ AM_CPPFLAGS = -I $(srcdir)/runtime $(LIB
+@@ -47,6 +47,7 @@ AM_CPPFLAGS = -I $(srcdir)/runtime $(LIB
ACLOCAL_AMFLAGS = -I ./config -I ../config
- AM_CFLAGS = -fexceptions -fnon-call-exceptions -fplan9-extensions \
+ AM_CFLAGS = -fexceptions -fnon-call-exceptions \
+ -fno-stack-protector \
$(SPLIT_STACK) $(WARN_CFLAGS) \
- $(STRINGOPS_FLAG) $(OSCFLAGS) \
+ $(STRINGOPS_FLAG) $(HWCAP_CFLAGS) $(OSCFLAGS) \
-I $(srcdir)/../libgcc -I $(srcdir)/../libbacktrace \
-Index: b/src/libgo/Makefile.in
-===================================================================
--- a/src/libgo/Makefile.in
+++ b/src/libgo/Makefile.in
-@@ -513,6 +513,7 @@ WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
+@@ -547,6 +547,7 @@ WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
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 \
+ -fno-stack-protector \
$(SPLIT_STACK) $(WARN_CFLAGS) \
- $(STRINGOPS_FLAG) $(OSCFLAGS) \
+ $(STRINGOPS_FLAG) $(HWCAP_CFLAGS) $(OSCFLAGS) \
-I $(srcdir)/../libgcc -I $(srcdir)/../libbacktrace \