xref: /openbmc/openbmc/meta-openembedded/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch (revision eb8dc40360f0cfef56fb6947cc817a547d6d9bc6)
1Index: openhpi-3.6.1/plugins/dynamic_simulator/new_sim.cpp
2===================================================================
3--- openhpi-3.6.1.orig/plugins/dynamic_simulator/new_sim.cpp
4+++ openhpi-3.6.1/plugins/dynamic_simulator/new_sim.cpp
5@@ -415,7 +415,7 @@ extern "C" {
6 /**
7  * Alias for @ref öh_open(), implemented by @ref NewSimulatorOpen().
8  **/
9-static void * NewSimulatorOpen( GHashTable *, unsigned int, oh_evt_queue * ) __attribute__((used));
10+static void * NewSimulatorOpen( GHashTable *, unsigned int, oh_evt_queue * ) __asm__("NewSimulatorOpen") __attribute__((used));
11
12 /**
13  * @fn NewSimulatorOpen( GHashTable *handler_config, unsigned int hid,
14@@ -530,7 +530,7 @@ static void * NewSimulatorOpen( GHashTab
15 /**
16  * Alias for @ref öh_close(), implemented by @ref NewSimulatorClose().
17  **/
18-static void NewSimulatorClose( void * ) __attribute__((used));
19+static void NewSimulatorClose( void * ) __asm__("NewSimulatorClose") __attribute__((used));
20
21 /**
22  * @relate NewSimulatorClose
23@@ -585,7 +585,7 @@ static void NewSimulatorClose( void *hnd
24  *
25  * @return HPI error code
26  **/
27-static SaErrorT NewSimulatorGetEvent( void * ) __attribute__((used));
28+static SaErrorT NewSimulatorGetEvent( void * ) __asm__("NewSimulatorGetEvent") __attribute__((used));
29
30 static SaErrorT NewSimulatorGetEvent( void *hnd ) {
31    dbg( "NewSimulatorGetEvent" );
32@@ -613,7 +613,7 @@ static SaErrorT NewSimulatorGetEvent( vo
33  *
34  * @return HPI error code
35  **/
36-static SaErrorT NewSimulatorDiscoverResources( void * ) __attribute__((used));
37+static SaErrorT NewSimulatorDiscoverResources( void * ) __asm__("NewSimulatorDiscoverResources") __attribute__((used));
38
39 static SaErrorT NewSimulatorDiscoverResources( void *hnd ) {
40    dbg( "NewSimulatorDiscoverResources" );
41@@ -641,7 +641,7 @@ static SaErrorT NewSimulatorDiscoverReso
42  *
43  * @return HPI error code
44  **/
45-static SaErrorT NewSimulatorSetResourceTag( void *, SaHpiResourceIdT, SaHpiTextBufferT * ) __attribute__((used));
46+static SaErrorT NewSimulatorSetResourceTag( void *, SaHpiResourceIdT, SaHpiTextBufferT * ) __asm__("NewSimulatorSetResourceTag") __attribute__((used));
47
48 static SaErrorT NewSimulatorSetResourceTag( void *hnd, SaHpiResourceIdT id,
49                                              SaHpiTextBufferT *tag ) {
50@@ -669,7 +669,7 @@ static SaErrorT NewSimulatorSetResourceT
51  *
52  * @return HPI error code
53  **/
54-static SaErrorT NewSimulatorSetResourceSeverity( void *, SaHpiResourceIdT, SaHpiSeverityT ) __attribute__((used));
55+static SaErrorT NewSimulatorSetResourceSeverity( void *, SaHpiResourceIdT, SaHpiSeverityT ) __asm__("NewSimulatorSetResourceSeverity") __attribute__((used));
56
57 static SaErrorT NewSimulatorSetResourceSeverity( void *hnd, SaHpiResourceIdT id,
58                                                   SaHpiSeverityT sev ) {
59@@ -703,7 +703,7 @@ static SaErrorT NewSimulatorGetSensorRea
60                                                SaHpiResourceIdT id,
61                                                SaHpiSensorNumT num,
62                                                SaHpiSensorReadingT *data,
63-                                               SaHpiEventStateT *state ) __attribute__((used));
64+                                               SaHpiEventStateT *state ) __asm__("NewSimulatorGetSensorReading") __attribute__((used));
65
66 static SaErrorT NewSimulatorGetSensorReading( void *hnd,
67                                                SaHpiResourceIdT id,
68@@ -738,7 +738,7 @@ static SaErrorT NewSimulatorGetSensorRea
69 static SaErrorT NewSimulatorGetSensorThresholds( void *hnd,
70                                           SaHpiResourceIdT,
71                                           SaHpiSensorNumT,
72-                                          SaHpiSensorThresholdsT * ) __attribute__((used));
73+                                          SaHpiSensorThresholdsT * ) __asm__("NewSimulatorGetSensorThresholds") __attribute__((used));
74
75 static SaErrorT NewSimulatorGetSensorThresholds( void *hnd,
76                                                   SaHpiResourceIdT id,
77@@ -777,7 +777,7 @@ static SaErrorT NewSimulatorGetSensorThr
78 static SaErrorT NewSimulatorSetSensorThresholds( void *,
79                                                   SaHpiResourceIdT,
80                                                   SaHpiSensorNumT,
81-                                                  const SaHpiSensorThresholdsT * ) __attribute__((used));
82+                                                  const SaHpiSensorThresholdsT * ) __asm__("NewSimulatorSetSensorThresholds") __attribute__((used));
83
84 static SaErrorT NewSimulatorSetSensorThresholds( void *hnd,
85                                                   SaHpiResourceIdT id,
86@@ -815,7 +815,7 @@ static SaErrorT NewSimulatorSetSensorThr
87 static SaErrorT NewSimulatorGetSensorEnable( void *,
88                                               SaHpiResourceIdT,
89                                               SaHpiSensorNumT,
90-                                              SaHpiBoolT * ) __attribute__((used));
91+                                              SaHpiBoolT * ) __asm__("NewSimulatorGetSensorEnable") __attribute__((used));
92
93 static SaErrorT NewSimulatorGetSensorEnable( void *hnd,
94                                               SaHpiResourceIdT id,
95@@ -849,7 +849,7 @@ static SaErrorT NewSimulatorGetSensorEna
96 static SaErrorT NewSimulatorSetSensorEnable( void *,
97                                               SaHpiResourceIdT,
98                                               SaHpiSensorNumT,
99-                                              SaHpiBoolT ) __attribute__((used));
100+                                              SaHpiBoolT ) __asm__("NewSimulatorSetSensorEnable") __attribute__((used));
101
102 static SaErrorT NewSimulatorSetSensorEnable( void *hnd,
103                                               SaHpiResourceIdT id,
104@@ -883,7 +883,7 @@ static SaErrorT NewSimulatorSetSensorEna
105 static SaErrorT NewSimulatorGetSensorEventEnables( void *,
106                                                     SaHpiResourceIdT,
107                                                     SaHpiSensorNumT,
108-                                                    SaHpiBoolT * ) __attribute__((used));
109+                                                    SaHpiBoolT * ) __asm__("NewSimulatorGetSensorEventEnables") __attribute__((used));
110
111 static SaErrorT NewSimulatorGetSensorEventEnables( void *hnd,
112                                                     SaHpiResourceIdT id,
113@@ -916,7 +916,7 @@ static SaErrorT NewSimulatorGetSensorEve
114 static SaErrorT NewSimulatorSetSensorEventEnables( void *,
115                                                     SaHpiResourceIdT,
116                                                     SaHpiSensorNumT,
117-                                                    SaHpiBoolT ) __attribute__((used));
118+                                                    SaHpiBoolT ) __asm__("NewSimulatorSetSensorEventEnables") __attribute__((used));
119
120 static SaErrorT NewSimulatorSetSensorEventEnables( void *hnd,
121                                                     SaHpiResourceIdT id,
122@@ -952,7 +952,7 @@ static SaErrorT NewSimulatorGetSensorEve
123                                                   SaHpiResourceIdT,
124                                                   SaHpiSensorNumT,
125                                                   SaHpiEventStateT *,
126-                                                  SaHpiEventStateT * ) __attribute__((used));
127+                                                  SaHpiEventStateT * ) __asm__("NewSimulatorGetSensorEventMasks") __attribute__((used));
128
129 static SaErrorT NewSimulatorGetSensorEventMasks( void *hnd,
130                                                   SaHpiResourceIdT id,
131@@ -990,7 +990,7 @@ static SaErrorT NewSimulatorSetSensorEve
132                                                   SaHpiSensorNumT,
133                                                   SaHpiSensorEventMaskActionT,
134                                                   SaHpiEventStateT,
135-                                                  SaHpiEventStateT ) __attribute__((used));
136+                                                  SaHpiEventStateT ) __asm__("NewSimulatorSetSensorEventMasks") __attribute__((used));
137
138 static SaErrorT NewSimulatorSetSensorEventMasks( void *hnd,
139                                                   SaHpiResourceIdT id,
140@@ -1026,7 +1026,7 @@ static SaErrorT NewSimulatorSetSensorEve
141 static SaErrorT NewSimulatorGetControlState( void *, SaHpiResourceIdT,
142                                               SaHpiCtrlNumT,
143                                               SaHpiCtrlModeT *,
144-                                              SaHpiCtrlStateT * ) __attribute__((used));
145+                                              SaHpiCtrlStateT * ) __asm__("NewSimulatorGetControlState") __attribute__((used));
146
147 static SaErrorT NewSimulatorGetControlState( void *hnd, SaHpiResourceIdT id,
148                                               SaHpiCtrlNumT num,
149@@ -1061,7 +1061,7 @@ static SaErrorT NewSimulatorGetControlSt
150 static SaErrorT NewSimulatorSetControlState( void *, SaHpiResourceIdT,
151                                               SaHpiCtrlNumT,
152                                               SaHpiCtrlModeT,
153-                                              SaHpiCtrlStateT * ) __attribute__((used));
154+                                              SaHpiCtrlStateT * ) __asm__("NewSimulatorSetControlState") __attribute__((used));
155
156 static SaErrorT NewSimulatorSetControlState( void *hnd, SaHpiResourceIdT id,
157                                               SaHpiCtrlNumT num,
158@@ -1099,7 +1099,7 @@ static SaErrorT NewSimulatorGetNextAnnou
159                                        SaHpiAnnunciatorNumT,
160                                        SaHpiSeverityT,
161                                        SaHpiBoolT,
162-                                       SaHpiAnnouncementT *) __attribute__((used));
163+                                       SaHpiAnnouncementT *) __asm__("NewSimulatorGetNextAnnouncement") __attribute__((used));
164
165 static SaErrorT NewSimulatorGetNextAnnouncement(void *hnd, SaHpiResourceIdT id,
166                                        SaHpiAnnunciatorNumT num,
167@@ -1135,7 +1135,7 @@ static SaErrorT NewSimulatorGetNextAnnou
168 static SaErrorT NewSimulatorGetAnnouncement(void *, SaHpiResourceIdT,
169                                        SaHpiAnnunciatorNumT,
170                                        SaHpiEntryIdT,
171-                                       SaHpiAnnouncementT *) __attribute__((used));
172+                                       SaHpiAnnouncementT *) __asm__("NewSimulatorGetAnnouncement") __attribute__((used));
173
174 static SaErrorT NewSimulatorGetAnnouncement(void *hnd, SaHpiResourceIdT id,
175                                        SaHpiAnnunciatorNumT  num,
176@@ -1171,7 +1171,7 @@ static SaErrorT NewSimulatorGetAnnouncem
177 static SaErrorT NewSimulatorAckAnnouncement(void *, SaHpiResourceIdT,
178                                        SaHpiAnnunciatorNumT,
179                                        SaHpiEntryIdT,
180-                                       SaHpiSeverityT) __attribute__((used));
181+                                       SaHpiSeverityT) __asm__("NewSimulatorAckAnnouncement") __attribute__((used));
182
183 static SaErrorT NewSimulatorAckAnnouncement(void *hnd, SaHpiResourceIdT id,
184                                        SaHpiAnnunciatorNumT  num,
185@@ -1205,7 +1205,7 @@ static SaErrorT NewSimulatorAckAnnouncem
186  **/
187 static SaErrorT NewSimulatorAddAnnouncement(void *, SaHpiResourceIdT,
188                                        SaHpiAnnunciatorNumT,
189-                                       SaHpiAnnouncementT *) __attribute__((used));
190+                                       SaHpiAnnouncementT *) __asm__("NewSimulatorAddAnnouncement") __attribute__((used));
191
192 static SaErrorT NewSimulatorAddAnnouncement(void *hnd, SaHpiResourceIdT id,
193                                        SaHpiAnnunciatorNumT  num,
194@@ -1239,7 +1239,7 @@ static SaErrorT NewSimulatorAddAnnouncem
195 static SaErrorT NewSimulatorDelAnnouncement(void *, SaHpiResourceIdT,
196                                        SaHpiAnnunciatorNumT,
197                                        SaHpiEntryIdT,
198-                                       SaHpiSeverityT) __attribute__((used));
199+                                       SaHpiSeverityT) __asm__("NewSimulatorDelAnnouncement") __attribute__((used));
200
201 static SaErrorT NewSimulatorDelAnnouncement(void *hnd, SaHpiResourceIdT id,
202                                        SaHpiAnnunciatorNumT  num,
203@@ -1273,7 +1273,7 @@ static SaErrorT NewSimulatorDelAnnouncem
204  **/
205 static SaErrorT NewSimulatorGetAnnMode(void *, SaHpiResourceIdT,
206                                        SaHpiAnnunciatorNumT,
207-                                       SaHpiAnnunciatorModeT *) __attribute__((used));
208+                                       SaHpiAnnunciatorModeT *) __asm__("NewSimulatorGetAnnMode") __attribute__((used));
209
210 static SaErrorT NewSimulatorGetAnnMode(void *hnd, SaHpiResourceIdT id,
211                                        SaHpiAnnunciatorNumT  num,
212@@ -1306,7 +1306,7 @@ static SaErrorT NewSimulatorGetAnnMode(v
213  **/
214 static SaErrorT NewSimulatorSetAnnMode(void *, SaHpiResourceIdT,
215                                        SaHpiAnnunciatorNumT,
216-                                       SaHpiAnnunciatorModeT) __attribute__((used));
217+                                       SaHpiAnnunciatorModeT) __asm__("NewSimulatorSetAnnMode") __attribute__((used));
218
219 static SaErrorT NewSimulatorSetAnnMode(void *hnd, SaHpiResourceIdT id,
220                                        SaHpiAnnunciatorNumT  num,
221@@ -1340,7 +1340,7 @@ static SaErrorT NewSimulatorSetAnnMode(v
222 static SaErrorT NewSimulatorGetIdrInfo( void *,
223                                          SaHpiResourceIdT,
224                                          SaHpiIdrIdT,
225-                                         SaHpiIdrInfoT * ) __attribute__((used));
226+                                         SaHpiIdrInfoT * ) __asm__("NewSimulatorGetIdrInfo") __attribute__((used));
227
228 static SaErrorT NewSimulatorGetIdrInfo( void *hnd,
229                                          SaHpiResourceIdT id,
230@@ -1380,7 +1380,7 @@ static SaErrorT NewSimulatorGetIdrAreaHe
231                                                SaHpiIdrAreaTypeT,
232                                                SaHpiEntryIdT,
233                                                SaHpiEntryIdT *,
234-                                               SaHpiIdrAreaHeaderT * ) __attribute__((used));
235+                                               SaHpiIdrAreaHeaderT * ) __asm__("NewSimulatorGetIdrAreaHeader") __attribute__((used));
236
237 static SaErrorT NewSimulatorGetIdrAreaHeader( void *hnd,
238                                                SaHpiResourceIdT id,
239@@ -1419,7 +1419,7 @@ static SaErrorT NewSimulatorAddIdrArea(
240                                          SaHpiResourceIdT,
241                                          SaHpiIdrIdT,
242                                          SaHpiIdrAreaTypeT,
243-                                         SaHpiEntryIdT * ) __attribute__((used));
244+                                         SaHpiEntryIdT * ) __asm__("NewSimulatorAddIdrArea") __attribute__((used));
245
246 static SaErrorT NewSimulatorAddIdrArea( void *hnd,
247                                          SaHpiResourceIdT id,
248@@ -1456,7 +1456,7 @@ static SaErrorT NewSimulatorAddIdrAreaBy
249                                          SaHpiResourceIdT,
250                                          SaHpiIdrIdT,
251                                          SaHpiIdrAreaTypeT,
252-                                         SaHpiEntryIdT ) __attribute__((used));
253+                                         SaHpiEntryIdT ) __asm__("NewSimulatorAddIdrAreaById") __attribute__((used));
254
255 static SaErrorT NewSimulatorAddIdrAreaById( void *hnd,
256                                          SaHpiResourceIdT id,
257@@ -1490,7 +1490,7 @@ static SaErrorT NewSimulatorAddIdrAreaBy
258 static SaErrorT NewSimulatorDelIdrArea( void *,
259                                          SaHpiResourceIdT,
260                                          SaHpiIdrIdT,
261-                                         SaHpiEntryIdT ) __attribute__((used));
262+                                         SaHpiEntryIdT ) __asm__("NewSimulatorDelIdrArea") __attribute__((used));
263
264 static SaErrorT NewSimulatorDelIdrArea( void *hnd,
265                                          SaHpiResourceIdT id,
266@@ -1532,7 +1532,7 @@ static SaErrorT NewSimulatorGetIdrField(
267                                           SaHpiIdrFieldTypeT,
268                                           SaHpiEntryIdT,
269                                           SaHpiEntryIdT *,
270-                                          SaHpiIdrFieldT * ) __attribute__((used));
271+                                          SaHpiIdrFieldT * ) __asm__("NewSimulatorGetIdrField") __attribute__((used));
272
273 static SaErrorT NewSimulatorGetIdrField( void *hnd,
274                                           SaHpiResourceIdT id,
275@@ -1570,7 +1570,7 @@ static SaErrorT NewSimulatorGetIdrField(
276 static SaErrorT NewSimulatorAddIdrField( void *,
277                                           SaHpiResourceIdT,
278                                           SaHpiIdrIdT,
279-                                          SaHpiIdrFieldT * ) __attribute__((used));
280+                                          SaHpiIdrFieldT * ) __asm__("NewSimulatorAddIdrField") __attribute__((used));
281
282 static SaErrorT NewSimulatorAddIdrField( void *hnd,
283                                           SaHpiResourceIdT id,
284@@ -1604,7 +1604,7 @@ static SaErrorT NewSimulatorAddIdrField(
285 static SaErrorT NewSimulatorAddIdrFieldById( void *,
286                                           SaHpiResourceIdT,
287                                           SaHpiIdrIdT,
288-                                          SaHpiIdrFieldT * ) __attribute__((used));
289+                                          SaHpiIdrFieldT * ) __asm__("NewSimulatorAddIdrFieldById") __attribute__((used));
290
291 static SaErrorT NewSimulatorAddIdrFieldById( void *hnd,
292                                           SaHpiResourceIdT id,
293@@ -1637,7 +1637,7 @@ static SaErrorT NewSimulatorAddIdrFieldB
294 static SaErrorT NewSimulatorSetIdrField( void *,
295                                           SaHpiResourceIdT,
296                                           SaHpiIdrIdT,
297-                                          SaHpiIdrFieldT * ) __attribute__((used));
298+                                          SaHpiIdrFieldT * ) __asm__("NewSimulatorSetIdrField") __attribute__((used));
299
300 static SaErrorT NewSimulatorSetIdrField( void *hnd,
301                                           SaHpiResourceIdT id,
302@@ -1672,7 +1672,7 @@ static SaErrorT NewSimulatorDelIdrField(
303                                           SaHpiResourceIdT,
304                                           SaHpiIdrIdT,
305                                           SaHpiEntryIdT,
306-                                          SaHpiEntryIdT ) __attribute__((used));
307+                                          SaHpiEntryIdT ) __asm__("NewSimulatorDelIdrField") __attribute__((used));
308
309 static SaErrorT NewSimulatorDelIdrField( void *hnd,
310                                           SaHpiResourceIdT id,
311@@ -1704,7 +1704,7 @@ static SaErrorT NewSimulatorDelIdrField(
312  **/
313 static SaErrorT NewSimulatorGetSelInfo( void *,
314                                          SaHpiResourceIdT,
315-                                         SaHpiEventLogInfoT * ) __attribute__((used));
316+                                         SaHpiEventLogInfoT * ) __asm__("NewSimulatorGetSelInfo") __attribute__((used));
317
318 static SaErrorT NewSimulatorGetSelInfo( void *hnd,
319                                          SaHpiResourceIdT id,
320@@ -1736,7 +1736,7 @@ static SaErrorT NewSimulatorGetSelInfo(
321  *
322  * @return HPI error code
323  **/
324-static SaErrorT NewSimulatorSetSelTime( void *, SaHpiResourceIdT, SaHpiTimeT ) __attribute__((used));
325+static SaErrorT NewSimulatorSetSelTime( void *, SaHpiResourceIdT, SaHpiTimeT ) __asm__("NewSimulatorSetSelTime") __attribute__((used));
326
327 static SaErrorT NewSimulatorSetSelTime( void *hnd, SaHpiResourceIdT id, SaHpiTimeT t ) {
328    SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR;
329@@ -1766,7 +1766,7 @@ static SaErrorT NewSimulatorSetSelTime(
330  *
331  * @return HPI error code
332  **/
333-static SaErrorT NewSimulatorAddSelEntry( void *, SaHpiResourceIdT, const SaHpiEventT * ) __attribute__((used));
334+static SaErrorT NewSimulatorAddSelEntry( void *, SaHpiResourceIdT, const SaHpiEventT * ) __asm__("NewSimulatorAddSelEntry") __attribute__((used));
335
336 static SaErrorT NewSimulatorAddSelEntry( void *hnd, SaHpiResourceIdT id,
337                                           const SaHpiEventT *Event ) {
338@@ -1809,7 +1809,7 @@ static SaErrorT NewSimulatorGetSelEntry(
339                                           SaHpiEventLogEntryIdT *,
340                                           SaHpiEventLogEntryT *,
341                                           SaHpiRdrT *,
342-                                          SaHpiRptEntryT * ) __attribute__((used));
343+                                          SaHpiRptEntryT * ) __asm__("NewSimulatorGetSelEntry") __attribute__((used));
344
345 static SaErrorT NewSimulatorGetSelEntry( void *hnd, SaHpiResourceIdT id,
346                                           SaHpiEventLogEntryIdT current,
347@@ -1844,7 +1844,7 @@ static SaErrorT NewSimulatorGetSelEntry(
348  *
349  * @return HPI error code
350  **/
351-static SaErrorT NewSimulatorClearSel( void *, SaHpiResourceIdT ) __attribute__((used));
352+static SaErrorT NewSimulatorClearSel( void *, SaHpiResourceIdT ) __asm__("NewSimulatorClearSel") __attribute__((used));
353
354 static SaErrorT NewSimulatorClearSel( void *hnd, SaHpiResourceIdT id ) {
355    SaErrorT rv = SA_ERR_HPI_INTERNAL_ERROR;
356@@ -1875,7 +1875,7 @@ static SaErrorT NewSimulatorClearSel( vo
357  * @return HPI error code
358  **/
359 static SaErrorT NewSimulatorSetSelState(void *, SaHpiResourceIdT,
360-                                         SaHpiBoolT) __attribute__((used));
361+                                         SaHpiBoolT) __asm__("NewSimulatorSetSelState") __attribute__((used));
362
363 static SaErrorT NewSimulatorSetSelState( void *hnd, SaHpiResourceIdT id,
364                                           SaHpiBoolT state ) {
365@@ -1907,7 +1907,7 @@ static SaErrorT NewSimulatorSetSelState(
366  * @return HPI error code
367  **/
368 static SaErrorT NewSimulatorGetSelState(void *, SaHpiResourceIdT,
369-                                         SaHpiBoolT *) __attribute__((used));
370+                                         SaHpiBoolT *) __asm__("NewSimulatorGetSelState") __attribute__((used));
371
372 static SaErrorT NewSimulatorGetSelState( void *hnd, SaHpiResourceIdT id,
373                                           SaHpiBoolT *state ) {
374@@ -1939,7 +1939,7 @@ static SaErrorT NewSimulatorGetSelState(
375  * @return HPI error code
376  **/
377 static SaErrorT NewSimulatorGetSelCapability(void *, SaHpiResourceIdT,
378-                             SaHpiEventLogCapabilitiesT *) __attribute__((used));
379+                             SaHpiEventLogCapabilitiesT *) __asm__("NewSimulatorGetSelCapability") __attribute__((used));
380
381 static SaErrorT NewSimulatorGetSelCapability( void *hnd, SaHpiResourceIdT id,
382                                           SaHpiEventLogCapabilitiesT *caps ) {
383@@ -1970,7 +1970,7 @@ static SaErrorT NewSimulatorGetSelCapabi
384  * @return HPI error code
385  **/
386 static SaErrorT NewSimulatorResetSelOverflow(void *, SaHpiResourceIdT)
387-                                                           __attribute__((used));
388+                                                           __asm__("NewSimulatorResetSelOverflow") __attribute__((used));
389
390 static SaErrorT NewSimulatorResetSelOverflow( void *hnd, SaHpiResourceIdT id ) {
391
392@@ -2002,7 +2002,7 @@ static SaErrorT NewSimulatorResetSelOver
393  * @return HPI error code
394  **/
395 static SaErrorT NewSimulatorHotswapPolicyCancel( void *, SaHpiResourceIdT,
396-                                                  SaHpiTimeoutT ) __attribute__((used));
397+                                                  SaHpiTimeoutT ) __asm__("NewSimulatorHotswapPolicyCancel") __attribute__((used));
398
399 static SaErrorT NewSimulatorHotswapPolicyCancel( void *hnd, SaHpiResourceIdT id,
400                                                   SaHpiTimeoutT timeout) {
401@@ -2032,7 +2032,7 @@ static SaErrorT NewSimulatorHotswapPolic
402  * @return HPI error code
403  **/
404 static SaErrorT NewSimulatorGetHotswapState( void *, SaHpiResourceIdT ,
405-                                              SaHpiHsStateT * ) __attribute__((used));
406+                                              SaHpiHsStateT * ) __asm__("NewSimulatorGetHotswapState") __attribute__((used));
407
408 static SaErrorT NewSimulatorGetHotswapState( void *hnd, SaHpiResourceIdT id,
409                                               SaHpiHsStateT *state ) {
410@@ -2063,7 +2063,7 @@ static SaErrorT NewSimulatorGetHotswapSt
411  * @return HPI error code
412  **/
413 static SaErrorT NewSimulatorSetHotswapState( void *, SaHpiResourceIdT,
414-                                              SaHpiHsStateT ) __attribute__((used));
415+                                              SaHpiHsStateT ) __asm__("NewSimulatorSetHotswapState") __attribute__((used));
416
417 static SaErrorT NewSimulatorSetHotswapState( void *hnd, SaHpiResourceIdT id,
418                                               SaHpiHsStateT state ) {
419@@ -2105,7 +2105,7 @@ static SaErrorT NewSimulatorSetHotswapSt
420  * @return HPI error code
421  **/
422 static SaErrorT NewSimulatorRequestHotswapAction( void *, SaHpiResourceIdT,
423-                                                   SaHpiHsActionT ) __attribute__((used));
424+                                                   SaHpiHsActionT ) __asm__("NewSimulatorRequestHotswapAction") __attribute__((used));
425
426 static SaErrorT NewSimulatorRequestHotswapAction( void *hnd, SaHpiResourceIdT id,
427                                                    SaHpiHsActionT act ) {
428@@ -2139,7 +2139,7 @@ static SaErrorT NewSimulatorRequestHotsw
429 static SaErrorT NewSimulatorGetWatchdogInfo(void *,
430                                              SaHpiResourceIdT,
431                                              SaHpiWatchdogNumT,
432-                                             SaHpiWatchdogT *) __attribute__((used));
433+                                             SaHpiWatchdogT *) __asm__("NewSimulatorGetWatchdogInfo") __attribute__((used));
434
435 static SaErrorT NewSimulatorGetWatchdogInfo(void *hnd,
436                                              SaHpiResourceIdT  id,
437@@ -2170,7 +2170,7 @@ static SaErrorT NewSimulatorGetWatchdogI
438 static SaErrorT NewSimulatorSetWatchdogInfo(void *,
439                                              SaHpiResourceIdT,
440                                              SaHpiWatchdogNumT,
441-                                             SaHpiWatchdogT *) __attribute__((used));
442+                                             SaHpiWatchdogT *) __asm__("NewSimulatorSetWatchdogInfo") __attribute__((used));
443
444 static SaErrorT NewSimulatorSetWatchdogInfo(void *hnd,
445                                              SaHpiResourceIdT  id,
446@@ -2199,7 +2199,7 @@ static SaErrorT NewSimulatorSetWatchdogI
447  **/
448 static SaErrorT NewSimulatorResetWatchdog(void *,
449                                            SaHpiResourceIdT,
450-                                           SaHpiWatchdogNumT) __attribute__((used));
451+                                           SaHpiWatchdogNumT) __asm__("NewSimulatorResetWatchdog") __attribute__((used));
452
453 static SaErrorT NewSimulatorResetWatchdog(void *hnd,
454                                            SaHpiResourceIdT  id,
455@@ -2229,7 +2229,7 @@ static SaErrorT NewSimulatorResetWatchdo
456 static SaErrorT NewSimulatorGetFumiSpec(void *,
457                                          SaHpiResourceIdT,
458                                          SaHpiFumiNumT,
459-                                         SaHpiFumiSpecInfoT *) __attribute__((used));
460+                                         SaHpiFumiSpecInfoT *) __asm__("NewSimulatorGetFumiSpec") __attribute__((used));
461
462 static SaErrorT NewSimulatorGetFumiSpec(void *hnd,
463                                          SaHpiResourceIdT    id,
464@@ -2260,7 +2260,7 @@ static SaErrorT NewSimulatorGetFumiSpec(
465 static SaErrorT NewSimulatorGetFumiServImpact(void *,
466                                                SaHpiResourceIdT,
467                                                SaHpiFumiNumT,
468-                                               SaHpiFumiServiceImpactDataT *) __attribute__((used));
469+                                               SaHpiFumiServiceImpactDataT *) __asm__("NewSimulatorGetFumiServImpact") __attribute__((used));
470
471 static SaErrorT NewSimulatorGetFumiServImpact(void *hnd,
472                                                SaHpiResourceIdT            id,
473@@ -2294,7 +2294,7 @@ static SaErrorT NewSimulatorSetFumiSourc
474                                            SaHpiResourceIdT,
475                                            SaHpiFumiNumT,
476                                            SaHpiBankNumT,
477-                                           SaHpiTextBufferT *) __attribute__((used));
478+                                           SaHpiTextBufferT *) __asm__("NewSimulatorSetFumiSource") __attribute__((used));
479
480 static SaErrorT NewSimulatorSetFumiSource(void             *hnd,
481                                            SaHpiResourceIdT  id,
482@@ -2327,7 +2327,7 @@ static SaErrorT NewSimulatorSetFumiSourc
483 static SaErrorT NewSimulatorValidateFumiSource(void *,
484                                                 SaHpiResourceIdT,
485                                                 SaHpiFumiNumT,
486-                                                SaHpiBankNumT) __attribute__((used));
487+                                                SaHpiBankNumT) __asm__("NewSimulatorValidateFumiSource") __attribute__((used));
488
489 static SaErrorT NewSimulatorValidateFumiSource(void            *hnd,
490                                                 SaHpiResourceIdT id,
491@@ -2361,7 +2361,7 @@ static SaErrorT NewSimulatorGetFumiSourc
492                                            SaHpiResourceIdT,
493                                            SaHpiFumiNumT,
494                                            SaHpiBankNumT,
495-                                           SaHpiFumiSourceInfoT *) __attribute__((used));
496+                                           SaHpiFumiSourceInfoT *) __asm__("NewSimulatorGetFumiSource") __attribute__((used));
497
498 static SaErrorT NewSimulatorGetFumiSource(void                *hnd,
499                                            SaHpiResourceIdT     id,
500@@ -2400,7 +2400,7 @@ static SaErrorT NewSimulatorGetFumiSourc
501                              SaHpiBankNumT,
502                              SaHpiEntryIdT,
503                              SaHpiEntryIdT *,
504-                             SaHpiFumiComponentInfoT *) __attribute__((used));
505+                             SaHpiFumiComponentInfoT *) __asm__("NewSimulatorGetFumiSourceComponent") __attribute__((used));
506
507 static SaErrorT NewSimulatorGetFumiSourceComponent(void            *hnd,
508                                                     SaHpiResourceIdT id,
509@@ -2437,7 +2437,7 @@ static SaErrorT NewSimulatorGetFumiTarge
510                                            SaHpiResourceIdT,
511                                            SaHpiFumiNumT,
512                                            SaHpiBankNumT,
513-                                           SaHpiFumiBankInfoT *) __attribute__((used));
514+                                           SaHpiFumiBankInfoT *) __asm__("NewSimulatorGetFumiTarget") __attribute__((used));
515
516 static SaErrorT NewSimulatorGetFumiTarget(void              *hnd,
517                                            SaHpiResourceIdT   id,
518@@ -2476,7 +2476,7 @@ static SaErrorT NewSimulatorGetFumiTarge
519                                                     SaHpiBankNumT,
520                                                     SaHpiEntryIdT,
521                                                     SaHpiEntryIdT *,
522-                                                    SaHpiFumiComponentInfoT *) __attribute__((used));
523+                                                    SaHpiFumiComponentInfoT *) __asm__("NewSimulatorGetFumiTargetComponent") __attribute__((used));
524
525  static SaErrorT NewSimulatorGetFumiTargetComponent(void                  *hnd,
526                                                     SaHpiResourceIdT        id,
527@@ -2511,7 +2511,7 @@ static SaErrorT NewSimulatorGetFumiTarge
528 static SaErrorT NewSimulatorGetFumiLogicalTarget(void *,
529                                                   SaHpiResourceIdT,
530                                                   SaHpiFumiNumT,
531-                                                  SaHpiFumiLogicalBankInfoT *) __attribute__((used));
532+                                                  SaHpiFumiLogicalBankInfoT *) __asm__("NewSimulatorGetFumiLogicalTarget") __attribute__((used));
533
534 static SaErrorT NewSimulatorGetFumiLogicalTarget(void            *hnd,
535                                                   SaHpiResourceIdT id,
536@@ -2547,7 +2547,7 @@ static SaErrorT NewSimulatorGetFumiLogic
537                       SaHpiFumiNumT,
538                       SaHpiEntryIdT,
539                       SaHpiEntryIdT *,
540-                      SaHpiFumiLogicalComponentInfoT *) __attribute__((used));
541+                      SaHpiFumiLogicalComponentInfoT *) __asm__("NewSimulatorGetFumiLogicalTargetComponent") __attribute__((used));
542
543 static SaErrorT NewSimulatorGetFumiLogicalTargetComponent(void         *hnd,
544                                                          SaHpiResourceIdT id,
545@@ -2579,7 +2579,7 @@ static SaErrorT NewSimulatorGetFumiLogic
546  **/
547 static SaErrorT NewSimulatorStartFumiBackup(void *,
548                                              SaHpiResourceIdT,
549-                                             SaHpiFumiNumT) __attribute__((used));
550+                                             SaHpiFumiNumT) __asm__("NewSimulatorStartFumiBackup") __attribute__((used));
551
552 static SaErrorT NewSimulatorStartFumiBackup(void            *hnd,
553                                              SaHpiResourceIdT id,
554@@ -2612,7 +2612,7 @@ static SaErrorT NewSimulatorSetFumiBankO
555                                               SaHpiResourceIdT,
556                                               SaHpiFumiNumT,
557                                               SaHpiBankNumT,
558-                                              SaHpiUint32T) __attribute__((used));
559+                                              SaHpiUint32T) __asm__("NewSimulatorSetFumiBankOrder") __attribute__((used));
560
561 static SaErrorT NewSimulatorSetFumiBankOrder(void            *hnd,
562                                               SaHpiResourceIdT id,
563@@ -2647,7 +2647,7 @@ static SaErrorT NewSimulatorStartFumiBan
564                                                SaHpiResourceIdT,
565                                                SaHpiFumiNumT,
566                                                SaHpiBankNumT,
567-                                               SaHpiBankNumT) __attribute__((used));
568+                                               SaHpiBankNumT) __asm__("NewSimulatorStartFumiBankCopy") __attribute__((used));
569
570 static SaErrorT NewSimulatorStartFumiBankCopy(void             *hnd,
571                                                SaHpiResourceIdT  id,
572@@ -2680,7 +2680,7 @@ static SaErrorT NewSimulatorStartFumiBan
573 static SaErrorT NewSimulatorStartFumiInstall(void *,
574                                               SaHpiResourceIdT,
575                                               SaHpiFumiNumT,
576-                                              SaHpiBankNumT) __attribute__((used));
577+                                              SaHpiBankNumT) __asm__("NewSimulatorStartFumiInstall") __attribute__((used));
578
579 static SaErrorT NewSimulatorStartFumiInstall(void             *hnd,
580                                               SaHpiResourceIdT  id,
581@@ -2714,7 +2714,7 @@ static SaErrorT NewSimulatorGetFumiStatu
582                                            SaHpiResourceIdT,
583                                            SaHpiFumiNumT,
584                                            SaHpiBankNumT,
585-                                           SaHpiFumiUpgradeStatusT *) __attribute__((used));
586+                                           SaHpiFumiUpgradeStatusT *) __asm__("NewSimulatorGetFumiStatus") __attribute__((used));
587
588 static SaErrorT NewSimulatorGetFumiStatus(void                   *hnd,
589                                            SaHpiResourceIdT        id,
590@@ -2747,7 +2747,7 @@ static SaErrorT NewSimulatorGetFumiStatu
591 static SaErrorT NewSimulatorStartFumiVerification(void *,
592                                                    SaHpiResourceIdT,
593                                                    SaHpiFumiNumT,
594-                                                   SaHpiBankNumT) __attribute__((used));
595+                                                   SaHpiBankNumT) __asm__("NewSimulatorStartFumiVerification") __attribute__((used));
596
597 static SaErrorT NewSimulatorStartFumiVerification(void            *hnd,
598                                                    SaHpiResourceIdT id,
599@@ -2776,7 +2776,7 @@ static SaErrorT NewSimulatorStartFumiVer
600  **/
601 static SaErrorT NewSimulatorStartFumiVerificationMain(void *,
602                                                        SaHpiResourceIdT,
603-                                                       SaHpiFumiNumT) __attribute__((used));
604+                                                       SaHpiFumiNumT) __asm__("NewSimulatorStartFumiVerificationMain") __attribute__((used));
605
606 static SaErrorT NewSimulatorStartFumiVerificationMain(void            *hnd,
607                                                        SaHpiResourceIdT id,
608@@ -2807,7 +2807,7 @@ static SaErrorT NewSimulatorStartFumiVer
609 static SaErrorT NewSimulatorCancelFumiUpgrade(void *,
610                                                SaHpiResourceIdT,
611                                                SaHpiFumiNumT,
612-                                               SaHpiBankNumT) __attribute__((used));
613+                                               SaHpiBankNumT) __asm__("NewSimulatorCancelFumiUpgrade") __attribute__((used));
614
615 static SaErrorT NewSimulatorCancelFumiUpgrade(void            *hnd,
616                                                SaHpiResourceIdT id,
617@@ -2838,7 +2838,7 @@ static SaErrorT NewSimulatorCancelFumiUp
618 static SaErrorT NewSimulatorGetFumiRollback(void *,
619                                              SaHpiResourceIdT,
620                                              SaHpiFumiNumT,
621-                                             SaHpiBoolT *) __attribute__((used));
622+                                             SaHpiBoolT *) __asm__("NewSimulatorGetFumiRollback") __attribute__((used));
623
624 static SaErrorT NewSimulatorGetFumiRollback(void            *hnd,
625                                              SaHpiResourceIdT id,
626@@ -2870,7 +2870,7 @@ static SaErrorT NewSimulatorGetFumiRollb
627 static SaErrorT NewSimulatorSetFumiRollback(void *,
628                                              SaHpiResourceIdT,
629                                              SaHpiFumiNumT,
630-                                             SaHpiBoolT) __attribute__((used));
631+                                             SaHpiBoolT) __asm__("NewSimulatorSetFumiRollback") __attribute__((used));
632
633 static SaErrorT NewSimulatorSetFumiRollback(void            *hnd,
634                                              SaHpiResourceIdT id,
635@@ -2900,7 +2900,7 @@ static SaErrorT NewSimulatorSetFumiRollb
636  **/
637 static SaErrorT NewSimulatorStartFumiRollback(void *,
638                                                SaHpiResourceIdT,
639-                                               SaHpiFumiNumT) __attribute__((used));
640+                                               SaHpiFumiNumT) __asm__("NewSimulatorStartFumiRollback") __attribute__((used));
641
642 static SaErrorT NewSimulatorStartFumiRollback(void            *hnd,
643                                              SaHpiResourceIdT id,
644@@ -2929,7 +2929,7 @@ static SaErrorT NewSimulatorStartFumiRol
645  **/
646 static SaErrorT NewSimulatorActivateFumi(void *,
647                                           SaHpiResourceIdT,
648-                                          SaHpiFumiNumT) __attribute__((used));
649+                                          SaHpiFumiNumT) __asm__("NewSimulatorActivateFumi") __attribute__((used));
650
651 static SaErrorT NewSimulatorActivateFumi(void            *hnd,
652                                           SaHpiResourceIdT id,
653@@ -2960,7 +2960,7 @@ static SaErrorT NewSimulatorActivateFumi
654 static SaErrorT NewSimulatorStartFumiActivation(void *,
655                                                  SaHpiResourceIdT,
656                                                  SaHpiFumiNumT,
657-                                                 SaHpiBoolT) __attribute__((used));
658+                                                 SaHpiBoolT) __asm__("NewSimulatorStartFumiActivation") __attribute__((used));
659
660 static SaErrorT NewSimulatorStartFumiActivation(void            *hnd,
661                                                  SaHpiResourceIdT id,
662@@ -2992,7 +2992,7 @@ static SaErrorT NewSimulatorStartFumiAct
663 static SaErrorT NewSimulatorCleanupFumi(void *,
664                                          SaHpiResourceIdT,
665                                          SaHpiFumiNumT,
666-                                         SaHpiBankNumT) __attribute__((used));
667+                                         SaHpiBankNumT) __asm__("NewSimulatorCleanupFumi") __attribute__((used));
668
669 static SaErrorT NewSimulatorCleanupFumi(void            *hnd,
670                                          SaHpiResourceIdT id,
671@@ -3023,7 +3023,7 @@ static SaErrorT NewSimulatorCleanupFumi(
672 static SaErrorT NewSimulatorGetDimiInfo( void *,
673                                           SaHpiResourceIdT,
674                                           SaHpiDimiNumT,
675-                                          SaHpiDimiInfoT *)  __attribute__((used));
676+                                          SaHpiDimiInfoT *)  __asm__("NewSimulatorGetDimiInfo") __attribute__((used));
677
678 static SaErrorT NewSimulatorGetDimiInfo( void            *hnd,
679                                           SaHpiResourceIdT id,
680@@ -3057,7 +3057,7 @@ static SaErrorT NewSimulatorGetDimiTestI
681                                       SaHpiResourceIdT,
682                                       SaHpiDimiNumT,
683                                       SaHpiDimiTestNumT,
684-                                      SaHpiDimiTestT *)  __attribute__((used));
685+                                      SaHpiDimiTestT *)  __asm__("NewSimulatorGetDimiTestInfo") __attribute__((used));
686
687 static SaErrorT NewSimulatorGetDimiTestInfo( void     *hnd,
688                                       SaHpiResourceIdT  id,
689@@ -3092,7 +3092,7 @@ static SaErrorT NewSimulatorGetDimiTestR
690                                      SaHpiResourceIdT,
691                                      SaHpiDimiNumT,
692                                      SaHpiDimiTestNumT,
693-                                     SaHpiDimiReadyT *)  __attribute__((used));
694+                                     SaHpiDimiReadyT *)  __asm__("NewSimulatorGetDimiTestReadiness") __attribute__((used));
695
696 static SaErrorT NewSimulatorGetDimiTestReadiness( void *hnd,
697                                      SaHpiResourceIdT    id,
698@@ -3129,7 +3129,7 @@ static SaErrorT NewSimulatorStartDimiTes
699                         SaHpiDimiNumT,
700                         SaHpiDimiTestNumT,
701                         SaHpiUint8T,
702-                        SaHpiDimiTestVariableParamsT *)  __attribute__((used));
703+                        SaHpiDimiTestVariableParamsT *)  __asm__("NewSimulatorStartDimiTest") __attribute__((used));
704
705 static SaErrorT NewSimulatorStartDimiTest( void    *hnd,
706                         SaHpiResourceIdT             id,
707@@ -3163,7 +3163,7 @@ static SaErrorT NewSimulatorStartDimiTes
708 static SaErrorT NewSimulatorCancelDimiTest( void *,
709                                       SaHpiResourceIdT,
710                                       SaHpiDimiNumT,
711-                                      SaHpiDimiTestNumT) __attribute__((used));
712+                                      SaHpiDimiTestNumT) __asm__("NewSimulatorCancelDimiTest") __attribute__((used));
713
714 static SaErrorT NewSimulatorCancelDimiTest( void      *hnd,
715                                       SaHpiResourceIdT  id,
716@@ -3199,7 +3199,7 @@ static SaErrorT NewSimulatorGetDimiTestS
717                               SaHpiDimiNumT,
718                               SaHpiDimiTestNumT,
719                               SaHpiDimiTestPercentCompletedT *,
720-                              SaHpiDimiTestRunStatusT *) __attribute__((used));
721+                              SaHpiDimiTestRunStatusT *) __asm__("NewSimulatorGetDimiTestStatus") __attribute__((used));
722
723 static SaErrorT NewSimulatorGetDimiTestStatus( void        *hnd,
724                               SaHpiResourceIdT               id,
725@@ -3234,7 +3234,7 @@ static SaErrorT NewSimulatorGetDimiTestR
726                                 SaHpiResourceIdT,
727                                 SaHpiDimiNumT,
728                                 SaHpiDimiTestNumT,
729-                                SaHpiDimiTestResultsT *) __attribute__((used));
730+                                SaHpiDimiTestResultsT *) __asm__("NewSimulatorGetDimiTestResults") __attribute__((used));
731
732 static SaErrorT NewSimulatorGetDimiTestResults( void *hnd,
733                                 SaHpiResourceIdT       id,
734@@ -3263,7 +3263,7 @@ static SaErrorT NewSimulatorGetDimiTestR
735  * @return HPI error code
736  **/
737 static SaErrorT NewSimulatorSetAutoInsertTimeout( void *,
738-                                         SaHpiTimeoutT ) __attribute__((used));
739+                                         SaHpiTimeoutT ) __asm__("NewSimulatorSetAutoInsertTimeout") __attribute__((used));
740
741 static SaErrorT NewSimulatorSetAutoInsertTimeout( void *hnd, SaHpiTimeoutT  timeout) {
742    NewSimulator *newsim = VerifyNewSimulator( hnd );
743@@ -3289,7 +3289,7 @@ static SaErrorT NewSimulatorSetAutoInser
744  * @return HPI error code
745  **/
746 static SaErrorT NewSimulatorGetAutoExtractTimeout( void *, SaHpiResourceIdT,
747-                                                    SaHpiTimeoutT * ) __attribute__((used));
748+                                                    SaHpiTimeoutT * ) __asm__("NewSimulatorGetAutoExtractTimeout") __attribute__((used));
749
750 static SaErrorT NewSimulatorGetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id,
751                                                     SaHpiTimeoutT *timeout ) {
752@@ -3319,7 +3319,7 @@ static SaErrorT NewSimulatorGetAutoExtra
753  * @return HPI error code
754  **/
755 static SaErrorT NewSimulatorSetAutoExtractTimeout( void *, SaHpiResourceIdT,
756-                                                    SaHpiTimeoutT ) __attribute__((used));
757+                                                    SaHpiTimeoutT ) __asm__("NewSimulatorSetAutoExtractTimeout") __attribute__((used));
758
759 static SaErrorT NewSimulatorSetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id,
760                                                     SaHpiTimeoutT timeout ) {
761@@ -3350,7 +3350,7 @@ static SaErrorT NewSimulatorSetAutoExtra
762  * @return HPI error code
763  **/
764 static SaErrorT NewSimulatorGetPowerState( void *, SaHpiResourceIdT,
765-                                            SaHpiPowerStateT * ) __attribute__((used));
766+                                            SaHpiPowerStateT * ) __asm__("NewSimulatorGetPowerState") __attribute__((used));
767
768 static SaErrorT NewSimulatorGetPowerState( void *hnd, SaHpiResourceIdT id,
769                                             SaHpiPowerStateT *state ) {
770@@ -3382,7 +3382,7 @@ static SaErrorT NewSimulatorGetPowerStat
771  * @return HPI error code
772  **/
773 static SaErrorT NewSimulatorSetPowerState( void *, SaHpiResourceIdT,
774-                                            SaHpiPowerStateT ) __attribute__((used));
775+                                            SaHpiPowerStateT ) __asm__("NewSimulatorSetPowerState") __attribute__((used));
776
777 static SaErrorT NewSimulatorSetPowerState( void *hnd, SaHpiResourceIdT id,
778                                             SaHpiPowerStateT state ) {
779@@ -3414,7 +3414,7 @@ static SaErrorT NewSimulatorSetPowerStat
780  * @return HPI error code
781  **/
782 static SaErrorT NewSimulatorGetIndicatorState( void *, SaHpiResourceIdT,
783-                                                SaHpiHsIndicatorStateT * ) __attribute__((used));
784+                                                SaHpiHsIndicatorStateT * ) __asm__("NewSimulatorGetIndicatorState") __attribute__((used));
785
786 static SaErrorT NewSimulatorGetIndicatorState( void *hnd, SaHpiResourceIdT id,
787                                                 SaHpiHsIndicatorStateT *state ) {
788@@ -3446,7 +3446,7 @@ static SaErrorT NewSimulatorGetIndicator
789  * @return HPI error code
790  **/
791 static SaErrorT NewSimulatorSetIndicatorState( void *, SaHpiResourceIdT,
792-                                                SaHpiHsIndicatorStateT ) __attribute__((used));
793+                                                SaHpiHsIndicatorStateT ) __asm__("NewSimulatorSetIndicatorState") __attribute__((used));
794
795 static SaErrorT NewSimulatorSetIndicatorState( void *hnd, SaHpiResourceIdT id,
796                                                 SaHpiHsIndicatorStateT state ) {
797@@ -3479,7 +3479,7 @@ static SaErrorT NewSimulatorSetIndicator
798  **/
799 static SaErrorT NewSimulatorControlParm( void *,
800                                           SaHpiResourceIdT,
801-                                          SaHpiParmActionT ) __attribute__((used));
802+                                          SaHpiParmActionT ) __asm__("NewSimulatorControlParm") __attribute__((used));
803
804 static SaErrorT NewSimulatorControlParm( void *hnd,
805                                           SaHpiResourceIdT id,
806@@ -3512,7 +3512,7 @@ static SaErrorT NewSimulatorControlParm(
807  * @return HPI error code
808  **/
809 static SaErrorT NewSimulatorGetResetState( void *, SaHpiResourceIdT,
810-                                            SaHpiResetActionT * ) __attribute__((used));
811+                                            SaHpiResetActionT * ) __asm__("NewSimulatorGetResetState") __attribute__((used));
812
813 static SaErrorT NewSimulatorGetResetState( void *hnd, SaHpiResourceIdT id,
814                                             SaHpiResetActionT *act ) {
815@@ -3545,7 +3545,7 @@ static SaErrorT NewSimulatorGetResetStat
816  **/
817 static SaErrorT NewSimulatorSetResetState( void *,
818                                             SaHpiResourceIdT,
819-                                            SaHpiResetActionT ) __attribute__((used));
820+                                            SaHpiResetActionT ) __asm__("NewSimulatorSetResetState") __attribute__((used));
821
822 static SaErrorT NewSimulatorSetResetState( void *hnd,
823                                             SaHpiResourceIdT id,
824Index: openhpi-3.6.1/plugins/dynamic_simulator/new_sim_file.cpp
825===================================================================
826--- openhpi-3.6.1.orig/plugins/dynamic_simulator/new_sim_file.cpp
827+++ openhpi-3.6.1/plugins/dynamic_simulator/new_sim_file.cpp
828@@ -44,9 +44,9 @@
829 ///< Global skip characters for oh_scanner_config
830 static gchar skip_characters[] = " \t\n";
831 ///< Global identifier_first for oh_scanner_config
832-static gchar identifier_first[] = G_CSET_a_2_z"_/."G_CSET_A_2_Z;
833+static gchar identifier_first[] = G_CSET_a_2_z "_/." G_CSET_A_2_Z;
834 ///< Global identifier_nth for oh_scanner_config
835-static gchar identifier_nth[] = G_CSET_a_2_z"_-0123456789/."G_CSET_A_2_Z;
836+static gchar identifier_nth[] = G_CSET_a_2_z "_-0123456789/." G_CSET_A_2_Z;
837 ///< Global comment signs for oh_scanner_config
838 static gchar comment_single[] = "#\n";
839
840Index: openhpi-3.6.1/plugins/ipmidirect/ipmi.cpp
841===================================================================
842--- openhpi-3.6.1.orig/plugins/ipmidirect/ipmi.cpp
843+++ openhpi-3.6.1/plugins/ipmidirect/ipmi.cpp
844@@ -279,7 +279,7 @@ extern "C" {
845 // ABI Interface functions
846
847 static void *
848-IpmiOpen( GHashTable *, unsigned int, oh_evt_queue * ) __attribute__((used));
849+IpmiOpen( GHashTable *, unsigned int, oh_evt_queue * )  __asm__("IpmiOpen") __attribute__((used));
850
851 static void *
852 IpmiOpen( GHashTable *handler_config, unsigned int hid, oh_evt_queue *eventq )
853@@ -388,7 +388,7 @@ IpmiOpen( GHashTable *handler_config, un
854
855
856 static void
857-IpmiClose( void * ) __attribute__((used));
858+IpmiClose( void * ) __asm__("IpmiClose") __attribute__((used));
859
860 static void
861 IpmiClose( void *hnd )
862@@ -436,7 +436,7 @@ IpmiClose( void *hnd )
863
864
865 static SaErrorT
866-IpmiGetEvent( void * ) __attribute__((used));
867+IpmiGetEvent( void * ) __asm__("IpmiGetEvent") __attribute__((used));
868
869 static SaErrorT
870 IpmiGetEvent( void *hnd )
871@@ -458,7 +458,7 @@ IpmiGetEvent( void *hnd )
872
873
874 static SaErrorT
875-IpmiDiscoverResources( void * ) __attribute__((used));
876+IpmiDiscoverResources( void * ) __asm__("IpmiDiscoverResources") __attribute__((used));
877
878 static SaErrorT
879 IpmiDiscoverResources( void *hnd )
880@@ -479,7 +479,7 @@ IpmiDiscoverResources( void *hnd )
881
882
883 static SaErrorT
884-IpmiSetResourceTag( void *, SaHpiResourceIdT, SaHpiTextBufferT * ) __attribute__((used));
885+IpmiSetResourceTag( void *, SaHpiResourceIdT, SaHpiTextBufferT * ) __asm__("IpmiSetResourceTag") __attribute__((used));
886
887 static SaErrorT
888 IpmiSetResourceTag( void *hnd, SaHpiResourceIdT id, SaHpiTextBufferT *tag )
889@@ -499,7 +499,7 @@ IpmiSetResourceTag( void *hnd, SaHpiReso
890
891
892 static SaErrorT
893-IpmiSetResourceSeverity( void *, SaHpiResourceIdT, SaHpiSeverityT ) __attribute__((used));
894+IpmiSetResourceSeverity( void *, SaHpiResourceIdT, SaHpiSeverityT ) __asm__("IpmiSetResourceSeverity") __attribute__((used));
895
896 static SaErrorT
897 IpmiSetResourceSeverity( void *hnd, SaHpiResourceIdT id, SaHpiSeverityT sev )
898@@ -523,7 +523,7 @@ IpmiGetSensorReading( void *,
899                    SaHpiResourceIdT id,
900                    SaHpiSensorNumT num,
901                    SaHpiSensorReadingT *data,
902-                   SaHpiEventStateT *state ) __attribute__((used));
903+                   SaHpiEventStateT *state ) __asm__("IpmiGetSensorReading") __attribute__((used));
904
905 static SaErrorT
906 IpmiGetSensorReading( void *hnd,
907@@ -550,7 +550,7 @@ static SaErrorT
908 IpmiGetSensorThresholds( void *hnd,
909                          SaHpiResourceIdT,
910                          SaHpiSensorNumT,
911-                         SaHpiSensorThresholdsT * ) __attribute__((used));
912+                         SaHpiSensorThresholdsT * ) __asm__("IpmiGetSensorThresholds") __attribute__((used));
913
914 static SaErrorT
915 IpmiGetSensorThresholds( void                   *hnd,
916@@ -581,7 +581,7 @@ static SaErrorT
917 IpmiSetSensorThresholds( void *,
918                          SaHpiResourceIdT,
919                          SaHpiSensorNumT,
920-                         const SaHpiSensorThresholdsT * ) __attribute__((used));
921+                         const SaHpiSensorThresholdsT * ) __asm__("IpmiSetSensorThresholds") __attribute__((used));
922
923 static SaErrorT
924 IpmiSetSensorThresholds( void *hnd,
925@@ -612,7 +612,7 @@ static SaErrorT
926 IpmiGetSensorEnable( void *,
927                      SaHpiResourceIdT,
928                      SaHpiSensorNumT,
929-                     SaHpiBoolT * ) __attribute__((used));
930+                     SaHpiBoolT * ) __asm__("IpmiGetSensorEnable") __attribute__((used));
931
932 static SaErrorT
933 IpmiGetSensorEnable( void *hnd,
934@@ -638,7 +638,7 @@ static SaErrorT
935 IpmiSetSensorEnable( void *,
936                      SaHpiResourceIdT,
937                      SaHpiSensorNumT,
938-                     SaHpiBoolT ) __attribute__((used));
939+                     SaHpiBoolT ) __asm__("IpmiSetSensorEnable") __attribute__((used));
940
941 static SaErrorT
942 IpmiSetSensorEnable( void *hnd,
943@@ -664,7 +664,7 @@ static SaErrorT
944 IpmiGetSensorEventEnables( void *,
945                            SaHpiResourceIdT,
946                            SaHpiSensorNumT,
947-                           SaHpiBoolT * ) __attribute__((used));
948+                           SaHpiBoolT * ) __asm__("IpmiGetSensorEventEnables") __attribute__((used));
949
950 static SaErrorT
951 IpmiGetSensorEventEnables( void *hnd,
952@@ -690,7 +690,7 @@ static SaErrorT
953 IpmiSetSensorEventEnables( void *,
954                            SaHpiResourceIdT,
955                            SaHpiSensorNumT,
956-                           SaHpiBoolT ) __attribute__((used));
957+                           SaHpiBoolT ) __asm__("IpmiSetSensorEventEnables") __attribute__((used));
958
959 static SaErrorT
960 IpmiSetSensorEventEnables( void *hnd,
961@@ -717,7 +717,7 @@ IpmiGetSensorEventMasks( void *,
962                            SaHpiResourceIdT,
963                            SaHpiSensorNumT,
964                            SaHpiEventStateT *,
965-                           SaHpiEventStateT * ) __attribute__((used));
966+                           SaHpiEventStateT * ) __asm__("IpmiGetSensorEventMasks") __attribute__((used));
967
968 static SaErrorT
969 IpmiGetSensorEventMasks( void *hnd,
970@@ -747,7 +747,7 @@ IpmiSetSensorEventMasks( void *,
971                            SaHpiSensorNumT,
972                            SaHpiSensorEventMaskActionT,
973                            SaHpiEventStateT,
974-                           SaHpiEventStateT ) __attribute__((used));
975+                           SaHpiEventStateT ) __asm__("IpmiSetSensorEventMasks") __attribute__((used));
976
977 static SaErrorT
978 IpmiSetSensorEventMasks( void *hnd,
979@@ -776,7 +776,7 @@ static SaErrorT
980 IpmiGetControlState( void *, SaHpiResourceIdT,
981                      SaHpiCtrlNumT,
982                      SaHpiCtrlModeT *,
983-                     SaHpiCtrlStateT * ) __attribute__((used));
984+                     SaHpiCtrlStateT * ) __asm__("IpmiGetControlState") __attribute__((used));
985
986 static SaErrorT
987 IpmiGetControlState( void *hnd, SaHpiResourceIdT id,
988@@ -802,7 +802,7 @@ static SaErrorT
989 IpmiSetControlState( void *, SaHpiResourceIdT,
990                      SaHpiCtrlNumT,
991                      SaHpiCtrlModeT,
992-                     SaHpiCtrlStateT * ) __attribute__((used));
993+                     SaHpiCtrlStateT * ) __asm__("IpmiSetControlState") __attribute__((used));
994
995 static SaErrorT
996 IpmiSetControlState( void *hnd, SaHpiResourceIdT id,
997@@ -828,7 +828,7 @@ static SaErrorT
998 IpmiGetIdrInfo( void *,
999                 SaHpiResourceIdT,
1000                 SaHpiIdrIdT,
1001-                SaHpiIdrInfoT * ) __attribute__((used));
1002+                SaHpiIdrInfoT * ) __asm__("IpmiGetIdrInfo") __attribute__((used));
1003
1004 static SaErrorT
1005 IpmiGetIdrInfo( void *hnd,
1006@@ -857,7 +857,7 @@ IpmiGetIdrAreaHeader( void *,
1007                       SaHpiIdrAreaTypeT,
1008                                   SaHpiEntryIdT,
1009                       SaHpiEntryIdT *,
1010-                      SaHpiIdrAreaHeaderT * ) __attribute__((used));
1011+                      SaHpiIdrAreaHeaderT * ) __asm__("IpmiGetIdrAreaHeader") __attribute__((used));
1012
1013 static SaErrorT
1014 IpmiGetIdrAreaHeader( void *hnd,
1015@@ -887,7 +887,7 @@ IpmiAddIdrArea( void *,
1016                 SaHpiResourceIdT,
1017                 SaHpiIdrIdT,
1018                 SaHpiIdrAreaTypeT,
1019-                            SaHpiEntryIdT * ) __attribute__((used));
1020+                            SaHpiEntryIdT * ) __asm__("IpmiAddIdrArea") __attribute__((used));
1021
1022 static SaErrorT
1023 IpmiAddIdrArea( void *hnd,
1024@@ -914,7 +914,7 @@ static SaErrorT
1025 IpmiDelIdrArea( void *,
1026                 SaHpiResourceIdT,
1027                 SaHpiIdrIdT,
1028-                            SaHpiEntryIdT ) __attribute__((used));
1029+                            SaHpiEntryIdT ) __asm__("IpmiDelIdrArea") __attribute__((used));
1030
1031 static SaErrorT
1032 IpmiDelIdrArea( void *hnd,
1033@@ -944,7 +944,7 @@ IpmiGetIdrField( void *,
1034                  SaHpiIdrFieldTypeT,
1035                  SaHpiEntryIdT,
1036                              SaHpiEntryIdT *,
1037-                 SaHpiIdrFieldT * ) __attribute__((used));
1038+                 SaHpiIdrFieldT * ) __asm__("IpmiGetIdrField") __attribute__((used));
1039
1040 static SaErrorT
1041 IpmiGetIdrField( void *hnd,
1042@@ -974,7 +974,7 @@ static SaErrorT
1043 IpmiAddIdrField( void *,
1044                  SaHpiResourceIdT,
1045                  SaHpiIdrIdT,
1046-                 SaHpiIdrFieldT * ) __attribute__((used));
1047+                 SaHpiIdrFieldT * ) __asm__("IpmiAddIdrField") __attribute__((used));
1048
1049 static SaErrorT
1050 IpmiAddIdrField( void *hnd,
1051@@ -1000,7 +1000,7 @@ static SaErrorT
1052 IpmiSetIdrField( void *,
1053                  SaHpiResourceIdT,
1054                  SaHpiIdrIdT,
1055-                 SaHpiIdrFieldT * ) __attribute__((used));
1056+                 SaHpiIdrFieldT * ) __asm__("IpmiSetIdrField") __attribute__((used));
1057
1058 static SaErrorT
1059 IpmiSetIdrField( void *hnd,
1060@@ -1027,7 +1027,7 @@ IpmiDelIdrField( void *,
1061                  SaHpiResourceIdT,
1062                  SaHpiIdrIdT,
1063                  SaHpiEntryIdT,
1064-                 SaHpiEntryIdT ) __attribute__((used));
1065+                 SaHpiEntryIdT ) __asm__("IpmiDelIdrField") __attribute__((used));
1066
1067 static SaErrorT
1068 IpmiDelIdrField( void *hnd,
1069@@ -1053,7 +1053,7 @@ IpmiDelIdrField( void *hnd,
1070 static SaErrorT
1071 IpmiGetSelInfo( void *,
1072                 SaHpiResourceIdT,
1073-                SaHpiEventLogInfoT * ) __attribute__((used));
1074+                SaHpiEventLogInfoT * ) __asm__("IpmiGetSelInfo") __attribute__((used));
1075
1076 static SaErrorT
1077 IpmiGetSelInfo( void *hnd,
1078@@ -1075,7 +1075,7 @@ IpmiGetSelInfo( void *hnd,
1079
1080
1081 static SaErrorT
1082-IpmiSetSelTime( void *, SaHpiResourceIdT, SaHpiTimeT ) __attribute__((used));
1083+IpmiSetSelTime( void *, SaHpiResourceIdT, SaHpiTimeT ) __asm__("IpmiSetSelTime") __attribute__((used));
1084
1085 static SaErrorT
1086 IpmiSetSelTime( void *hnd, SaHpiResourceIdT id, SaHpiTimeT t )
1087@@ -1096,7 +1096,7 @@ IpmiSetSelTime( void *hnd, SaHpiResource
1088
1089 static SaErrorT
1090 IpmiAddSelEntry( void *, SaHpiResourceIdT,
1091-                 const SaHpiEventT * ) __attribute__((used));
1092+                 const SaHpiEventT * ) __asm__("IpmiAddSelEntry") __attribute__((used));
1093
1094 static SaErrorT
1095 IpmiAddSelEntry( void *hnd, SaHpiResourceIdT id,
1096@@ -1118,7 +1118,7 @@ IpmiAddSelEntry( void *hnd, SaHpiResourc
1097 #ifdef NOTUSED
1098 static SaErrorT
1099 IpmiDelSelEntry( void *, SaHpiResourceIdT,
1100-                 SaHpiEventLogEntryIdT ) __attribute__((used));
1101+                 SaHpiEventLogEntryIdT ) __asm__("IpmiDelSelEntry") __attribute__((used));
1102
1103 static SaErrorT
1104 IpmiDelSelEntry( void *hnd, SaHpiResourceIdT id,
1105@@ -1145,7 +1145,7 @@ IpmiGetSelEntry( void *hnd, SaHpiResourc
1106                  SaHpiEventLogEntryIdT *, SaHpiEventLogEntryIdT *,
1107                  SaHpiEventLogEntryT *,
1108                  SaHpiRdrT *,
1109-                 SaHpiRptEntryT * ) __attribute__((used));
1110+                 SaHpiRptEntryT * ) __asm__("IpmiGetSelEntry") __attribute__((used));
1111
1112 static SaErrorT
1113 IpmiGetSelEntry( void *hnd, SaHpiResourceIdT id,
1114@@ -1170,7 +1170,7 @@ IpmiGetSelEntry( void *hnd, SaHpiResourc
1115
1116
1117 static SaErrorT
1118-IpmiClearSel( void *, SaHpiResourceIdT ) __attribute__((used));
1119+IpmiClearSel( void *, SaHpiResourceIdT ) __asm__("IpmiClearSel") __attribute__((used));
1120
1121 static SaErrorT
1122 IpmiClearSel( void *hnd, SaHpiResourceIdT id )
1123@@ -1190,7 +1190,7 @@ IpmiClearSel( void *hnd, SaHpiResourceId
1124
1125 static SaErrorT
1126 IpmiHotswapPolicyCancel( void *, SaHpiResourceIdT,
1127-                         SaHpiTimeoutT ) __attribute__((used));
1128+                         SaHpiTimeoutT ) __asm__("IpmiHotswapPolicyCancel") __attribute__((used));
1129
1130 static SaErrorT
1131 IpmiHotswapPolicyCancel( void *hnd, SaHpiResourceIdT id,
1132@@ -1210,7 +1210,7 @@ IpmiHotswapPolicyCancel( void *hnd, SaHp
1133 }
1134
1135 static SaErrorT
1136-IpmiSetAutoInsertTimeout( void *, SaHpiTimeoutT ) __attribute__((used));
1137+IpmiSetAutoInsertTimeout( void *, SaHpiTimeoutT ) __asm__("IpmiSetAutoInsertTimeout") __attribute__((used));
1138
1139 static SaErrorT
1140 IpmiSetAutoInsertTimeout( void *hnd, SaHpiTimeoutT  timeout)
1141@@ -1229,7 +1229,7 @@ IpmiSetAutoInsertTimeout( void *hnd, SaH
1142
1143 static SaErrorT
1144 IpmiGetAutoExtractTimeout( void *, SaHpiResourceIdT,
1145-                           SaHpiTimeoutT * ) __attribute__((used));
1146+                           SaHpiTimeoutT * ) __asm__("IpmiGetAutoExtractTimeout") __attribute__((used));
1147
1148 static SaErrorT
1149 IpmiGetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id,
1150@@ -1250,7 +1250,7 @@ IpmiGetAutoExtractTimeout( void *hnd, Sa
1151
1152 static SaErrorT
1153 IpmiSetAutoExtractTimeout( void *, SaHpiResourceIdT,
1154-                           SaHpiTimeoutT ) __attribute__((used));
1155+                           SaHpiTimeoutT ) __asm__("IpmiSetAutoExtractTimeout") __attribute__((used));
1156
1157 static SaErrorT
1158 IpmiSetAutoExtractTimeout( void *hnd, SaHpiResourceIdT id,
1159@@ -1271,7 +1271,7 @@ IpmiSetAutoExtractTimeout( void *hnd, Sa
1160
1161 static SaErrorT
1162 IpmiGetHotswapState( void *, SaHpiResourceIdT ,
1163-                     SaHpiHsStateT * ) __attribute__((used));
1164+                     SaHpiHsStateT * ) __asm__("IpmiGetHotswapState") __attribute__((used));
1165
1166 static SaErrorT
1167 IpmiGetHotswapState( void *hnd, SaHpiResourceIdT id,
1168@@ -1293,7 +1293,7 @@ IpmiGetHotswapState( void *hnd, SaHpiRes
1169
1170 static SaErrorT
1171 IpmiSetHotswapState( void *, SaHpiResourceIdT,
1172-                     SaHpiHsStateT ) __attribute__((used));
1173+                     SaHpiHsStateT ) __asm__("IpmiSetHotswapState") __attribute__((used));
1174
1175 static SaErrorT
1176 IpmiSetHotswapState( void *hnd, SaHpiResourceIdT id,
1177@@ -1315,7 +1315,7 @@ IpmiSetHotswapState( void *hnd, SaHpiRes
1178
1179 static SaErrorT
1180 IpmiRequestHotswapAction( void *, SaHpiResourceIdT,
1181-                          SaHpiHsActionT ) __attribute__((used));
1182+                          SaHpiHsActionT ) __asm__("IpmiRequestHotswapAction") __attribute__((used));
1183
1184 static SaErrorT
1185 IpmiRequestHotswapAction( void *hnd, SaHpiResourceIdT id,
1186@@ -1337,7 +1337,7 @@ IpmiRequestHotswapAction( void *hnd, SaH
1187
1188 static SaErrorT
1189 IpmiGetPowerState( void *, SaHpiResourceIdT,
1190-                   SaHpiPowerStateT * ) __attribute__((used));
1191+                   SaHpiPowerStateT * ) __asm__("IpmiGetPowerState") __attribute__((used));
1192
1193 static SaErrorT
1194 IpmiGetPowerState( void *hnd, SaHpiResourceIdT id,
1195@@ -1359,7 +1359,7 @@ IpmiGetPowerState( void *hnd, SaHpiResou
1196
1197 static SaErrorT
1198 IpmiSetPowerState( void *, SaHpiResourceIdT,
1199-                   SaHpiPowerStateT ) __attribute__((used));
1200+                   SaHpiPowerStateT ) __asm__("IpmiSetPowerState") __attribute__((used));
1201
1202 static SaErrorT
1203 IpmiSetPowerState( void *hnd, SaHpiResourceIdT id,
1204@@ -1381,7 +1381,7 @@ IpmiSetPowerState( void *hnd, SaHpiResou
1205
1206 static SaErrorT
1207 IpmiGetIndicatorState( void *, SaHpiResourceIdT,
1208-                       SaHpiHsIndicatorStateT * ) __attribute__((used));
1209+                       SaHpiHsIndicatorStateT * ) __asm__("IpmiGetIndicatorState") __attribute__((used));
1210
1211 static SaErrorT
1212 IpmiGetIndicatorState( void *hnd, SaHpiResourceIdT id,
1213@@ -1403,7 +1403,7 @@ IpmiGetIndicatorState( void *hnd, SaHpiR
1214
1215 static SaErrorT
1216 IpmiSetIndicatorState( void *, SaHpiResourceIdT,
1217-                       SaHpiHsIndicatorStateT ) __attribute__((used));
1218+                       SaHpiHsIndicatorStateT ) __asm__("IpmiSetIndicatorState") __attribute__((used));
1219
1220 static SaErrorT
1221 IpmiSetIndicatorState( void *hnd, SaHpiResourceIdT id,
1222@@ -1426,7 +1426,7 @@ IpmiSetIndicatorState( void *hnd, SaHpiR
1223 static SaErrorT
1224 IpmiControlParm( void *,
1225                  SaHpiResourceIdT,
1226-                 SaHpiParmActionT ) __attribute__((used));
1227+                 SaHpiParmActionT ) __asm__("IpmiControlParm") __attribute__((used));
1228
1229 static SaErrorT
1230 IpmiControlParm( void *hnd,
1231@@ -1449,7 +1449,7 @@ IpmiControlParm( void *hnd,
1232
1233 static SaErrorT
1234 IpmiGetResetState( void *, SaHpiResourceIdT,
1235-                   SaHpiResetActionT * ) __attribute__((used));
1236+                   SaHpiResetActionT * ) __asm__("IpmiGetResetState") __attribute__((used));
1237
1238 static SaErrorT
1239 IpmiGetResetState( void *hnd, SaHpiResourceIdT id,
1240@@ -1472,7 +1472,7 @@ IpmiGetResetState( void *hnd, SaHpiResou
1241 static SaErrorT
1242 IpmiSetResetState( void *,
1243                    SaHpiResourceIdT,
1244-                   SaHpiResetActionT ) __attribute__((used));
1245+                   SaHpiResetActionT ) __asm__("IpmiSetResetState") __attribute__((used));
1246
1247 static SaErrorT
1248 IpmiSetResetState( void *hnd,
1249@@ -1496,7 +1496,7 @@ static SaErrorT
1250 IpmiGetWatchdogInfo(void *,
1251                     SaHpiResourceIdT,
1252                     SaHpiWatchdogNumT,
1253-                    SaHpiWatchdogT *) __attribute__((used));
1254+                    SaHpiWatchdogT *) __asm__("IpmiGetWatchdogInfo") __attribute__((used));
1255
1256 static SaErrorT
1257 IpmiGetWatchdogInfo(void *hnd,
1258@@ -1517,7 +1517,7 @@ static SaErrorT
1259 IpmiSetWatchdogInfo(void *,
1260                     SaHpiResourceIdT,
1261                     SaHpiWatchdogNumT,
1262-                    SaHpiWatchdogT *) __attribute__((used));
1263+                    SaHpiWatchdogT *) __asm__("IpmiSetWatchdogInfo") __attribute__((used));
1264
1265 static SaErrorT
1266 IpmiSetWatchdogInfo(void *hnd,
1267@@ -1537,7 +1537,7 @@ IpmiSetWatchdogInfo(void *hnd,
1268 static SaErrorT
1269 IpmiResetWatchdog(void *,
1270                   SaHpiResourceIdT,
1271-                  SaHpiWatchdogNumT) __attribute__((used));
1272+                  SaHpiWatchdogNumT) __asm__("IpmiResetWatchdog") __attribute__((used));
1273
1274 static SaErrorT
1275 IpmiResetWatchdog(void *hnd,
1276Index: openhpi-3.6.1/plugins/ipmidirect/ipmi_auth.h
1277===================================================================
1278--- openhpi-3.6.1.orig/plugins/ipmidirect/ipmi_auth.h
1279+++ openhpi-3.6.1/plugins/ipmidirect/ipmi_auth.h
1280@@ -32,7 +32,7 @@ class cIpmiAuthSg
1281 {
1282 public:
1283   void *data; /* NULL to terminate. */
1284-  int   len;
1285+  unsigned int   len;
1286 };
1287
1288
1289