- define _REENTRANT, not _POSIX_THREADS for -pthread
- sync kprintf formats with base looks ok to kurt@
This commit is contained in:
pascal
parent
7db97b1c58
commit
b15c7fe082
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2012/04/09 11:55:53 pascal Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2012/04/23 14:16:34 pascal Exp $
|
||||
|
||||
ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
|
||||
|
||||
@ -18,14 +18,14 @@ PKGNAME-objc = gobjc-${FULL_PKGVERSION}
|
||||
PKGNAME-ada = gnat-${FULL_PKGVERSION}
|
||||
PKGNAME-go = gccgo-${FULL_PKGVERSION}
|
||||
|
||||
REVISION-main = 1
|
||||
REVISION-c++ = 1
|
||||
REVISION-main = 2
|
||||
REVISION-c++ = 2
|
||||
REVISION-estdc = 1
|
||||
REVISION-f95 = 1
|
||||
REVISION-java = 1
|
||||
REVISION-objc = 1
|
||||
REVISION-ada = 1
|
||||
REVISION-go = 1
|
||||
REVISION-f95 = 2
|
||||
REVISION-java = 2
|
||||
REVISION-objc = 2
|
||||
REVISION-ada = 2
|
||||
REVISION-go = 2
|
||||
|
||||
SHARED_LIBS = estdc++ 14.0 \
|
||||
gfortran 3.0 \
|
||||
@ -106,7 +106,7 @@ CONFIGURE_STYLE = gnu
|
||||
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC} ${WRKSRC}/gcc
|
||||
|
||||
EXTRA_ENV += am_cv_func_iconv=no JAR=no
|
||||
EXTRA_ENV += ac_cv_prog_CONFIGURED_M4=/usr/bin/m4
|
||||
EXTRA_ENV += ac_cv_prog_M4=/usr/bin/m4
|
||||
MAKE_FLAGS += ac_cv_path_mkdir=/bin/mkdir
|
||||
|
||||
CONFIGURE_ENV += ${EXTRA_ENV}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-gcc_c-family_c-format_c,v 1.1.1.1 2011/11/14 13:00:57 pascal Exp $
|
||||
$OpenBSD: patch-gcc_c-family_c-format_c,v 1.2 2012/04/23 14:16:34 pascal Exp $
|
||||
--- gcc/c-family/c-format.c.orig Mon Dec 6 01:56:06 2010
|
||||
+++ gcc/c-family/c-format.c Sat Nov 12 12:39:38 2011
|
||||
+++ gcc/c-family/c-format.c Thu Apr 12 14:26:08 2012
|
||||
@@ -61,6 +61,7 @@ set_Wformat (int setting)
|
||||
format_type_error. Target-specific format types do not have
|
||||
matching enum values. */
|
||||
@ -23,10 +23,10 @@ $OpenBSD: patch-gcc_c-family_c-format_c,v 1.1.1.1 2011/11/14 13:00:57 pascal Exp
|
||||
|
||||
+static const format_length_info kprintf_length_specs[] =
|
||||
+{
|
||||
+ { "h", FMT_LEN_h, STD_C89, NULL, 0, 0, 0 },
|
||||
+ { "h", FMT_LEN_h, STD_C89, NO_FMT, 0 },
|
||||
+ { "l", FMT_LEN_l, STD_C89, "ll", FMT_LEN_ll, STD_C9L, 0 },
|
||||
+ { "q", FMT_LEN_ll, STD_EXT, NULL, 0, 0, 0 },
|
||||
+ { "L", FMT_LEN_L, STD_C89, NULL, 0, 0, 0 },
|
||||
+ { "q", FMT_LEN_ll, STD_EXT, NO_FMT, 0 },
|
||||
+ { "L", FMT_LEN_L, STD_C89, NO_FMT, 0 },
|
||||
+ { NO_FMT, NO_FMT, 0 }
|
||||
+};
|
||||
+
|
||||
@ -41,26 +41,24 @@ $OpenBSD: patch-gcc_c-family_c-format_c,v 1.1.1.1 2011/11/14 13:00:57 pascal Exp
|
||||
static const format_char_info print_char_table[] =
|
||||
{
|
||||
/* C89 conversion specifiers. */
|
||||
@@ -664,6 +674,46 @@ static const format_char_info asm_fprintf_char_table[]
|
||||
@@ -664,6 +674,44 @@ static const format_char_info asm_fprintf_char_table[]
|
||||
{ NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
+static const format_char_info kprint_char_table[] =
|
||||
+{
|
||||
+ /* C89 conversion specifiers. */
|
||||
+ { "di", 0, STD_C89, { T89_I, T99_SC, T89_S, T89_L, T9L_LL, TEX_LL, T99_SST, T99_PD, T99_IM }, "-wp0 +'I", "i", NULL },
|
||||
+ { "oxX", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0#", "i", NULL },
|
||||
+ { "u", 0, STD_C89, { T89_UI, T99_UC, T89_US, T89_UL, T9L_ULL, TEX_ULL, T99_ST, T99_UPD, T99_UIM }, "-wp0'I", "i", NULL },
|
||||
+ { "c", 0, STD_C89, { T89_I, BADLEN, BADLEN, T94_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL },
|
||||
+ { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, T94_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR", NULL },
|
||||
+ { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "c", NULL },
|
||||
+ { "di", 0, STD_C89, { T89_I, BADLEN, T89_S, T89_L, T9L_LL, BADLEN, T99_SST, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +'I", "i", NULL },
|
||||
+ { "oxX", 0, STD_C89, { T89_UI, BADLEN, T89_US, T89_UL, T9L_ULL, BADLEN, T99_ST, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0#", "i", NULL },
|
||||
+ { "u", 0, STD_C89, { T89_UI, BADLEN, T89_US, T89_UL, T9L_ULL, BADLEN, T99_ST, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0'I", "i", NULL },
|
||||
+ { "c", 0, STD_C89, { T89_I, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL },
|
||||
+ { "s", 1, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR", NULL },
|
||||
+ { "p", 1, STD_C89, { T89_V, BADLEN, BADLEN, T89_UL, T9L_LL, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0", "c", NULL },
|
||||
+/* Kernel bitmap formatting */
|
||||
+ { "b", 1, STD_C89, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "", NULL },
|
||||
+/* Kernel recursive format */
|
||||
+ { ":", 1, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "", NULL },
|
||||
+/* Kernel debugger auto-radix printing */
|
||||
+ { "nrz", 0, STD_C89, { T89_I, T89_I, T89_I, T89_L, T9L_LL, TEX_LL, BADLEN, BADLEN, BADLEN }, "-wp0# +", "", NULL },
|
||||
+ { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
|
||||
+ { "b", 0, STD_C89, { T89_I, BADLEN, T89_S, T89_L, T9L_LL, BADLEN, T99_SST, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "", kprint_char_table + 8 },
|
||||
+ { NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL },
|
||||
+/* Kernel bitmap formatting, second part - similar to "s" except for types[] */
|
||||
+ { "b", 1, STD_C89, { T89_C, BADLEN, T89_C, T89_C, T89_C, BADLEN, T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, NULL, "cR", NULL }
|
||||
+};
|
||||
+
|
||||
+static const format_char_info syslog_char_table[] =
|
||||
@ -82,13 +80,13 @@ $OpenBSD: patch-gcc_c-family_c-format_c,v 1.1.1.1 2011/11/14 13:00:57 pascal Exp
|
||||
+ { "C", 0, STD_EXT, { TEX_WI, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-w", "", NULL },
|
||||
+ { "S", 1, STD_EXT, { TEX_W, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "R", NULL },
|
||||
+ { "m", 0, STD_C89, { T89_V, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "", NULL },
|
||||
+ { NULL, 0, 0, NOLENGTHS, NULL, NULL, NULL }
|
||||
+ { NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL }
|
||||
+};
|
||||
+
|
||||
static const format_char_info gcc_diag_char_table[] =
|
||||
{
|
||||
/* C89 conversion specifiers. */
|
||||
@@ -839,6 +889,18 @@ static const format_kind_info format_types_orig[] =
|
||||
@@ -839,6 +887,18 @@ static const format_kind_info format_types_orig[] =
|
||||
FMT_FLAG_ARG_CONVERT|FMT_FLAG_EMPTY_PREC_OK,
|
||||
'w', 0, 'p', 0, 'L', 0,
|
||||
NULL, NULL
|
||||
|
||||
@ -1,15 +1,28 @@
|
||||
$OpenBSD: patch-gcc_config_openbsd_h,v 1.1 2012/03/31 20:02:03 pascal Exp $
|
||||
--- gcc/config/openbsd.h.orig Sun Mar 11 19:12:59 2012
|
||||
+++ gcc/config/openbsd.h Sun Mar 11 19:19:46 2012
|
||||
@@ -296,5 +296,11 @@ __enable_execute_stack (void *addr) \
|
||||
$OpenBSD: patch-gcc_config_openbsd_h,v 1.2 2012/04/23 14:16:34 pascal Exp $
|
||||
--- gcc/config/openbsd.h.orig Wed Dec 22 13:06:01 2010
|
||||
+++ gcc/config/openbsd.h Thu Apr 12 14:17:05 2012
|
||||
@@ -109,9 +109,9 @@ while (0)
|
||||
This two-stage defines makes it easy to pick that for targets that
|
||||
have subspecs. */
|
||||
#ifdef CPP_CPU_SPEC
|
||||
-#define OBSD_CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
|
||||
+#define OBSD_CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
|
||||
#else
|
||||
-#define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
|
||||
+#define OBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
|
||||
#endif
|
||||
|
||||
#undef LIB_SPEC
|
||||
@@ -295,6 +295,12 @@ __enable_execute_stack (void *addr) \
|
||||
if (mprotect (page, end - page, PROT_READ | PROT_WRITE | PROT_EXEC) < 0) \
|
||||
perror ("mprotect of trampoline code"); \
|
||||
}
|
||||
|
||||
+
|
||||
+/*
|
||||
+ * Disable the use of unsafe builtin functions, (strcat, strcpy, stpcpy),
|
||||
+ * making them easier to spot in the object files.
|
||||
+ */
|
||||
+#define NO_UNSAFE_BUILTINS
|
||||
+
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-gcc_config_rs6000_sysv4_h,v 1.2 2012/03/31 20:02:03 pascal Exp $
|
||||
$OpenBSD: patch-gcc_config_rs6000_sysv4_h,v 1.3 2012/04/23 14:16:34 pascal Exp $
|
||||
--- gcc/config/rs6000/sysv4.h.orig Mon Mar 7 08:50:23 2011
|
||||
+++ gcc/config/rs6000/sysv4.h Sun Mar 11 19:27:20 2012
|
||||
+++ gcc/config/rs6000/sysv4.h Thu Apr 12 14:17:27 2012
|
||||
@@ -405,6 +405,7 @@ do { \
|
||||
asm_fprintf (FILE, "%L%s", PREFIX)
|
||||
|
||||
@ -9,3 +9,12 @@ $OpenBSD: patch-gcc_config_rs6000_sysv4_h,v 1.2 2012/03/31 20:02:03 pascal Exp $
|
||||
#define GLOBAL_ASM_OP "\t.globl "
|
||||
|
||||
/* This says how to output assembler code to declare an
|
||||
@@ -918,7 +919,7 @@ ncrtn.o%s"
|
||||
#endif
|
||||
|
||||
#ifndef CPP_OS_OPENBSD_SPEC
|
||||
-#define CPP_OS_OPENBSD_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
|
||||
+#define CPP_OS_OPENBSD_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
|
||||
#endif
|
||||
|
||||
/* Define any extra SPECS that the compiler needs to generate. */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user