* [gomp4] Revert patch
@ 2015-10-09 14:04 James Norris
0 siblings, 0 replies; only message in thread
From: James Norris @ 2015-10-09 14:04 UTC (permalink / raw)
To: GCC Patches; +Cc: Thomas Schwinge
[-- Attachment #1: Type: text/plain, Size: 425 bytes --]
Hi,
The attached patch reverts a previously attached patch.
2015-10-06 James Norris <jnorris@codesourcery.com>
* common.opt (OFFLOAD_ABI_PPC64): New enum.
* config/nvptx/mkoffload.c (compile_native): Handle new enum.
(main): Handle new option.
* config/rs6000/rs6000.c (rs6000_offload_options): New hook.
* gcc/coretypes.h (OFFLOAD_ABI_PPC64): New enum.
Thanks!
Jim
[-- Attachment #2: revert.patch --]
[-- Type: text/x-patch, Size: 3169 bytes --]
diff --git a/gcc/common.opt b/gcc/common.opt
index c366667..290b6b3 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1730,9 +1730,6 @@ Enum(offload_abi) String(ilp32) Value(OFFLOAD_ABI_ILP32)
EnumValue
Enum(offload_abi) String(lp64) Value(OFFLOAD_ABI_LP64)
-EnumValue
-Enum(offload_abi) String(ppc64) Value(OFFLOAD_ABI_PPC64)
-
fomit-frame-pointer
Common Report Var(flag_omit_frame_pointer) Optimization
When possible do not generate stack frames
diff --git a/gcc/config/nvptx/mkoffload.c b/gcc/config/nvptx/mkoffload.c
index 743df4b..e398b44 100644
--- a/gcc/config/nvptx/mkoffload.c
+++ b/gcc/config/nvptx/mkoffload.c
@@ -367,8 +367,6 @@ compile_native (const char *infile, const char *outfile, const char *compiler)
case OFFLOAD_ABI_ILP32:
obstack_ptr_grow (&argv_obstack, "-m32");
break;
- case OFFLOAD_ABI_PPC64:
- break;
default:
gcc_unreachable ();
}
@@ -460,8 +458,6 @@ main (int argc, char **argv)
offload_abi = OFFLOAD_ABI_LP64;
else if (strcmp (argv[i] + strlen (STR), "ilp32") == 0)
offload_abi = OFFLOAD_ABI_ILP32;
- else if (strcmp (argv[i] + strlen (STR), "ppc64") == 0)
- offload_abi = OFFLOAD_ABI_PPC64;
else
fatal_error (input_location,
"unrecognizable argument of option " STR);
@@ -489,8 +485,6 @@ main (int argc, char **argv)
case OFFLOAD_ABI_ILP32:
obstack_ptr_grow (&argv_obstack, "-m32");
break;
- case OFFLOAD_ABI_PPC64:
- break;
default:
gcc_unreachable ();
}
@@ -524,8 +518,7 @@ main (int argc, char **argv)
/* PR libgomp/65099: Currently, we only support offloading in 64-bit
configurations, and only for OpenACC offloading. */
- if ((offload_abi == OFFLOAD_ABI_LP64
- || (offload_abi == OFFLOAD_ABI_PPC64)) && fopenacc)
+ if (offload_abi == OFFLOAD_ABI_LP64 && fopenacc)
{
ptx_name = make_temp_file (".mkoffload");
obstack_ptr_grow (&argv_obstack, "-o");
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 146b45b..023f622 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1688,9 +1688,6 @@ static const struct attribute_spec rs6000_attribute_table[] =
#define TARGET_LIBGCC_SHIFT_COUNT_MODE rs6000_abi_word_mode
#undef TARGET_UNWIND_WORD_MODE
#define TARGET_UNWIND_WORD_MODE rs6000_abi_word_mode
-
-#undef TARGET_OFFLOAD_OPTIONS
-#define TARGET_OFFLOAD_OPTIONS rs6000_offload_options
\f
/* Processor table. */
@@ -9535,13 +9532,6 @@ rs6000_abi_word_mode (void)
return TARGET_32BIT ? SImode : DImode;
}
-/* Implement the TARGET_OFFLOAD_OPTIONS hook. */
-static char *
-rs6000_offload_options (void)
-{
- return xstrdup ("-foffload-abi=ppc64");
-}
-
/* On rs6000, function arguments are promoted, as are function return
values. */
diff --git a/gcc/coretypes.h b/gcc/coretypes.h
index 3bb0528..7b3df54 100644
--- a/gcc/coretypes.h
+++ b/gcc/coretypes.h
@@ -170,8 +170,7 @@ enum tls_model {
enum offload_abi {
OFFLOAD_ABI_UNSET,
OFFLOAD_ABI_LP64,
- OFFLOAD_ABI_ILP32,
- OFFLOAD_ABI_PPC64
+ OFFLOAD_ABI_ILP32
};
/* Types of unwind/exception handling info that can be generated. */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-10-09 14:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-09 14:04 [gomp4] Revert patch James Norris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).