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 /rts/RtsFlags.c | |
| parent | 76c8fd674435a652c75a96c85abbf26f1f221876 (diff) | |
| download | haskell-172a59335fa6c76b17fb6795e87fbc7fcfd198e6.tar.gz | |
Revert "Batch merge"
This reverts commit 76c8fd674435a652c75a96c85abbf26f1f221876.
Diffstat (limited to 'rts/RtsFlags.c')
| -rw-r--r-- | rts/RtsFlags.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c index 37eafa5c55..ff9635ab24 100644 --- a/rts/RtsFlags.c +++ b/rts/RtsFlags.c @@ -236,7 +236,6 @@ void initRtsFlagsDefaults(void) RtsFlags.MiscFlags.generate_dump_file = false; RtsFlags.MiscFlags.machineReadable = false; RtsFlags.MiscFlags.internalCounters = false; - RtsFlags.MiscFlags.linkerAlwaysPic = DEFAULT_LINKER_ALWAYS_PIC; RtsFlags.MiscFlags.linkerMemBase = 0; #if defined(THREADED_RTS) @@ -458,11 +457,6 @@ usage_text[] = { " -e<n> Maximum number of outstanding local sparks (default: 4096)", #endif #if defined(x86_64_HOST_ARCH) -#if !DEFAULT_LINKER_ALWAYS_PIC -" -xp Assume that all object files were compiled with -fPIC", -" -fexternal-dynamic-refs and load them anywhere in the address", -" space", -#endif " -xm Base address to mmap memory in the GHCi linker", " (hex; must be <80000000)", #endif @@ -1508,11 +1502,6 @@ error = true; break; #if defined(x86_64_HOST_ARCH) - case 'p': /* linkerAlwaysPic */ - OPTION_UNSAFE; - RtsFlags.MiscFlags.linkerAlwaysPic = true; - break; - case 'm': /* linkerMemBase */ OPTION_UNSAFE; if (rts_argv[arg][3] != '\0') { |