diff options
| author | ryoon <ryoon@pkgsrc.org> | 2014-03-29 20:50:03 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2014-03-29 20:50:03 +0000 |
| commit | 96abbb50ac09426866f827bc33291464258bbfc4 (patch) | |
| tree | b48bd81805e25891e66c2af05a0e0bf50f8b993a /lang | |
| parent | 9f87b94af9263c20a1cb318f72d6b113e1aa6af4 (diff) | |
| download | pkgsrc-96abbb50ac09426866f827bc33291464258bbfc4.tar.gz | |
Fix PR pkg/48670, fix build under NetBSD/i386 5.2
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc46/distinfo | 3 | ||||
| -rw-r--r-- | lang/gcc46/patches/patch-gcc_config_i386_i386.c | 32 |
2 files changed, 34 insertions, 1 deletions
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index 14a7fec2976..61448c846ee 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2014/01/25 13:38:47 ryoon Exp $ +$NetBSD: distinfo,v 1.15 2014/03/29 20:50:03 ryoon Exp $ SHA1 (gcc-4.6.4.tar.bz2) = 63933a8a5cf725626585dbba993c8b0f6db1335d RMD160 (gcc-4.6.4.tar.bz2) = 6a58b053812cf75622bc4579e020cd9471f46916 @@ -29,6 +29,7 @@ SHA1 (patch-gcc_config_arm_elf.h) = 28c67bb698ebe9a3aa45c4cff29f028c82cc7606 SHA1 (patch-gcc_config_arm_t-netbsd) = a1682f4f8dc7e393446f19f615737ddfc98fcb7f SHA1 (patch-gcc_config_exec-stack.h) = 2ff8a153a41638de2943c4109f38ea3a7c26c00d SHA1 (patch-gcc_config_host-openbsd.c) = 109ce33dbbc19c988637d77dce4d240d6bfc912c +SHA1 (patch-gcc_config_i386_i386.c) = 49ba75bb347a9c96606a7bef7e0f972488d881b3 SHA1 (patch-gcc_config_i386_openbsd.h) = 0adb1e531eb9d773cbd6944f279e949e59035bd3 SHA1 (patch-gcc_config_i386_openbsd64.h) = c4fdb98de196702afad36a75886967babf49a55a SHA1 (patch-gcc_config_i386_openbsdelf.h) = cd7afa938514dc80fb53c683fb089468c935d2ae diff --git a/lang/gcc46/patches/patch-gcc_config_i386_i386.c b/lang/gcc46/patches/patch-gcc_config_i386_i386.c new file mode 100644 index 00000000000..f021d955375 --- /dev/null +++ b/lang/gcc46/patches/patch-gcc_config_i386_i386.c @@ -0,0 +1,32 @@ +$NetBSD: patch-gcc_config_i386_i386.c,v 1.1 2014/03/29 20:50:03 ryoon Exp $ + +* Fix PR pkg/48670. + Fix build under NetBSD/i386 5.2 at least. + From http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/5dd34005fbf5509736906dc6aa56d3e77f6a3dcb?hp=9d5dccab15766b547c37d9b452e0971d340a6453 + +--- gcc/config/i386/i386.c.orig 2013-04-02 16:54:58.000000000 +0000 ++++ gcc/config/i386/i386.c +@@ -59,6 +59,9 @@ along with GCC; see the file COPYING3. + #include "sched-int.h" + #include "sbitmap.h" + #include "fibheap.h" ++#if defined(__NetBSD__) ++#include <sys/param.h> ++#endif + + enum upper_128bits_state + { +@@ -32185,9 +32188,13 @@ ix86_mangle_type (const_tree type) + static tree + ix86_stack_protect_fail (void) + { ++#if defined(__NetBSD__) && ( __NetBSD_Version__ >= 500000000) && ( __NetBSD_Version__ < 600000000) ++ return default_external_stack_protect_fail (); ++#else + return TARGET_64BIT + ? default_external_stack_protect_fail () + : default_hidden_stack_protect_fail (); ++#endif + } + + /* Select a format to encode pointers in exception handling data. CODE |