Commit 51b85031 authored by Simon Marlow's avatar Simon Marlow
Browse files

Fix the symbol visibility pragmas

parent a998343d
......@@ -57,15 +57,7 @@ extern "C" {
#define RTS_PRIVATE /* disabled: RTS_PRIVATE */
#endif
#if __GNUC__ > 4
#define BEGIN_RTS_PRIVATE #pragma GCC visibility push(hidden)
#define END_RTS_PRIVATE #pragma GCC visibility pop
#else
#define BEGIN_RTS_PRIVATE /* disabled: BEGIN_RTS_PRIVATE */
#define END_RTS_PRIVATE /* disabled: END_RTS_PRIVATE */
#endif
#if __GNUC__ > 4
#if __GNUC__ >= 4
#define RTS_UNLIKELY(p) __builtin_expect((p),0)
#else
#define RTS_UNLIKELY(p) p
......
#if __GNUC__ >= 4
#pragma GCC visibility push(hidden)
#endif
......@@ -25,7 +25,7 @@
#include "Task.h"
#include "Sparks.h"
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
struct Capability_ {
// State required by the STG virtual machine when running Haskell
......@@ -357,6 +357,6 @@ INLINE_HEADER rtsBool emptyInbox(Capability *cap)
#endif
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* CAPABILITY_H */
#if __GNUC__ >= 4
#pragma GCC visibility pop
#endif
......@@ -9,7 +9,7 @@
#ifndef FRONTPANEL_H
#define FRONTPANEL_H
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
#ifdef RTS_GTK_FRONTPANEL
......@@ -33,7 +33,7 @@ extern gboolean continue_now, stop_now, quit;
#endif /* RTS_GTK_FRONTPANEL */
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* FRONTPANEL_H */
......@@ -9,7 +9,7 @@
#ifndef GETTIME_H
#define GETTIME_H
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
// We'll use a fixed resolution of usec for now. The machine
// dependent implementation may have a different resolution, but we'll
......@@ -25,6 +25,6 @@ void getProcessTimes (Ticks *user, Ticks *elapsed);
// Not strictly timing, but related
nat getPageFaults (void);
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* GETTIME_H */
......@@ -9,7 +9,7 @@
#ifndef HASH_H
#define HASH_H
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
typedef struct hashtable HashTable; /* abstract */
......@@ -47,7 +47,7 @@ void freeHashTable ( HashTable *table, void (*freeDataFun)(void *) );
void exitHashTable ( void );
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* HASH_H */
......@@ -6,7 +6,7 @@
*
* --------------------------------------------------------------------------*/
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
nat messageBlackHole(Capability *cap, MessageBlackHole *msg);
......@@ -15,4 +15,4 @@ void executeMessage (Capability *cap, Message *m);
void sendMessage (Capability *from_cap, Capability *to_cap, Message *msg);
#endif
END_RTS_PRIVATE
#include "EndPrivate.h"
......@@ -8,7 +8,7 @@
#ifndef PAPI_H
#define PAPI_H
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
/* Check the error value of a PAPI call, reporting an error, if needed */
extern int papi_error;
......@@ -31,6 +31,6 @@ void papi_stop_gc1_count(void);
void papi_thread_start_gc1_count(int event_set);
void papi_thread_stop_gc1_count(int event_set);
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* PAPI_H */
......@@ -9,7 +9,7 @@
#ifndef PRINTER_H
#define PRINTER_H
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
extern void printPtr ( StgPtr p );
extern void printObj ( StgClosure *obj );
......@@ -34,7 +34,7 @@ extern const char *lookupGHCName( void *addr );
extern char *what_next_strs[];
#endif
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* PRINTER_H */
......@@ -9,7 +9,7 @@
#ifndef PROFHEAP_H
#define PROFHEAP_H
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
void heapCensus (void);
nat initHeapProfiling (void);
......@@ -17,6 +17,6 @@ void endHeapProfiling (void);
void LDV_recordDead (StgClosure *c, nat size);
rtsBool strMatchesSelector (char* str, char* sel);
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* PROFHEAP_H */
......@@ -11,7 +11,7 @@
#include <stdio.h>
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
void initProfiling1 (void);
void freeProfiling1 (void);
......@@ -37,6 +37,6 @@ void debugCCS( CostCentreStack *ccs );
#endif
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* PROFILING_H */
......@@ -9,7 +9,7 @@
#ifndef PROFTIMER_H
#define PROFTIMER_H
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
void initProfTimer ( void );
void handleProfTick ( void );
......@@ -24,6 +24,6 @@ void startHeapProfTimer ( void );
extern rtsBool performHeapProfile;
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* PROFTIMER_H */
......@@ -14,7 +14,7 @@
#ifndef CMINUSMINUS
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
void throwToSingleThreaded (Capability *cap,
StgTSO *tso,
......@@ -64,7 +64,7 @@ interruptible(StgTSO *t)
}
}
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* CMINUSMINUS */
......
......@@ -14,7 +14,7 @@
#include "RetainerSet.h"
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
void initRetainerProfiling ( void );
void endRetainerProfiling ( void );
......@@ -43,7 +43,7 @@ retainerSetOf( StgClosure *c )
extern lnat retainerStackBlocks ( void );
#endif
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* PROFILING */
......
......@@ -14,7 +14,7 @@
#ifdef PROFILING
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
/*
Type 'retainer' defines the retainer identity.
......@@ -199,7 +199,7 @@ void outputAllRetainerSet(FILE *);
// the best place to define it.
void printRetainer(FILE *, retainer);
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* PROFILING */
#endif /* RETAINERSET_H */
......@@ -25,7 +25,7 @@
#if RTS_USER_SIGNALS
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
/*
* Function: initUserSignals()
......@@ -60,7 +60,7 @@ void awaitUserSignals(void);
*/
void markSignalHandlers (evac_fn evac, void *user);
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* RTS_USER_SIGNALS */
......
......@@ -9,7 +9,7 @@
#ifndef RTSUTILS_H
#define RTSUTILS_H
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
/* -----------------------------------------------------------------------------
* (Checked) dynamic allocation
......@@ -48,6 +48,6 @@ int genericRaise(int sig);
int rts_isProfiled(void);
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* RTSUTILS_H */
......@@ -40,7 +40,7 @@
#define STM_UNIPROC
#endif
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
/*----------------------------------------------------------------------
......@@ -225,7 +225,7 @@ void stmWriteTVar(Capability *cap,
/*----------------------------------------------------------------------*/
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* STM_H */
......@@ -14,7 +14,7 @@
#include "Capability.h"
#include "Trace.h"
BEGIN_RTS_PRIVATE
#include "BeginPrivate.h"
/* initScheduler(), exitScheduler()
* Called from STG : no
......@@ -214,7 +214,7 @@ emptyThreadQueues(Capability *cap)
#endif /* !IN_STG_CODE */
END_RTS_PRIVATE
#include "EndPrivate.h"
#endif /* SCHEDULE_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment