diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-01-30 10:05:19 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-01-30 10:05:19 -0500 |
| commit | 172a59335fa6c76b17fb6795e87fbc7fcfd198e6 (patch) | |
| tree | 6e5e940cb2c6ae9110807fa0d637a280c63b4220 /includes | |
| parent | 76c8fd674435a652c75a96c85abbf26f1f221876 (diff) | |
| download | haskell-172a59335fa6c76b17fb6795e87fbc7fcfd198e6.tar.gz | |
Revert "Batch merge"
This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/rts/Flags.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/includes/rts/Flags.h b/includes/rts/Flags.h index 3582e6abde..63450d5ece 100644 --- a/includes/rts/Flags.h +++ b/includes/rts/Flags.h @@ -188,17 +188,6 @@ typedef struct _CONCURRENT_FLAGS { */ #define DEFAULT_TICK_INTERVAL USToTime(10000) -/* - * When linkerAlwaysPic is true, the runtime linker assume that all object - * files were compiled with -fPIC -fexternal-dynamic-refs and load them - * anywhere in the address space. - */ -#if defined(x86_64_HOST_ARCH) && defined(darwin_HOST_OS) -#define DEFAULT_LINKER_ALWAYS_PIC true -#else -#define DEFAULT_LINKER_ALWAYS_PIC false -#endif - /* See Note [Synchronization of flags and base APIs] */ typedef struct _MISC_FLAGS { Time tickInterval; /* units: TIME_RESOLUTION */ @@ -208,7 +197,6 @@ typedef struct _MISC_FLAGS { bool generate_stack_trace; bool machineReadable; bool internalCounters; /* See Note [Internal Counter Stats] */ - bool linkerAlwaysPic; /* Assume the object code is always PIC */ StgWord linkerMemBase; /* address to ask the OS for memory * for the linker, NULL ==> off */ } MISC_FLAGS; |