summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--onbld/debian/patches/bison.patch160
-rw-r--r--onbld/debian/patches/gnu-ld.patch25
-rw-r--r--onbld/debian/patches/series2
3 files changed, 187 insertions, 0 deletions
diff --git a/onbld/debian/patches/bison.patch b/onbld/debian/patches/bison.patch
new file mode 100644
index 0000000..2dd0c5a
--- /dev/null
+++ b/onbld/debian/patches/bison.patch
@@ -0,0 +1,160 @@
+Index: onbld/illumos-gate/usr/src/tools/ndrgen/ndr_parse.y
+===================================================================
+--- onbld.orig/illumos-gate/usr/src/tools/ndrgen/ndr_parse.y 2012-06-26 00:14:27.000000000 +0000
++++ onbld/illumos-gate/usr/src/tools/ndrgen/ndr_parse.y 2012-07-04 13:08:56.706211499 +0000
+@@ -55,11 +55,11 @@
+ %%
+
+ defn : /* empty */
+- | construct_list ={ construct_list = (struct node *)$1; }
++ | construct_list { construct_list = (struct node *)$1; }
+ ;
+
+ construct_list: construct
+- | construct_list construct ={ n_splice ($1,$2); }
++ | construct_list construct { n_splice ($1,$2); }
+ ;
+
+ construct: struct
+@@ -68,78 +68,78 @@
+ ;
+
+ struct : advice STRUCT_KW typename LC members RC SEMI
+- ={ $$ = n_cons (STRUCT_KW, $1, $3, $5);
++ { $$ = n_cons (STRUCT_KW, $1, $3, $5);
+ construct_fixup ($$);
+ }
+ ;
+
+ union : advice UNION_KW typename LC members RC SEMI
+- ={ $$ = n_cons (UNION_KW, $1, $3, $5);
++ { $$ = n_cons (UNION_KW, $1, $3, $5);
+ construct_fixup ($$);
+ }
+ ;
+
+ typedef : TYPEDEF_KW member
+- ={ $$ = n_cons (TYPEDEF_KW, 0, $2->n_m_name, $2);
++ { $$ = n_cons (TYPEDEF_KW, 0, $2->n_m_name, $2);
+ construct_fixup ($$);
+ }
+ ;
+
+ members : member
+- | members member ={ n_splice ($1,$2); }
++ | members member { n_splice ($1,$2); }
+ ;
+
+ member : advice type declarator SEMI
+- ={ $$ = n_cons (L_MEMBER, $1, $2, $3);
++ { $$ = n_cons (L_MEMBER, $1, $2, $3);
+ member_fixup ($$);
+ }
+ ;
+
+-advice : /* empty */ ={ $$ = 0; }
++advice : /* empty */ { $$ = 0; }
+ | adv_list
+ ;
+
+-adv_list: LB adv_attrs RB ={ $$ = $2; }
+- | adv_list LB adv_attrs RB ={ n_splice ($1,$3); }
++adv_list: LB adv_attrs RB { $$ = $2; }
++ | adv_list LB adv_attrs RB { n_splice ($1,$3); }
+ ;
+
+ adv_attrs: adv_attr
+- | adv_attr adv_attr ={ n_splice ($1,$2); }
++ | adv_attr adv_attr { n_splice ($1,$2); }
+ ;
+
+-adv_attr: IN_KW ={ $$ = n_cons (IN_KW); }
+- | OUT_KW ={ $$ = n_cons (OUT_KW); }
+- | OPERATION_KW LP arg RP ={ $$ = n_cons (OPERATION_KW, $3); }
+- | ALIGN_KW LP arg RP ={ $$ = n_cons (ALIGN_KW, $3); }
+- | STRING_KW ={ $$ = n_cons (STRING_KW); }
++adv_attr: IN_KW { $$ = n_cons (IN_KW); }
++ | OUT_KW { $$ = n_cons (OUT_KW); }
++ | OPERATION_KW LP arg RP { $$ = n_cons (OPERATION_KW, $3); }
++ | ALIGN_KW LP arg RP { $$ = n_cons (ALIGN_KW, $3); }
++ | STRING_KW { $$ = n_cons (STRING_KW); }
+
+ | SIZE_IS_KW LP arg RP
+- ={ $$ = n_cons (SIZE_IS_KW, $3, $3, $3); }
++ { $$ = n_cons (SIZE_IS_KW, $3, $3, $3); }
+ | SIZE_IS_KW LP arg operator INTEGER RP
+- ={ $$ = n_cons (SIZE_IS_KW, $3, $4, $5); }
++ { $$ = n_cons (SIZE_IS_KW, $3, $4, $5); }
+
+ | LENGTH_IS_KW LP arg RP
+- ={ $$ = n_cons (LENGTH_IS_KW, $3, $3, $3); }
++ { $$ = n_cons (LENGTH_IS_KW, $3, $3, $3); }
+ | LENGTH_IS_KW LP arg operator INTEGER RP
+- ={ $$ = n_cons (LENGTH_IS_KW, $3, $4, $5); }
++ { $$ = n_cons (LENGTH_IS_KW, $3, $4, $5); }
+
+ | SWITCH_IS_KW LP arg RP
+- ={ $$ = n_cons (SWITCH_IS_KW, $3, $3, $3); }
++ { $$ = n_cons (SWITCH_IS_KW, $3, $3, $3); }
+ | SWITCH_IS_KW LP arg operator INTEGER RP
+- ={ $$ = n_cons (SWITCH_IS_KW, $3, $4, $5); }
++ { $$ = n_cons (SWITCH_IS_KW, $3, $4, $5); }
+
+- | CASE_KW LP arg RP ={ $$ = n_cons (CASE_KW, $3); }
+- | DEFAULT_KW ={ $$ = n_cons (DEFAULT_KW); }
++ | CASE_KW LP arg RP { $$ = n_cons (CASE_KW, $3); }
++ | DEFAULT_KW { $$ = n_cons (DEFAULT_KW); }
+
+- | ARG_IS_KW LP arg RP ={ $$ = n_cons (ARG_IS_KW, $3); }
++ | ARG_IS_KW LP arg RP { $$ = n_cons (ARG_IS_KW, $3); }
+ | TRANSMIT_AS_KW LP BASIC_TYPE RP
+- ={ $$ = n_cons (TRANSMIT_AS_KW, $3); }
++ { $$ = n_cons (TRANSMIT_AS_KW, $3); }
+
+- | INTERFACE_KW LP arg RP ={ $$ = n_cons (INTERFACE_KW, $3); }
+- | UUID_KW LP arg RP ={ $$ = n_cons (UUID_KW, $3); }
+- | _NO_REORDER_KW ={ $$ = n_cons (_NO_REORDER_KW); }
+- | EXTERN_KW ={ $$ = n_cons (EXTERN_KW); }
+- | REFERENCE_KW ={ $$ = n_cons (REFERENCE_KW); }
++ | INTERFACE_KW LP arg RP { $$ = n_cons (INTERFACE_KW, $3); }
++ | UUID_KW LP arg RP { $$ = n_cons (UUID_KW, $3); }
++ | _NO_REORDER_KW { $$ = n_cons (_NO_REORDER_KW); }
++ | EXTERN_KW { $$ = n_cons (EXTERN_KW); }
++ | REFERENCE_KW { $$ = n_cons (REFERENCE_KW); }
+ ;
+
+ arg : IDENTIFIER
+@@ -149,8 +149,8 @@
+
+ type : BASIC_TYPE
+ | typename
+- | STRUCT_KW typename ={ $$ = $2; }
+- | UNION_KW typename ={ $$ = $2; }
++ | STRUCT_KW typename { $$ = $2; }
++ | UNION_KW typename { $$ = $2; }
+ ;
+
+ typename: TYPENAME
+@@ -171,17 +171,17 @@
+ ;
+
+ decl1 : decl2
+- | STAR decl1 ={ $$ = n_cons (STAR, $2); }
++ | STAR decl1 { $$ = n_cons (STAR, $2); }
+ ;
+
+ decl2 : decl3
+- | decl3 LB RB ={ $$ = n_cons (LB, $1, 0); }
+- | decl3 LB STAR RB ={ $$ = n_cons (LB, $1, 0); }
+- | decl3 LB INTEGER RB ={ $$ = n_cons (LB, $1, $3); }
++ | decl3 LB RB { $$ = n_cons (LB, $1, 0); }
++ | decl3 LB STAR RB { $$ = n_cons (LB, $1, 0); }
++ | decl3 LB INTEGER RB { $$ = n_cons (LB, $1, $3); }
+ ;
+
+ decl3 : IDENTIFIER
+- | LP decl1 RP ={ $$ = n_cons (LP, $2); }
++ | LP decl1 RP { $$ = n_cons (LP, $2); }
+ ;
+
+
diff --git a/onbld/debian/patches/gnu-ld.patch b/onbld/debian/patches/gnu-ld.patch
new file mode 100644
index 0000000..6cd90df
--- /dev/null
+++ b/onbld/debian/patches/gnu-ld.patch
@@ -0,0 +1,25 @@
+Index: onbld/illumos-gate/usr/src/tools/Makefile.tools
+===================================================================
+--- onbld.orig/illumos-gate/usr/src/tools/Makefile.tools 2012-06-26 00:14:27.000000000 +0000
++++ onbld/illumos-gate/usr/src/tools/Makefile.tools 2012-07-04 12:46:58.882314289 +0000
+@@ -51,8 +51,6 @@
+ CPPFLAGS= -D_TS_ERRNO
+ ELFSIGN_O= $(TRUE)
+ LDLIBS=
+-LDFLAGS= $(MAPFILE.NES:%=-M%) $(MAPFILE.NED:%=-M%) \
+- $(MAPFILE.PGA:%=-M%)
+
+ ROOTONBLDPROG= $(PROG:%=$(ROOTONBLDBIN)/%)
+ ROOTONBLDMACHPROG= $(PROG:%=$(ROOTONBLDBINMACH)/%)
+Index: onbld/illumos-gate/usr/src/tools/cw/Makefile
+===================================================================
+--- onbld.orig/illumos-gate/usr/src/tools/cw/Makefile 2012-06-26 00:14:27.000000000 +0000
++++ onbld/illumos-gate/usr/src/tools/cw/Makefile 2012-07-04 12:47:27.094240456 +0000
+@@ -45,7 +45,6 @@
+
+
+ $(__GNUC)LDLIBS += -lc
+-$(__GNUC)LDFLAGS= $(MAPFILE.NES:%=-Wl,-M%)
+
+ CPPFLAGS += -DDEFAULT_CC_DIR='"$(SPRO_VROOT)/bin"'
+ CPPFLAGS += -DDEFAULT_GCC_DIR='"$(GCC_ROOT)/bin"'
diff --git a/onbld/debian/patches/series b/onbld/debian/patches/series
index cfcb2bc..c717580 100644
--- a/onbld/debian/patches/series
+++ b/onbld/debian/patches/series
@@ -2,3 +2,5 @@ bool.patch
scanner.flex.patch
use-intptr_t.patch
use-system-libdwarf.patch
+gnu-ld.patch
+bison.patch
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 01:24:33 +0000