Omit visibility pragmas on Windows (fixes warnings/validate failures)

includes/Rts.h

@@ -51,7 +51,19 @@ extern "C" {
 // Symbols that are extern, but private to the RTS, are declared
 // with visibility "hidden" to hide them outside the RTS shared
 // library.
+#if !defined(mingw32_HOST_OS)
 #define RTS_PRIVATE  GNUC3_ATTRIBUTE(visibility("hidden"))
+#else
+#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
 
 /* Fix for mingw stat problem (done here so it's early enough) */
 #ifdef mingw32_HOST_OS

rts/Capability.h

@@ -22,7 +22,7 @@
 #include "Task.h"
 #include "Sparks.h"
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 struct Capability_ {
     // State required by the STG virtual machine when running Haskell
@@ -332,6 +332,6 @@ contextSwitchCapability (Capability *cap)
     cap->context_switch = 1;
 }
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* CAPABILITY_H */

rts/FrontPanel.h

@@ -9,7 +9,7 @@
 #ifndef FRONTPANEL_H
 #define FRONTPANEL_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 #ifdef RTS_GTK_FRONTPANEL
 
@@ -33,7 +33,7 @@ extern gboolean continue_now, stop_now, quit;
 
 #endif /* RTS_GTK_FRONTPANEL */
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* FRONTPANEL_H */
 

rts/GetTime.h

@@ -9,7 +9,7 @@
 #ifndef GETTIME_H
 #define GETTIME_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 // 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);
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* GETTIME_H */

rts/Hash.h

@@ -9,7 +9,7 @@
 #ifndef HASH_H
 #define HASH_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 typedef struct hashtable HashTable; /* abstract */
 
@@ -47,7 +47,7 @@ void freeHashTable ( HashTable *table, void (*freeDataFun)(void *) );
 
 void exitHashTable ( void );
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* HASH_H */
 

rts/Papi.h

@@ -8,7 +8,7 @@
 #ifndef PAPI_H
 #define PAPI_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 /* 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);
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* PAPI_H */

rts/Printer.h

@@ -9,7 +9,7 @@
 #ifndef PRINTER_H
 #define PRINTER_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 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
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* PRINTER_H */
 

rts/ProfHeap.h

@@ -9,7 +9,7 @@
 #ifndef PROFHEAP_H
 #define PROFHEAP_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 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);
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* PROFHEAP_H */

rts/Profiling.h

@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 void initProfiling1 (void);
 void freeProfiling1 (void);
@@ -37,6 +37,6 @@ void debugCCS( CostCentreStack *ccs );
 
 #endif
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* PROFILING_H */

rts/Proftimer.h

@@ -9,7 +9,7 @@
 #ifndef PROFTIMER_H
 #define PROFTIMER_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 void initProfTimer      ( void );
 void handleProfTick     ( void );
@@ -24,6 +24,6 @@ void startHeapProfTimer ( void );
 
 extern rtsBool performHeapProfile;
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* PROFTIMER_H */

rts/RaiseAsync.h

@@ -9,12 +9,13 @@
 #ifndef RAISEASYNC_H
 #define RAISEASYNC_H
 
-#pragma GCC visibility push(hidden)
-
 #define THROWTO_SUCCESS   0
 #define THROWTO_BLOCKED   1
 
 #ifndef CMINUSMINUS
+
+BEGIN_RTS_PRIVATE
+
 void throwToSingleThreaded (Capability *cap,
 			    StgTSO *tso,
 			    StgClosure *exception);
@@ -66,9 +67,9 @@ interruptible(StgTSO *t)
   }
 }
 
-#endif /* CMINUSMINUS */
+END_RTS_PRIVATE
 
-#pragma GCC visibility pop
+#endif /* CMINUSMINUS */
 
 #endif /* RAISEASYNC_H */
 

rts/RetainerProfile.h

@@ -14,7 +14,7 @@
 
 #include "RetainerSet.h"
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 void initRetainerProfiling ( void );
 void endRetainerProfiling  ( void );
@@ -43,7 +43,7 @@ retainerSetOf( StgClosure *c )
 extern lnat retainerStackBlocks ( void );
 #endif
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* PROFILING */
 

rts/RetainerSet.h

@@ -14,7 +14,7 @@
 
 #ifdef PROFILING
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 /*
   Type 'retainer' defines the retainer identity.
@@ -199,7 +199,7 @@ void outputAllRetainerSet(FILE *);
 //       the best place to define it.
 void printRetainer(FILE *, retainer);
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* PROFILING */
 #endif /* RETAINERSET_H */

rts/RtsSignals.h

@@ -25,7 +25,7 @@
 
 #if RTS_USER_SIGNALS
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 /*
  * Function: initUserSignals()
@@ -60,7 +60,7 @@ void awaitUserSignals(void);
  */
 void markSignalHandlers (evac_fn evac, void *user);
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* RTS_USER_SIGNALS */
 

