diff options
author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2015-10-26 20:42:30 +0100 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2015-10-26 21:42:57 +0100 |
commit | 23e344bbbd27418bb84bdc588374b3e44f6d23a6 (patch) | |
tree | e621ef8fc81eedfbc9f2ff45a7688d9cd41efb77 /testsuite/tests/rts | |
parent | 73c273af193f56ea339d423e79d803bea5f45db5 (diff) | |
download | haskell-23e344bbbd27418bb84bdc588374b3e44f6d23a6.tar.gz |
Remove cygwin32_HOST_OS #ifdefs
Build system support for Cygwin was removed in b6be81b841.
Test Plan:
- Validate on x86_64/linux
- Cross-compile rts/RtsSymbols.c and rts/Linker.c to Windows using the
i686-w64-mingw32-gcc and x86_64-w64-mingw32-gcc cross compilers.
Reviewers: hvr, austin, bgamari
Reviewed By: bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1371
Diffstat (limited to 'testsuite/tests/rts')
-rw-r--r-- | testsuite/tests/rts/T5435.hs | 2 | ||||
-rw-r--r-- | testsuite/tests/rts/T5435_asm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/tests/rts/T5435.hs b/testsuite/tests/rts/T5435.hs index f3f7c59a79..d3862a5667 100644 --- a/testsuite/tests/rts/T5435.hs +++ b/testsuite/tests/rts/T5435.hs @@ -15,7 +15,7 @@ withPathString = withCString #endif mungeDLL :: FilePath -> FilePath -#if defined(mingw32_HOST_OS) || defined(cygwin32_HOST_OS) +#if defined(mingw32_HOST_OS) -- Strip extension because addDLL on Windows doesn't want it mungeDLL f = let (base, ext) = splitExtension f diff --git a/testsuite/tests/rts/T5435_asm.c b/testsuite/tests/rts/T5435_asm.c index 423c6fd910..59b53b1c3e 100644 --- a/testsuite/tests/rts/T5435_asm.c +++ b/testsuite/tests/rts/T5435_asm.c @@ -11,7 +11,7 @@ static void ctors2(void) { printf("ctors2\n"); fflush(stdout); } static void modInitFunc1(void) { printf("modInitFunc1\n"); fflush(stdout); } static void modInitFunc2(void) { printf("modInitFunc2\n"); fflush(stdout); } -#if defined(cygwin32_HOST_OS) || defined(mingw32_HOST_OS) +#if defined(mingw32_HOST_OS) static void (*ctors[2])(void) __attribute__(( section(".ctors"), |