summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2013-02-12 19:57:06 +0000
committermiod <miod@openbsd.org>2013-02-12 19:57:06 +0000
commit12091a50ae4a44c6da1220a4763af390c6971bf8 (patch)
tree2060333a76a70bb0c7cd0f18a3d2dec0a5edee80
parentregen (diff)
downloadwireguard-openbsd-12091a50ae4a44c6da1220a4763af390c6971bf8.tar.xz
wireguard-openbsd-12091a50ae4a44c6da1220a4763af390c6971bf8.zip
Reenable the stack protector code, the last varargs change fixed the issue.
-rw-r--r--gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h9
-rw-r--r--gnu/usr.bin/gcc/gcc/config/m88k/openbsdelf.h9
2 files changed, 0 insertions, 18 deletions
diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h b/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h
index c1c30c61f9a..55d93679c14 100644
--- a/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h
+++ b/gnu/usr.bin/gcc/gcc/config/m88k/openbsd.h
@@ -98,15 +98,6 @@ __dcache_sync (addr, len) \
__asm __volatile ("tb0 0, r0, 451"); \
}
-/* Disable stack protector until the varargs code is fixed to interact
- correctly with it. */
-#undef OVERRIDE_OPTIONS
-#define OVERRIDE_OPTIONS \
- do { \
- m88k_override_options (); \
- flag_propolice_protection = flag_stack_protection = 0; \
- } while (0)
-
/* All configurations that don't use elf must be explicit about not using
dwarf unwind information. egcs doesn't try too hard to check internal
configuration files... */
diff --git a/gnu/usr.bin/gcc/gcc/config/m88k/openbsdelf.h b/gnu/usr.bin/gcc/gcc/config/m88k/openbsdelf.h
index e026c9731e5..485e725ea4b 100644
--- a/gnu/usr.bin/gcc/gcc/config/m88k/openbsdelf.h
+++ b/gnu/usr.bin/gcc/gcc/config/m88k/openbsdelf.h
@@ -124,15 +124,6 @@ __dcache_sync (addr, len) \
__asm __volatile ("tb0 0, %r0, 451"); \
}
-/* Disable stack protector until the varargs code is fixed to interact
- correctly with it. */
-#undef OVERRIDE_OPTIONS
-#define OVERRIDE_OPTIONS \
- do { \
- m88k_override_options (); \
- flag_propolice_protection = flag_stack_protection = 0; \
- } while (0)
-
#undef LINK_SPEC
#define LINK_SPEC \
"%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \