annotate src/mingw-utils-1-portability-fix.patch @ 5534:372ea4c0afb2

Move of-ocs PKG_XXXX to inst dir and add break patch * src/of-ocs-3-break-fixes.patch, src/of-ocs-4-pkgadd-fixes.patch: new files * dist-files.mk: add ref to files
author John Donoghue <john.donoghue@ieee.org>
date Sun, 13 Sep 2020 08:15:14 -0400
parents 99516e73b368
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 1425
diff changeset
1 This file is part of MXE.
2353
99516e73b368 Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents: 2333
diff changeset
2 See index.html for further information.
1425
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
4 This patch has been taken from:
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
5 http://sourceforge.net/tracker/?func=detail&aid=3119898&group_id=2435&atid=102435
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
6
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
7 diff -r 62cf992c82c9 reimp/reimp.c
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
8 --- a/reimp/reimp.c Fri Nov 26 19:02:28 2010 +0100
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9 +++ b/reimp/reimp.c Fri Nov 26 19:14:59 2010 +0100
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
10 @@ -80,20 +80,20 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
11 return 1;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12 }
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 -static int do_import (char *, uint32, FILE *);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
15 +static int do_import (char *, uint32_t, FILE *);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 /* read second linker member and process all archive members */
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 static int
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
19 read_link_member (struct ar_hdr *hdr, FILE *f)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
20 {
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21 - uint32 n_memb;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
22 - uint32 n_syms;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
23 - uint32 *ofs;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
24 - uint16 *idx;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
25 + uint32_t n_memb;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
26 + uint32_t n_syms;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
27 + uint32_t *ofs;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
28 + uint16_t *idx;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
29 char *buf;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
30 char *sym;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
31 - uint32 n;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
32 - uint16 i;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
33 + uint32_t n;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
34 + uint16_t i;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
35
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
36 /* FIXME: are offsets and sizes in host endianness? Currently we
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
37 assume so. */
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
38 @@ -305,7 +305,7 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
39 }
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
40
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
41 void
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
42 -extract_member (char *name, uint32 size, FILE *f)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
43 +extract_member (char *name, uint32_t size, FILE *f)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
44 {
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
45 static int non_imports = 0;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
46 char buf[2048];
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
47 @@ -379,7 +379,7 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
48
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
49 /* process an import */
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
50 static int
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
51 -do_import (char *name, uint32 offset, FILE *f)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
52 +do_import (char *name, uint32_t offset, FILE *f)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
53 {
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
54 struct ar_hdr ar_hdr;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
55 struct imp_hdr imp_hdr;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
56 diff -r 62cf992c82c9 reimp/reimp.h
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
57 --- a/reimp/reimp.h Fri Nov 26 19:02:28 2010 +0100
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
58 +++ b/reimp/reimp.h Fri Nov 26 19:14:59 2010 +0100
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
59 @@ -1,14 +1,6 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
60 #include <stddef.h>
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
61 +#include <stdint.h>
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
62 #include <stdio.h>
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
63 -
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
64 -/* we need integers of specific sizes */
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
65 -#ifndef uint32
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
66 -#define uint32 unsigned long
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
67 -#endif
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
68 -
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
69 -#ifndef uint16
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
70 -#define uint16 unsigned short
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
71 -#endif
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
72
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
73 /* defines for archive */
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
74 #ifndef ARMAG
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
75 @@ -41,13 +33,13 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
76
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
77 /* import header */
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
78 struct imp_hdr {
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
79 - uint16 sig1;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
80 - uint16 sig2;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
81 - uint16 version;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
82 - uint32 time;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
83 - uint32 size;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
84 - uint16 ord_or_hint;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
85 - uint16 type;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
86 + uint16_t sig1;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
87 + uint16_t sig2;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
88 + uint16_t version;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
89 + uint32_t time;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
90 + uint32_t size;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
91 + uint16_t ord_or_hint;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
92 + uint16_t type;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
93 };
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
94
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
95 /* sig1 */
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
96 @@ -67,7 +59,7 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
97 #define IMPORT_NAME_UNDECORATE IMPNT(3)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
98 #define TEST_IMPNT(t,v) (((t) & IMPNT(7)) == (v))
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
99
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
100 -uint32 swap_endian (uint32);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
101 +uint32_t swap_endian (uint32_t);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
102
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
103 #ifdef BIG_ENDIAN
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
104 #define btonat(u) u
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
105 @@ -87,7 +79,7 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
106
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
107 #if !defined(_WIN32) && !defined(__MSDOS__)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
108 #define spawnvp do_spawn
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
109 -int spawnvp (int, char *, char **);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
110 +int spawnvp (int, char *, const char * const *);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
111 #define P_WAIT 0
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
112 #define P_NOWAIT 1
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
113 #endif
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
114 diff -r 62cf992c82c9 reimp/util.c
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
115 --- a/reimp/util.c Fri Nov 26 19:02:28 2010 +0100
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
116 +++ b/reimp/util.c Fri Nov 26 19:14:59 2010 +0100
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
117 @@ -1,6 +1,7 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
118 #include <stdarg.h>
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
119 #include <stdlib.h>
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
120 #include <string.h>
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
121 +#include <unistd.h>
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
122
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
123 #include <reimp.h>
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
124
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
125 @@ -9,14 +10,14 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
126 #define swapb(a,b) a ^= b; b ^= a; a ^= b
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
127
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
128 /* swap little <=> big endian */
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
129 -uint32
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
130 -swap_endian (uint32 u)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
131 +uint32_t
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
132 +swap_endian (uint32_t u)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
133 {
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
134 #define swapb(a,b) a ^= b; b ^= a; a ^= b
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
135 unsigned char *p = (unsigned char *) &u;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
136 swapb (p[0], p[3]);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
137 swapb (p[1], p[2]);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
138 - return *((uint32 *) p);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
139 + return *((uint32_t *) p);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
140 }
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
141
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
142
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
143 @@ -79,7 +80,7 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
144 #endif
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
145
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
146 int
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
147 -spawnvp (int mode, char *path, char **argv)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
148 +spawnvp (int mode, char *path, const char * const *argv)
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
149 {
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
150 int pid;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
151 int status;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
152 @@ -89,7 +90,7 @@
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
153 case -1:
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
154 return -1;
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
155 case 0:
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
156 - execvp (path, argv);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
157 + execvp (path, (char * const *) argv);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
158
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
159 _exit (EXIT_FAILURE);
6f2842726259 new package: mingw-utils
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
160 break;