$OpenBSD: patch-include_private_gcconfig_h,v 1.18 2013/06/01 21:05:28 kurt Exp $
--- include/private/gcconfig.h.orig	Thu Aug  9 16:25:13 2012
+++ include/private/gcconfig.h	Tue Mar 19 19:39:39 2013
@@ -842,10 +842,11 @@
 #   ifdef OPENBSD
 #     define OS_TYPE "OPENBSD"
 #     define ALIGNMENT 4
-#     ifdef GC_OPENBSD_THREADS
-#      define UTHREAD_SP_OFFSET 268
-#     else
-#       include <sys/param.h>
+#     include <sys/param.h>
+#     if defined(GC_OPENBSD_THREADS) && OpenBSD < 201211
+#       define UTHREAD_SP_OFFSET 268
+#     endif
+#     ifndef GC_OPENBSD_THREADS
 #       include <uvm/uvm_extern.h>
 #       define STACKBOTTOM USRSTACK
 #     endif
@@ -1044,10 +1045,11 @@
 #   endif
 #   ifdef OPENBSD
 #     define OS_TYPE "OPENBSD"
-#     ifdef GC_OPENBSD_THREADS
-#      define UTHREAD_SP_OFFSET 232
-#     else
-#       include <sys/param.h>
+#     include <sys/param.h>
+#     if defined(GC_OPENBSD_THREADS) && OpenBSD < 201211
+#       define UTHREAD_SP_OFFSET 232
+#     endif
+#     ifndef GC_OPENBSD_THREADS
 #       include <uvm/uvm_extern.h>
 #       define STACKBOTTOM USRSTACK
 #     endif
@@ -1321,10 +1323,11 @@
 #   endif
 #   ifdef OPENBSD
 #       define OS_TYPE "OPENBSD"
-#       ifdef GC_OPENBSD_THREADS
+#       include <sys/param.h>
+#       if defined(GC_OPENBSD_THREADS) && OpenBSD < 201211
 #         define UTHREAD_SP_OFFSET 176
-#       else
-#         include <sys/param.h>
+#       endif
+#       ifndef GC_OPENBSD_THREADS
 #         include <uvm/uvm_extern.h>
 #         define STACKBOTTOM USRSTACK
 #       endif
@@ -1556,10 +1559,11 @@
 #  ifdef OPENBSD
 #    define OS_TYPE "OPENBSD"
 #    define ALIGNMENT 4
-#    ifdef GC_OPENBSD_THREADS
+#    include <sys/param.h>
+#    if defined(GC_OPENBSD_THREADS) && OpenBSD < 201211
 #      define UTHREAD_SP_OFFSET 808
-#    else
-#      include <sys/param.h>
+#    endif
+#    ifndef GC_OPENBSD_THREADS
 #      include <uvm/uvm_extern.h>
 #      define STACKBOTTOM USRSTACK
 #    endif
@@ -1634,10 +1638,11 @@
 #   endif /* LINUX */
 #  ifdef OPENBSD
 #     define OS_TYPE "OPENBSD"
-#     ifdef GC_OPENBSD_THREADS
+#     include <sys/param.h>
+#     if defined(GC_OPENBSD_THREADS) && OpenBSD < 201211
 #       define UTHREAD_SP_OFFSET 520
-#     else
-#       include <sys/param.h>
+#     endif
+#     ifndef GC_OPENBSD_THREADS
 #       include <uvm/uvm_extern.h>
 #       define STACKBOTTOM USRSTACK
 #     endif
@@ -1666,10 +1671,11 @@
 #   ifdef OPENBSD
 #       define OS_TYPE "OPENBSD"
 #       define ELF_CLASS ELFCLASS64
-#       ifdef GC_OPENBSD_THREADS
+#       include <sys/param.h>
+#       if defined(GC_OPENBSD_THREADS) && OpenBSD < 201211
 #         define UTHREAD_SP_OFFSET 816
-#       else
-#         include <sys/param.h>
+#       endif
+#       ifndef GC_OPENBSD_THREADS
 #         include <uvm/uvm_extern.h>
 #         define STACKBOTTOM USRSTACK
 #       endif
@@ -1973,10 +1979,11 @@
 #   ifdef OPENBSD
 #     define ALIGNMENT 4
 #     define OS_TYPE "OPENBSD"
-#     ifdef GC_OPENBSD_THREADS
+#     include <sys/param.h>
+#     if defined(GC_OPENBSD_THREADS) && OpenBSD < 201211
 #       define UTHREAD_SP_OFFSET 176
-#     else
-#       include <sys/param.h>
+#     endif
+#     ifndef GC_OPENBSD_THREADS
 #       include <uvm/uvm_extern.h>
 #       define STACKBOTTOM USRSTACK
 #     endif
@@ -2032,10 +2039,11 @@
 #   endif
 #   ifdef OPENBSD
 #      define OS_TYPE "OPENBSD"
-#      ifdef GC_OPENBSD_THREADS
+#      include <sys/param.h>
+#      if defined(GC_OPENBSD_THREADS) && OpenBSD < 201211
 #        define UTHREAD_SP_OFFSET 332
-#      else
-#        include <sys/param.h>
+#      endif
+#      ifndef GC_OPENBSD_THREADS
 #        include <uvm/uvm_extern.h>
 #        define STACKBOTTOM USRSTACK
 #      endif
@@ -2099,10 +2107,11 @@
 #   ifdef OPENBSD
 #       define OS_TYPE "OPENBSD"
 #       define ELF_CLASS ELFCLASS64
-#       ifdef GC_OPENBSD_THREADS
+#       include <sys/param.h>
+#       if defined(GC_OPENBSD_THREADS) && OpenBSD < 201211
 #         define UTHREAD_SP_OFFSET 400
-#       else
-#         include <sys/param.h>
+#       endif
+#       ifndef GC_OPENBSD_THREADS
 #         include <uvm/uvm_extern.h>
 #         define STACKBOTTOM USRSTACK
 #       endif
