freebsd.h: Rename SUBTARGET_OVERRIDE_OPTIONS to SUBTARGET_OVERRIDE_INTERNAL_OPTIONS.

2016-01-07  Andreas Tobler  <andreast@gcc.gnu.org>

    * config/arm/freebsd.h: Rename SUBTARGET_OVERRIDE_OPTIONS to
    SUBTARGET_OVERRIDE_INTERNAL_OPTIONS. Adjust to check
    unaligned_access on the gcc_options set.
    * config/arm/arm.c (arm_option_override_internal): Use
    SUBTARGET_OVERRIDE_INTERNAL_OPTIONS.

From-SVN: r232141

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db0b95922948866884a2556b33793d352fa83ba2..ad44844071a35ef8429f54889eb79f0d0658d272 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2016-01-07  Andreas Tobler  <andreast@gcc.gnu.org>
+
+       * config/arm/freebsd.h: Rename SUBTARGET_OVERRIDE_OPTIONS to
+       SUBTARGET_OVERRIDE_INTERNAL_OPTIONS. Adjust to check
+       unaligned_access on the gcc_options set.
+       * config/arm/arm.c (arm_option_override_internal): Use
+       SUBTARGET_OVERRIDE_INTERNAL_OPTIONS.
+
 2016-01-07  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/69140

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index b76a91beaae5a3296c62b979a3badbdafc5eea7f..2a479f2eae21919bf4ffd0d5ef33a6a355c6d99d 100644 (file)
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -2954,6 +2954,10 @@ arm_option_override_internal (struct gcc_options *opts,
   /* Thumb2 inline assembly code should always use unified syntax.
      This will apply to ARM and Thumb1 eventually.  */
   opts->x_inline_asm_unified = TARGET_THUMB2_P (opts->x_target_flags);
+
+#ifdef SUBTARGET_OVERRIDE_INTERNAL_OPTIONS
+  SUBTARGET_OVERRIDE_INTERNAL_OPTIONS;
+#endif
 }
 
 /* Fix up any incompatible options that the user has specified.  */

diff --git a/gcc/config/arm/freebsd.h b/gcc/config/arm/freebsd.h
index 0405ada5ff280f4735d1ade50ef7b5499ad4ed88..948fdd6843e35c7e8e99d36df6b8ab0fa757e4e1 100644 (file)
--- a/gcc/config/arm/freebsd.h
+++ b/gcc/config/arm/freebsd.h
@@ -120,10 +120,12 @@
 #define SUBTARGET_CPU_DEFAULT   TARGET_CPU_arm9
 #endif
 
-#define SUBTARGET_OVERRIDE_OPTIONS             \
-do {                                           \
-    if (unaligned_access)                      \
-       unaligned_access = 0;                   \
+#define SUBTARGET_OVERRIDE_INTERNAL_OPTIONS                            \
+do {                                                                   \
+    if (opts_set->x_unaligned_access == 1)                             \
+        warning (0, "target OS does not support unaligned accesses");  \
+    if (opts->x_unaligned_access)                                      \
+       opts->x_unaligned_access = 0;                                   \
 } while (0)
 
 #undef MAX_SYNC_LIBFUNC_SIZE