rts/RtsUtils.h

@@ -9,7 +9,7 @@
 #ifndef RTSUTILS_H
 #define RTSUTILS_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 /* -----------------------------------------------------------------------------
  * (Checked) dynamic allocation
@@ -48,6 +48,6 @@ int genericRaise(int sig);
 
 int rts_isProfiled(void);
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* RTSUTILS_H */

rts/STM.h

@@ -40,7 +40,7 @@
 #define STM_UNIPROC
 #endif
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 /*----------------------------------------------------------------------
 
@@ -232,7 +232,7 @@ void stmWriteTVar(Capability *cap,
 
 /*----------------------------------------------------------------------*/
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* STM_H */
 

rts/Sanity.h

@@ -11,7 +11,7 @@
 
 #ifdef DEBUG
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 # if defined(PAR)
 # define PVM_PE_MASK    0xfffc0000
@@ -36,7 +36,7 @@ void checkMutableLists ( rtsBool checkTSOs );
 
 void checkBQ (StgTSO *bqe, StgClosure *closure);
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* DEBUG */
  

rts/Schedule.h

@@ -14,7 +14,7 @@
 #include "Capability.h"
 #include "Trace.h"
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 /* initScheduler(), exitScheduler()
  * Called from STG :  no
@@ -241,7 +241,7 @@ emptyThreadQueues(Capability *cap)
 
 #endif /* !IN_STG_CODE */
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* SCHEDULE_H */
 

rts/Sparks.h

@@ -11,7 +11,7 @@
 
 #include "WSDeque.h"
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 /* typedef for SparkPool in RtsTypes.h */
 
@@ -65,6 +65,6 @@ INLINE_HEADER void discardSparks (SparkPool *pool)
 
 #endif // THREADED_RTS
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* SPARKS_H */

rts/Stable.h

@@ -17,7 +17,7 @@
 
 #include "sm/GC.h" // for evac_fn below
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 void    freeStablePtr         ( StgStablePtr sp );
 
@@ -33,6 +33,6 @@ void    updateStablePtrTable  ( rtsBool full );
 void    stablePtrPreGC        ( void );
 void    stablePtrPostGC       ( void );
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* STABLE_H */

rts/Stats.h

@@ -11,7 +11,7 @@
 
 #include "GetTime.h"
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 void      stat_startInit(void);
 void      stat_endInit(void);
@@ -61,6 +61,6 @@ Ticks stat_getElapsedTime(void);
 void statsPrintf( char *s, ... ) 
     GNUC3_ATTRIBUTE(format (printf, 1, 2));
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* STATS_H */

rts/StgPrimFloat.h

@@ -9,7 +9,7 @@
 #ifndef STGPRIMFLOAT_H
 #define STGPRIMFLOAT_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 /* grimy low-level support functions defined in StgPrimFloat.c */
 void      __decodeDouble_2Int (I_ *man_sign, W_ *man_high, W_ *man_low, I_ *exp, StgDouble dbl);
@@ -21,6 +21,6 @@ StgFloat  __word_encodeFloat (W_ j, I_ e);
 // __int_encodeDouble and __int_encodeFloat are public, declared in 
 // includes/rts/PrimFloat.h.
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* STGPRIMFLOAT_H */

rts/Task.h

@@ -11,7 +11,7 @@
 
 #include "GetTime.h"
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 /* 
    Definition of a Task
@@ -261,6 +261,6 @@ taskEnter (Task *task)
     setMyTask(task);
 }
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* TASK_H */

rts/ThreadLabels.h

@@ -10,7 +10,7 @@
 #ifndef THREADLABELS_H
 #define THREADLABELS_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 #if defined(DEBUG)
 void    initThreadLabelTable (void);
@@ -21,6 +21,6 @@ void    removeThreadLabel    (StgWord key);
 void    labelThread          (StgPtr tso, char *label);
 #endif
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* THREADLABELS_H */

rts/Threads.h

@@ -9,7 +9,7 @@
 #ifndef THREADS_H
 #define THREADS_H
 
-#pragma GCC visibility push(hidden)
+BEGIN_RTS_PRIVATE
 
 StgTSO * unblockOne (Capability *cap, StgTSO *tso);
 StgTSO * unblockOne_ (Capability *cap, StgTSO *tso, rtsBool allow_migrate);
@@ -29,6 +29,6 @@ void printAllThreads (void);
 void printThreadQueue (StgTSO *t);
 #endif
 
-#pragma GCC visibility pop
+END_RTS_PRIVATE
 
 #endif /* THREADS_H */

rts/Ticker.h

@@ -9,7 +9,7 @@
 #ifndef TICKER_H
 #define TICKER_H