https://gcc.gnu.org/g:a24a8e821dc5ebba4669cca7893e6ad35fe8c488

commit a24a8e821dc5ebba4669cca7893e6ad35fe8c488
Author: Michael Meissner <[email protected]>
Date:   Fri Nov 6 20:04:48 2026 -0500

    Revert patches

Diff:
---
 gcc/config.gcc                      |  10 --
 gcc/config/rs6000/altivec.md        |  34 +---
 gcc/config/rs6000/constraints.md    |   5 -
 gcc/config/rs6000/float16.md        | 159 ----------------
 gcc/config/rs6000/predicates.md     |  78 --------
 gcc/config/rs6000/rs6000-builtin.cc |  21 ---
 gcc/config/rs6000/rs6000-c.cc       |   6 -
 gcc/config/rs6000/rs6000-call.cc    |   8 +-
 gcc/config/rs6000/rs6000-cpus.def   |   1 -
 gcc/config/rs6000/rs6000-modes.def  |   9 -
 gcc/config/rs6000/rs6000-p8swap.cc  |  14 +-
 gcc/config/rs6000/rs6000-protos.h   |   1 -
 gcc/config/rs6000/rs6000.cc         | 350 +++---------------------------------
 gcc/config/rs6000/rs6000.h          |  22 ---
 gcc/config/rs6000/rs6000.md         |  23 +--
 gcc/config/rs6000/rs6000.opt        |   4 -
 gcc/config/rs6000/vector.md         |  37 +---
 gcc/config/rs6000/vsx.md            | 163 +++++++----------
 gcc/doc/invoke.texi                 |  25 +--
 gcc/doc/md.texi                     |   3 -
 20 files changed, 111 insertions(+), 862 deletions(-)

diff --git a/gcc/config.gcc b/gcc/config.gcc
index e3b6a996b15f..d5fdbd0b8646 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -5880,16 +5880,6 @@ case "${target}" in
                elif test x$with_long_double_format = xibm; then
                    tm_defines="${tm_defines} TARGET_IEEEQUAD_DEFAULT=0"
                fi
-
-               # Test if we should enable 16-bit floating point on the
-               # PowerPC platforms where we can support __bf16 and
-               # _Float16.
-               if test x$with_powerpc_float16 = xyes; then
-                   tm_defines="${tm_defines} POWERPC_FLOAT16_DEFAULT=1"
-
-               elif test x$with_powerpc_16bit_floating_point = xyes; then
-                   tm_defines="${tm_defines} POWERPC_FLOAT16_DEFAULT=1"
-               fi
                ;;
 
        s390x-*-*)
diff --git a/gcc/config/rs6000/altivec.md b/gcc/config/rs6000/altivec.md
index 80ffe661fc9e..9ca49a32801f 100644
--- a/gcc/config/rs6000/altivec.md
+++ b/gcc/config/rs6000/altivec.md
@@ -203,8 +203,6 @@
 ;; otherwise handled by altivec (v2df, v2di, ti)
 (define_mode_iterator VM [V4SI
                          V8HI
-                         V8BF
-                         V8HF
                          V16QI
                          V4SF
                          V2DF
@@ -217,8 +215,6 @@
 ;; Like VM, except don't do TImode
 (define_mode_iterator VM2 [V4SI
                           V8HI
-                          V8BF
-                          V8HF
                           V16QI
                           V4SF
                           V2DF
@@ -238,38 +234,18 @@
                               V1TI
                               TI])
 
-(define_mode_attr VI_char [(V2DI "d")
-                          (V4SI "w")
-                          (V8HI "h")
-                          (V8BF "h")
-                          (V8HF "h")
-                          (V16QI "b")])
-(define_mode_attr VI_scalar [(V2DI "DI")
-                            (V4SI "SI")
-                            (V8HI "HI")
-                            (V8BF "BF")
-                            (V8HF "HF")
-                            (V16QI "QI")])
+(define_mode_attr VI_char [(V2DI "d") (V4SI "w") (V8HI "h") (V16QI "b")])
+(define_mode_attr VI_scalar [(V2DI "DI") (V4SI "SI") (V8HI "HI") (V16QI "QI")])
 (define_mode_attr VI_unit [(V16QI "VECTOR_UNIT_ALTIVEC_P (V16QImode)")
                           (V8HI "VECTOR_UNIT_ALTIVEC_P (V8HImode)")
-                          (V8BF "VECTOR_UNIT_ALTIVEC_P (V8BFmode)")
-                          (V8HF "VECTOR_UNIT_ALTIVEC_P (V8HFmode)")
                           (V4SI "VECTOR_UNIT_ALTIVEC_P (V4SImode)")
                           (V2DI "VECTOR_UNIT_P8_VECTOR_P (V2DImode)")])
 
 ;; Vector pack/unpack
 (define_mode_iterator VP [V2DI V4SI V8HI])
-(define_mode_attr VP_small [(V2DI "V4SI")
-                           (V4SI "V8HI")
-                           (V8HI "V16QI")])
-(define_mode_attr VP_small_lc [(V2DI "v4si")
-                              (V4SI "v8hi")
-                              (V8HI "v16qi")])
-(define_mode_attr VU_char [(V2DI "w")
-                          (V4SI "h")
-                          (V8HI "b")
-                          (V8BF "b")
-                          (V8HF "b")])
+(define_mode_attr VP_small [(V2DI "V4SI") (V4SI "V8HI") (V8HI "V16QI")])
+(define_mode_attr VP_small_lc [(V2DI "v4si") (V4SI "v8hi") (V8HI "v16qi")])
+(define_mode_attr VU_char [(V2DI "w") (V4SI "h") (V8HI "b")])
 
 ;; Vector negate
 (define_mode_iterator VNEG [V4SI V2DI])
diff --git a/gcc/config/rs6000/constraints.md b/gcc/config/rs6000/constraints.md
index 292ca67efb57..7a21815675a3 100644
--- a/gcc/config/rs6000/constraints.md
+++ b/gcc/config/rs6000/constraints.md
@@ -233,11 +233,6 @@
   (and (match_code "const_int")
        (match_operand 0 "paddis_paddi_operand")))
 
-;; A negative 0 constant
-(define_constraint "eZ"
-  "A floating point -0.0 constant."
-  (match_operand 0 "minus_zero_constant"))
-
 ;; Floating-point constraints.  These two are defined so that insn
 ;; length attributes can be calculated exactly.
 
diff --git a/gcc/config/rs6000/float16.md b/gcc/config/rs6000/float16.md
deleted file mode 100644
index 29d970cda74f..000000000000
--- a/gcc/config/rs6000/float16.md
+++ /dev/null
@@ -1,159 +0,0 @@
-;; Machine description for IBM RISC System 6000 (POWER) for GNU C compiler
-;; Copyright (C) 1990-2025 Free Software Foundation, Inc.
-;; Contributed by Richard Kenner ([email protected])
-
-;; This file is part of GCC.
-
-;; GCC is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published
-;; by the Free Software Foundation; either version 3, or (at your
-;; option) any later version.
-
-;; GCC is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GCC; see the file COPYING3.  If not see
-;; <http://www.gnu.org/licenses/>.
-
-;; Support for _Float16 (HFmode) and __bf16 (BFmode)
-
-;; Mode iterator for 16-bit floating point modes both as a scalar and
-;; as a vector.
-(define_mode_iterator FP16     [BF HF])
-(define_mode_iterator VS_FP16  [BF HF V8BF V8HF])
-(define_mode_iterator VFP16    [V8BF V8HF])
-
-;; Mode attribute giving the vector mode for a 16-bit floating point
-;; scalar in both upper and lower case.
-(define_mode_attr FP16_VECTOR8 [(BF "V8BF")
-                               (HF "V8HF")])
-
-(define_mode_attr fp16_vector8 [(BF "v8bf")
-                               (HF "v8hf")])
-
-;; _Float16 and __bf16 moves
-(define_expand "mov<mode>"
-  [(set (match_operand:FP16 0 "nonimmediate_operand")
-       (match_operand:FP16 1 "any_operand"))]
-  "TARGET_FLOAT16"
-{
-  if (MEM_P (operands[0]) && !REG_P (operands[1]))
-    operands[1] = force_reg (<MODE>mode, operands[1]);
-})
-
-;; On power10, we can load up HFmode and BFmode constants with xxspltiw
-;; or pli.
-(define_insn "*mov<mode>_xxspltiw"
-  [(set (match_operand:FP16 0 "gpc_reg_operand"        "=wa,wa,?r,?r")
-       (match_operand:FP16 1 "fp16_xxspltiw_constant"   "j,eP,j, eP"))]
-  "TARGET_FLOAT16
-   && (TARGET_PREFIXED || operands[1] == CONST0_RTX (<MODE>mode))"
-{
-  rtx op1 = operands[1];
-  const REAL_VALUE_TYPE *rtype = CONST_DOUBLE_REAL_VALUE (op1);
-  long real_words[1];
-
-  if (op1 == CONST0_RTX (<MODE>mode))
-    return (!vsx_register_operand (operands[0], <MODE>mode)
-           ? "li %0,0"
-           : "xxlxor %x0,%x0,%x0");
-
-  real_to_target (real_words, rtype, <MODE>mode);
-  operands[2] = GEN_INT (real_words[0]);
-  return (vsx_register_operand (operands[0], <MODE>mode)
-         ? "xxspltiw %x0,%2"
-         : "li %0,%2");
-}
-  [(set_attr "type"     "veclogical, vecsimple, *,  *")
-   (set_attr "prefixed" "no,         yes,       no, yes")])
-
-;; Handle creating -0.0 if we don't have XXSPLTIW.  For the scalar
-;; modes, we can't do the gen_lowpart call until after register
-;; allocation.
-(define_split
-  [(set (match_operand:VS_FP16 0 "altivec_register_operand")
-       (match_operand:VS_FP16 1 "minus_zero_constant"))]
-  "TARGET_FLOAT16 && reload_completed"
-  [(const_int 0)]
-{
-  int dest_r = reg_or_subregno (operands[0]);
-  rtx dest = gen_rtx_REG (V8HImode, dest_r);
-  size_t nunits = GET_MODE_NUNITS (V8HFmode);
-
-  rtvec v = rtvec_alloc (nunits);
-  for (size_t i = 0; i < nunits; i++)
-    RTVEC_ELT (v, i) = constm1_rtx;
-
-  rs6000_expand_vector_init (dest, gen_rtx_PARALLEL (V8HImode, v));
-  emit_insn (gen_rtx_SET (dest, gen_rtx_ASHIFT (V8HImode, dest, dest)));
-  DONE;
-})
-
-
-(define_insn "*mov<mode>_internal"
-  [(set (match_operand:FP16 0 "nonimmediate_operand"
-                      "=wa,       wa,       Z,         r,          r,
-                        m,        r,        wa,        wa,         r,
-                        v")
-
-       (match_operand:FP16 1 "any_operand"
-                      "wa,        Z,        wa,        r,          m,
-                       r,         wa,       r,         j,          j,
-                       eZ"))]
-  "TARGET_FLOAT16
-   && (gpc_reg_operand (operands[0], <MODE>mode)
-       || gpc_reg_operand (operands[1], <MODE>mode))"
-  "@
-   xxlor %x0,%x1,%x1
-   lxsihzx %x0,%y1
-   stxsihx %x1,%y0
-   mr %0,%1
-   lhz%U1%X1 %0,%1
-   sth%U0%X0 %1,%0
-   mfvsrwz %0,%x1
-   mtvsrwz %x0,%1
-   xxlxor %x0,%x0,%x0
-   li %0,0
-   #"
-  [(set_attr "type"   "vecsimple, fpload,    fpstore,   *,          load,
-                       store,     mtvsr,     mfvsr,     veclogical, *,
-                       vecperm")
-   (set_attr "isa"    "*,         p9v,       p9v,       *,          *,
-                       *,         p8v,       p8v,       p9v,        *,
-                       *")
-   (set_attr "length" "*,         *,         *,         *,          *,
-                       *,         *,         *,         *,          *,
-                       8")])
-
-;; Vector duplicate
-(define_insn "*vecdup<mode>_reg"
-  [(set (match_operand:<FP16_VECTOR8> 0 "altivec_register_operand" "=v")
-       (vec_duplicate:<FP16_VECTOR8>
-        (match_operand:FP16 1 "altivec_register_operand" "v")))]
-  "TARGET_FLOAT16"
-  "vsplth %0,%1,3"
-  [(set_attr "type" "vecperm")])
-
-(define_insn "*vecdup<mode>_const"
-  [(set (match_operand:<FP16_VECTOR8> 0 "vsx_register_operand" "=wa,wa")
-       (vec_duplicate:<FP16_VECTOR8>
-        (match_operand:FP16 1 "fp16_xxspltiw_constant" "j,eP")))]
-  "TARGET_FLOAT16
-   && (TARGET_PREFIXED || operands[1] == CONST0_RTX (<MODE>mode))"
-{
-  rtx op1 = operands[1];
-  if (op1 == CONST0_RTX (<MODE>mode))
-    return "xxlxor %x0,%x0,%x0";
-
-  const REAL_VALUE_TYPE *rtype = CONST_DOUBLE_REAL_VALUE (op1);
-  long real_words[1];
-
-  real_to_target (real_words, rtype, <MODE>mode);
-  operands[2] = GEN_INT (real_words[0]);
-  return "xxspltiw %x0,2";
-}
-  [(set_attr "type" "veclogical,vecperm")
-   (set_attr "prefixed" "*,yes")])
diff --git a/gcc/config/rs6000/predicates.md b/gcc/config/rs6000/predicates.md
index eb98d7109b2f..7e028b16a787 100644
--- a/gcc/config/rs6000/predicates.md
+++ b/gcc/config/rs6000/predicates.md
@@ -721,11 +721,6 @@
   if (TARGET_VSX && op == CONST0_RTX (mode))
     return 1;
 
-  /* If we are on power10, we can use XXSPLTIW to load constants.  On power8
-     and power9, we can use direct move.  */
-  if (FP16_SCALAR_MODE_P (mode))
-    return true;
-
   /* Constants that can be generated with ISA 3.1 instructions are easy.  */
   vec_const_128bit_type vsx_const;
   if (TARGET_POWER10 && vec_const_128bit_to_bytes (op, mode, &vsx_const))
@@ -869,10 +864,6 @@
            return true;
        }
 
-      /* -0,0 can be done as VSPLTIH x,-1 and VSLH x,x,x.  */
-      if (FP16_VECTOR_MODE_P (mode) && minus_zero_constant (op, mode))
-       return true;
-
       if (TARGET_P9_VECTOR
           && xxspltib_constant_p (op, mode, &num_insns, &value))
        return true;
@@ -2301,72 +2292,3 @@
 (define_predicate "lxvl_else_operand"
   (and (match_code "const_vector")
        (match_test "op == CONST0_RTX (GET_MODE (op))")))
-
-;; Return 1 if this is a floating point scalar constant that is -0.0 or
-;; a vector floating point constant where each element is -0.0.
-(define_predicate "minus_zero_constant"
-  (match_code "const_double,vec_duplicate,const_vector")
-{
-  if (GET_CODE (op) == VEC_DUPLICATE)
-    {
-      op = XEXP (op, 0);
-      if (!CONST_DOUBLE_P (op))
-       return false;
-
-      mode = GET_MODE (op);
-    }
-
-  /* Scalar or vector filled with duplicates.  */
-  if (CONST_DOUBLE_P (op))
-    {
-      if (!SCALAR_FLOAT_MODE_P (mode))
-       return false;
-
-      const REAL_VALUE_TYPE *rtype = CONST_DOUBLE_REAL_VALUE (op);
-      return real_isnegzero (rtype);
-    }
-
-  /* Vector constant, check all elements.  */
-  else if (CONST_VECTOR_P (op))
-    {
-      if (GET_MODE_CLASS (mode) != MODE_VECTOR_FLOAT)
-       return false;
-
-      size_t nunits = GET_MODE_NUNITS (mode);
-      for (size_t i = 0; i < nunits; i++)
-       {
-         rtx ele = CONST_VECTOR_ELT (op, i);
-         if (!CONST_DOUBLE_P (ele))
-           return false;
-
-         const REAL_VALUE_TYPE *rtype = CONST_DOUBLE_REAL_VALUE (ele);
-         if (!real_isnegzero (rtype))
-           return false;
-       }
-
-      return true;
-    }
-
-  return false;
-})
-    
-;; Return 1 if this is a 16-bit floating point constant that can be
-;; loaded with XXSPLTIW or is 0.0 that can be loaded with XXSPLTIB.
-(define_predicate "fp16_xxspltiw_constant"
-  (match_code "const_double")
-{
-  if (!FP16_SCALAR_MODE_P (mode))
-    return false;
-
-  if (op == CONST0_RTX (mode))
-    return true;
-
-  if (!TARGET_PREFIXED)
-    return false;
-
-  vec_const_128bit_type vsx_const;
-  if (!vec_const_128bit_to_bytes (op, mode, &vsx_const))
-    return false;
-
-  return constant_generates_xxspltiw (&vsx_const);
-})
diff --git a/gcc/config/rs6000/rs6000-builtin.cc 
b/gcc/config/rs6000/rs6000-builtin.cc
index 3faee40ab2aa..33c82b949528 100644
--- a/gcc/config/rs6000/rs6000-builtin.cc
+++ b/gcc/config/rs6000/rs6000-builtin.cc
@@ -513,10 +513,6 @@ const char *rs6000_type_string (tree type_node)
     return "voidc*";
   else if (type_node == float128_type_node)
     return "_Float128";
-  else if (type_node == float16_type_node)
-    return "_Float16";
-  else if (TARGET_FLOAT16 && type_node == bfloat16_type_node)
-    return "__bf16";
   else if (type_node == vector_pair_type_node)
     return "__vector_pair";
   else if (type_node == vector_quad_type_node)
@@ -799,23 +795,6 @@ rs6000_init_builtins (void)
       lang_hooks.types.register_builtin_type (uintPTI_type_internal_node,
                                              "__upti_internal");
     }
-
-  /* __bf16 support.  */
-  if (TARGET_FLOAT16)
-    {
-      if (!bfloat16_type_node)
-       {
-         bfloat16_type_node = make_node (REAL_TYPE);
-         TYPE_PRECISION (bfloat16_type_node) = 16;
-         SET_TYPE_MODE (bfloat16_type_node, BFmode);
-         layout_type (bfloat16_type_node);
-         t = build_qualified_type (bfloat16_type_node, TYPE_QUAL_CONST);
-       }
-
-      lang_hooks.types.register_builtin_type (bfloat16_type_node,
-                                             "__bf16");
-    }
-
   /* Vector pair and vector quad support.  */
   vector_pair_type_node = make_node (OPAQUE_TYPE);
   SET_TYPE_MODE (vector_pair_type_node, OOmode);
diff --git a/gcc/config/rs6000/rs6000-c.cc b/gcc/config/rs6000/rs6000-c.cc
index 8630d12e4bd4..1e5988e1f06f 100644
--- a/gcc/config/rs6000/rs6000-c.cc
+++ b/gcc/config/rs6000/rs6000-c.cc
@@ -583,12 +583,6 @@ rs6000_target_modify_macros (bool define_p, HOST_WIDE_INT 
flags)
   if ((flags & OPTION_MASK_FLOAT128_HW) != 0)
     rs6000_define_or_undefine_macro (define_p, "__FLOAT128_HARDWARE__");
 
-  /* 16-bit floating point support.  */
-  if ((flags & OPTION_MASK_FLOAT16) != 0)
-    {
-      rs6000_define_or_undefine_macro (define_p, "__FLOAT16__");
-      rs6000_define_or_undefine_macro (define_p, "__BFLOAT16__");
-    }
   /* Tell the user if we are targeting CELL.  */
   if (rs6000_cpu == PROCESSOR_CELL)
     rs6000_define_or_undefine_macro (define_p, "__PPU__");
diff --git a/gcc/config/rs6000/rs6000-call.cc b/gcc/config/rs6000/rs6000-call.cc
index ca2f7170a412..742751465fa8 100644
--- a/gcc/config/rs6000/rs6000-call.cc
+++ b/gcc/config/rs6000/rs6000-call.cc
@@ -590,7 +590,7 @@ call_ABI_of_interest (tree fndecl)
 
 void
 init_cumulative_args (CUMULATIVE_ARGS *cum, tree fntype,
-                     rtx libname, int incoming,
+                     rtx libname ATTRIBUTE_UNUSED, int incoming,
                      int libcall, int n_named_args,
                      tree fndecl,
                      machine_mode return_mode ATTRIBUTE_UNUSED)
@@ -653,12 +653,6 @@ init_cumulative_args (CUMULATIVE_ARGS *cum, tree fntype,
       if (cum->call_cookie & CALL_LONG)
        fprintf (stderr, " longcall,");
 
-      if (libname)
-       fprintf (stderr, " name=%s,", XSTR (libname, 0));
-
-      if (libcall)
-       fprintf (stderr, " libcall,");
-
       fprintf (stderr, " proto = %d, nargs = %d\n",
               cum->prototype, cum->nargs_prototype);
     }
diff --git a/gcc/config/rs6000/rs6000-cpus.def 
b/gcc/config/rs6000/rs6000-cpus.def
index cac42403fd94..4dcdcf7c858d 100644
--- a/gcc/config/rs6000/rs6000-cpus.def
+++ b/gcc/config/rs6000/rs6000-cpus.def
@@ -131,7 +131,6 @@
                                 | OPTION_MASK_EFFICIENT_UNALIGNED_VSX  \
                                 | OPTION_MASK_FLOAT128_HW              \
                                 | OPTION_MASK_FLOAT128_KEYWORD         \
-                                | OPTION_MASK_FLOAT16                  \
                                 | OPTION_MASK_FPRND                    \
                                 | OPTION_MASK_POWER10                  \
                                 | OPTION_MASK_POWER11                  \
diff --git a/gcc/config/rs6000/rs6000-modes.def 
b/gcc/config/rs6000/rs6000-modes.def
index 4e566177acb2..0ad326751c4a 100644
--- a/gcc/config/rs6000/rs6000-modes.def
+++ b/gcc/config/rs6000/rs6000-modes.def
@@ -45,13 +45,6 @@ FLOAT_MODE (TF, 16, ieee_quad_format);
 /* IBM 128-bit floating point.  */
 FLOAT_MODE (IF, 16, ibm_extended_format);
 
-/* Explicit IEEE 16-bit floating point.  */
-FLOAT_MODE (HF, 2, ieee_half_format);
-
-/* Explicit bfloat16 floating point.  */
-FLOAT_MODE (BF, 2, arm_bfloat_half_format);
-ADJUST_FLOAT_FORMAT (BF, &arm_bfloat_half_format);
-
 /* Add any extra modes needed to represent the condition code.
 
    For the RS/6000, we need separate modes when unsigned (logical) comparisons
@@ -77,8 +70,6 @@ VECTOR_MODES (FLOAT, 32);     /*       V16HF V8SF V4DF */
 /* Half VMX/VSX vector (for internal use)  */
 VECTOR_MODE (FLOAT, SF, 2);   /*                 V2SF  */
 VECTOR_MODE (INT, SI, 2);     /*                 V2SI  */
-VECTOR_MODE (FLOAT, BF, 4);   /*                 V4BF  */
-VECTOR_MODE (FLOAT, HF, 4);   /*                 V4HF  */
 
 /* Replacement for TImode that only is allowed in GPRs.  We also use PTImode
    for quad memory atomic operations to force getting an even/odd register
diff --git a/gcc/config/rs6000/rs6000-p8swap.cc 
b/gcc/config/rs6000/rs6000-p8swap.cc
index e18674e0b3d9..de1cf8596f2e 100644
--- a/gcc/config/rs6000/rs6000-p8swap.cc
+++ b/gcc/config/rs6000/rs6000-p8swap.cc
@@ -1597,10 +1597,10 @@ rs6000_gen_stvx (enum machine_mode mode, rtx dest_exp, 
rtx src_exp)
     stvx = gen_altivec_stvx_v16qi (src_exp, dest_exp);
   else if (mode == V8HImode)
     stvx = gen_altivec_stvx_v8hi (src_exp, dest_exp);
+#ifdef HAVE_V8HFmode
   else if (mode == V8HFmode)
     stvx = gen_altivec_stvx_v8hf (src_exp, dest_exp);
-  else if (mode == V8BFmode)
-    stvx = gen_altivec_stvx_v8bf (src_exp, dest_exp);
+#endif
   else if (mode == V4SImode)
     stvx = gen_altivec_stvx_v4si (src_exp, dest_exp);
   else if (mode == V4SFmode)
@@ -1721,10 +1721,10 @@ rs6000_gen_lvx (enum machine_mode mode, rtx dest_exp, 
rtx src_exp)
     lvx = gen_altivec_lvx_v16qi (dest_exp, src_exp);
   else if (mode == V8HImode)
     lvx = gen_altivec_lvx_v8hi (dest_exp, src_exp);
+#ifdef HAVE_V8HFmode
   else if (mode == V8HFmode)
     lvx = gen_altivec_lvx_v8hf (dest_exp, src_exp);
-  else if (mode == V8BFmode)
-    lvx = gen_altivec_lvx_v8bf (dest_exp, src_exp);
+#endif
   else if (mode == V4SImode)
     lvx = gen_altivec_lvx_v4si (dest_exp, src_exp);
   else if (mode == V4SFmode)
@@ -1929,7 +1929,11 @@ replace_swapped_load_constant (swap_web_entry 
*insn_entry, rtx_insn *swap_insn)
       rtx new_const_vector = gen_rtx_CONST_VECTOR (mode, XVEC (vals, 0));
       new_mem = force_const_mem (mode, new_const_vector);
     }
-  else if (mode == V8HImode || mode == V8HFmode || mode == V8BFmode)
+  else if ((mode == V8HImode)
+#ifdef HAVE_V8HFmode
+          || (mode == V8HFmode)
+#endif
+          )
     {
       rtx vals = gen_rtx_PARALLEL (mode, rtvec_alloc (8));
       int i;
diff --git a/gcc/config/rs6000/rs6000-protos.h 
b/gcc/config/rs6000/rs6000-protos.h
index 5d5074ca51b7..cc5818d668da 100644
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -250,7 +250,6 @@ typedef struct {
   bool all_words_same;                 /* Are the words all equal?  */
   bool all_half_words_same;            /* Are the half words all equal?  */
   bool all_bytes_same;                 /* Are the bytes all equal?  */
-  machine_mode mode;                   /* Original constant mode.  */
 } vec_const_128bit_type;
 
 extern bool vec_const_128bit_to_bytes (rtx, machine_mode,
diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc
index 893654f57fed..a957a13c2713 100644
--- a/gcc/config/rs6000/rs6000.cc
+++ b/gcc/config/rs6000/rs6000.cc
@@ -1924,8 +1924,7 @@ rs6000_hard_regno_mode_ok_uncached (int regno, 
machine_mode mode)
 
       if (ALTIVEC_REGNO_P (regno))
        {
-         if (GET_MODE_SIZE (mode) < 16 && !reg_addr[mode].scalar_in_vmx_p
-             && !FP16_SCALAR_MODE_P (mode))
+         if (GET_MODE_SIZE (mode) < 16 && !reg_addr[mode].scalar_in_vmx_p)
            return 0;
 
          return ALTIVEC_REGNO_P (last_regno);
@@ -2016,8 +2015,7 @@ rs6000_modes_tieable_p (machine_mode mode1, machine_mode 
mode2)
 {
   if (mode1 == PTImode || mode1 == OOmode || mode1 == XOmode
       || mode1 == TDOmode || mode2 == PTImode || mode2 == OOmode
-      || mode2 == XOmode || mode2 == TDOmode
-      || FP16_SCALAR_MODE_P (mode1) || FP16_SCALAR_MODE_P (mode2))
+      || mode2 == XOmode || mode2 == TDOmode)
     return mode1 == mode2;
 
   if (ALTIVEC_OR_VSX_VECTOR_MODE (mode1))
@@ -2256,20 +2254,6 @@ rs6000_debug_print_mode (ssize_t m)
 #define DEBUG_FMT_WX  DEBUG_FMT_ID "%#.12" HOST_WIDE_INT_PRINT "x: "
 #define DEBUG_FMT_S   DEBUG_FMT_ID "%s\n"
 
-/* Print interesting floating point information.  */
-static void
-rs6000_debug_fp_mode (machine_mode m)
-{
-  fprintf (stderr,
-          DEBUG_FMT_ID "nan: %c, snan: %c, inf: %c, -0: %c, size: %2d\n",
-          GET_MODE_NAME (m),
-          HONOR_NANS (m)         ? 'y' : 'n',
-          HONOR_SNANS (m)        ? 'y' : 'n',
-          HONOR_INFINITIES (m)   ? 'y' : 'n',
-          HONOR_SIGNED_ZEROS (m) ? 'y' : 'n',
-          (int) GET_MODE_SIZE (m));
-}
-
 /* Print various interesting information with -mdebug=reg.  */
 static void
 rs6000_debug_reg_global (void)
@@ -2296,8 +2280,6 @@ rs6000_debug_reg_global (void)
     DImode,
     TImode,
     PTImode,
-    BFmode,
-    HFmode,
     SFmode,
     DFmode,
     TFmode,
@@ -2318,8 +2300,6 @@ rs6000_debug_reg_global (void)
     V8SImode,
     V4DImode,
     V2TImode,
-    V8BFmode,
-    V8HFmode,
     V4SFmode,
     V2DFmode,
     V8SFmode,
@@ -2650,63 +2630,6 @@ rs6000_debug_reg_global (void)
   if (TARGET_DIRECT_MOVE_128)
     fprintf (stderr, DEBUG_FMT_D, "VSX easy 64-bit mfvsrld element",
             (int)VECTOR_ELEMENT_MFVSRLD_64BIT);
-
-  if (TARGET_FLOAT16)
-    {
-      fprintf (stderr, DEBUG_FMT_S, "_Float16",
-              (TARGET_FLOAT16_HW ? "hardware" : "software"));
-      fprintf (stderr, DEBUG_FMT_S, "__bf16",
-              (TARGET_BFLOAT16_HW ? "hardware" : "software"));
-
-#if POWERPC_FLOAT16_DEFAULT
-      fprintf (stderr, DEBUG_FMT_S, "float16 configured", "enabled");
-#endif
-    }
-  else
-    {
-      fprintf (stderr, DEBUG_FMT_S, "_Float16", "disabled");
-      fprintf (stderr, DEBUG_FMT_S, "__bf16", "disabled");
-    }
-
-  if (TARGET_HARD_FLOAT)
-    {
-      rs6000_debug_fp_mode (SFmode);
-      rs6000_debug_fp_mode (DFmode);
-
-      if (rs6000_long_double_type_size == 128)
-       rs6000_debug_fp_mode (TFmode);
-
-      if (TARGET_FLOAT128_TYPE)
-       {
-         rs6000_debug_fp_mode (KFmode);
-         rs6000_debug_fp_mode (IFmode);
-       }
-
-      if (TARGET_DFP)
-       {
-         rs6000_debug_fp_mode (SDmode);
-         rs6000_debug_fp_mode (DDmode);
-         rs6000_debug_fp_mode (TDmode);
-       }
-
-      if (TARGET_FLOAT16)
-       {
-         rs6000_debug_fp_mode (BFmode);
-         rs6000_debug_fp_mode (HFmode);
-       }
-
-      if (TARGET_VSX)
-       {
-         rs6000_debug_fp_mode (V4SFmode);
-         rs6000_debug_fp_mode (V2DFmode);
-
-         if (TARGET_FLOAT16)
-           {
-             rs6000_debug_fp_mode (V8BFmode);
-             rs6000_debug_fp_mode (V8HFmode);
-           }
-       }
-    }
 }
 
 
@@ -2737,14 +2660,8 @@ rs6000_setup_reg_addr_masks (void)
 
       /* SDmode is special in that we want to access it only via REG+REG
         addressing on power7 and above, since we want to use the LFIWZX and
-        STFIWZX instructions to load it.
-
-        Never allow offset addressing for 16-bit floating point modes, since
-        it is expected that 16-bit floating point should always go into the
-        vector registers and we only have indexed and indirect 16-bit loads to
-        VSR registers.  */
-      bool indexed_only_p = ((m == SDmode && TARGET_NO_SDMODE_STACK)
-                            || FP16_SCALAR_MODE_P (m));
+        STFIWZX instructions to load it.  */
+      bool indexed_only_p = (m == SDmode && TARGET_NO_SDMODE_STACK);
 
       any_addr_mask = 0;
       for (rc = FIRST_RELOAD_REG_CLASS; rc <= LAST_RELOAD_REG_CLASS; rc++)
@@ -2807,7 +2724,6 @@ rs6000_setup_reg_addr_masks (void)
                  && !complex_p
                  && (m != E_DFmode || !TARGET_VSX)
                  && (m != E_SFmode || !TARGET_P8_VECTOR)
-                 && !FP16_SCALAR_MODE_P (m)
                  && !small_int_vsx_p)
                {
                  addr_mask |= RELOAD_REG_PRE_INCDEC;
@@ -3030,24 +2946,18 @@ rs6000_init_hard_regno_mode_ok (bool global_init_p)
       rs6000_vector_unit[V16QImode] = VECTOR_ALTIVEC;
       rs6000_vector_align[V4SImode] = align32;
       rs6000_vector_align[V8HImode] = align32;
-      rs6000_vector_align[V8HFmode] = align32;
-      rs6000_vector_align[V8BFmode] = align32;
       rs6000_vector_align[V16QImode] = align32;
 
       if (TARGET_VSX)
        {
          rs6000_vector_mem[V4SImode] = VECTOR_VSX;
          rs6000_vector_mem[V8HImode] = VECTOR_VSX;
-         rs6000_vector_mem[V8HFmode] = VECTOR_VSX;
-         rs6000_vector_mem[V8BFmode] = VECTOR_VSX;
          rs6000_vector_mem[V16QImode] = VECTOR_VSX;
        }
       else
        {
          rs6000_vector_mem[V4SImode] = VECTOR_ALTIVEC;
          rs6000_vector_mem[V8HImode] = VECTOR_ALTIVEC;
-         rs6000_vector_mem[V8HFmode] = VECTOR_ALTIVEC;
-         rs6000_vector_mem[V8BFmode] = VECTOR_ALTIVEC;
          rs6000_vector_mem[V16QImode] = VECTOR_ALTIVEC;
        }
     }
@@ -3067,15 +2977,6 @@ rs6000_init_hard_regno_mode_ok (bool global_init_p)
       rs6000_vector_align[V1TImode] = 128;
     }
 
-  /* _Float16 support.  */
-  if (TARGET_FLOAT16)
-    {
-      rs6000_vector_mem[HFmode] = VECTOR_VSX;
-      rs6000_vector_mem[BFmode] = VECTOR_VSX;
-      rs6000_vector_align[HFmode] = 16;
-      rs6000_vector_align[BFmode] = 16;
-    }
-
   /* DFmode, see if we want to use the VSX unit.  Memory is handled
      differently, so don't set rs6000_vector_mem.  */
   if (TARGET_VSX)
@@ -3162,10 +3063,6 @@ rs6000_init_hard_regno_mode_ok (bool global_init_p)
          reg_addr[V16QImode].reload_load  = CODE_FOR_reload_v16qi_di_load;
          reg_addr[V8HImode].reload_store  = CODE_FOR_reload_v8hi_di_store;
          reg_addr[V8HImode].reload_load   = CODE_FOR_reload_v8hi_di_load;
-         reg_addr[V8BFmode].reload_store  = CODE_FOR_reload_v8bf_di_store;
-         reg_addr[V8BFmode].reload_load   = CODE_FOR_reload_v8bf_di_load;
-         reg_addr[V8HFmode].reload_store  = CODE_FOR_reload_v8hf_di_store;
-         reg_addr[V8HFmode].reload_load   = CODE_FOR_reload_v8hf_di_load;
          reg_addr[V4SImode].reload_store  = CODE_FOR_reload_v4si_di_store;
          reg_addr[V4SImode].reload_load   = CODE_FOR_reload_v4si_di_load;
          reg_addr[V2DImode].reload_store  = CODE_FOR_reload_v2di_di_store;
@@ -3195,14 +3092,6 @@ rs6000_init_hard_regno_mode_ok (bool global_init_p)
              reg_addr[TFmode].reload_load  = CODE_FOR_reload_tf_di_load;
            }
 
-         if (TARGET_FLOAT16)
-           {
-             reg_addr[HFmode].reload_store = CODE_FOR_reload_hf_di_store;
-             reg_addr[BFmode].reload_store = CODE_FOR_reload_bf_di_store;
-             reg_addr[HFmode].reload_load  = CODE_FOR_reload_hf_di_load;
-             reg_addr[BFmode].reload_load  = CODE_FOR_reload_bf_di_load;
-           }
-
          /* Only provide a reload handler for SDmode if lfiwzx/stfiwx are
             available.  */
          if (TARGET_NO_SDMODE_STACK)
@@ -3225,8 +3114,6 @@ rs6000_init_hard_regno_mode_ok (bool global_init_p)
              reg_addr[V2DImode].reload_gpr_vsx  = 
CODE_FOR_reload_gpr_from_vsxv2di;
              reg_addr[V4SFmode].reload_gpr_vsx  = 
CODE_FOR_reload_gpr_from_vsxv4sf;
              reg_addr[V4SImode].reload_gpr_vsx  = 
CODE_FOR_reload_gpr_from_vsxv4si;
-             reg_addr[V8BFmode].reload_gpr_vsx  = 
CODE_FOR_reload_gpr_from_vsxv8bf;
-             reg_addr[V8HFmode].reload_gpr_vsx  = 
CODE_FOR_reload_gpr_from_vsxv8hf;
              reg_addr[V8HImode].reload_gpr_vsx  = 
CODE_FOR_reload_gpr_from_vsxv8hi;
              reg_addr[V16QImode].reload_gpr_vsx = 
CODE_FOR_reload_gpr_from_vsxv16qi;
              reg_addr[SFmode].reload_gpr_vsx    = 
CODE_FOR_reload_gpr_from_vsxsf;
@@ -3237,8 +3124,6 @@ rs6000_init_hard_regno_mode_ok (bool global_init_p)
              reg_addr[V2DImode].reload_vsx_gpr  = 
CODE_FOR_reload_vsx_from_gprv2di;
              reg_addr[V4SFmode].reload_vsx_gpr  = 
CODE_FOR_reload_vsx_from_gprv4sf;
              reg_addr[V4SImode].reload_vsx_gpr  = 
CODE_FOR_reload_vsx_from_gprv4si;
-             reg_addr[V8BFmode].reload_vsx_gpr  = 
CODE_FOR_reload_vsx_from_gprv8bf;
-             reg_addr[V8HFmode].reload_vsx_gpr  = 
CODE_FOR_reload_vsx_from_gprv8hf;
              reg_addr[V8HImode].reload_vsx_gpr  = 
CODE_FOR_reload_vsx_from_gprv8hi;
              reg_addr[V16QImode].reload_vsx_gpr = 
CODE_FOR_reload_vsx_from_gprv16qi;
              reg_addr[SFmode].reload_vsx_gpr    = 
CODE_FOR_reload_vsx_from_gprsf;
@@ -3276,10 +3161,6 @@ rs6000_init_hard_regno_mode_ok (bool global_init_p)
          reg_addr[V2DImode].reload_load   = CODE_FOR_reload_v2di_si_load;
          reg_addr[V1TImode].reload_store  = CODE_FOR_reload_v1ti_si_store;
          reg_addr[V1TImode].reload_load   = CODE_FOR_reload_v1ti_si_load;
-         reg_addr[V8BFmode].reload_store  = CODE_FOR_reload_v8bf_si_store;
-         reg_addr[V8BFmode].reload_load   = CODE_FOR_reload_v8bf_si_load;
-         reg_addr[V8HFmode].reload_store  = CODE_FOR_reload_v8hf_si_store;
-         reg_addr[V8HFmode].reload_load   = CODE_FOR_reload_v8hf_si_load;
          reg_addr[V4SFmode].reload_store  = CODE_FOR_reload_v4sf_si_store;
          reg_addr[V4SFmode].reload_load   = CODE_FOR_reload_v4sf_si_load;
          reg_addr[V2DFmode].reload_store  = CODE_FOR_reload_v2df_si_store;
@@ -3303,14 +3184,6 @@ rs6000_init_hard_regno_mode_ok (bool global_init_p)
              reg_addr[TFmode].reload_load  = CODE_FOR_reload_tf_si_load;
            }
 
-         if (TARGET_FLOAT16)
-           {
-             reg_addr[HFmode].reload_store = CODE_FOR_reload_hf_si_store;
-             reg_addr[BFmode].reload_store = CODE_FOR_reload_bf_si_store;
-             reg_addr[HFmode].reload_load  = CODE_FOR_reload_hf_si_load;
-             reg_addr[BFmode].reload_load  = CODE_FOR_reload_bf_si_load;
-           }
-
          /* Only provide a reload handler for SDmode if lfiwzx/stfiwx are
             available.  */
          if (TARGET_NO_SDMODE_STACK)
@@ -4059,32 +3932,6 @@ rs6000_option_override_internal (bool global_init_p)
        }
     }
 
-  /* Enable -mfloat16 if it was configured, the user did not specify -mfloat16
-     or -mno-float16, and we have the minimum hardware requirements to handle
-     16-bit floating point.  */
-  if ((rs6000_isa_flags_explicit & OPTION_MASK_FLOAT16) == 0)
-    {
-#if POWERPC_FLOAT16_DEFAULT
-      if (TARGET_FLOAT16_MIN_HARDWARE)
-       rs6000_isa_flags |= OPTION_MASK_FLOAT16;
-      else
-#endif
-       rs6000_isa_flags &= ~OPTION_MASK_FLOAT16;
-    }
-
-  /* 16-bit floating point needs 64-bit power8 at a minimum in order to load up
-     16-bit values into vector registers via loads/stores from GPRs and then
-     using direct moves.  Don't allow 16-bit float on big endian systems at the
-     current time.  */
-  if (TARGET_FLOAT16 && !TARGET_FLOAT16_MIN_HARDWARE)
-    {
-      rs6000_isa_flags &= ~OPTION_MASK_FLOAT16;
-      if (rs6000_isa_flags_explicit & OPTION_MASK_FLOAT16)
-       error ("%qs is only available on 64-bit little endian systems "
-              "that use at least %qs",
-              "-mfloat16", "-mcpu=power8");
-    }
-
   /* If hard-float/altivec/vsx were explicitly turned off then don't allow
      the -mcpu setting to enable options that conflict. */
   if ((!TARGET_HARD_FLOAT || !TARGET_ALTIVEC || !TARGET_VSX)
@@ -6693,12 +6540,6 @@ easy_altivec_constant (rtx op, machine_mode mode)
       return 0;
     }
 
-  /* For 16-bit floating point vectors, only allow 0.0 and -0.0 as easy altivec
-     constants.  */
-  if (FP16_VECTOR_MODE_P (mode))
-    return (zero_constant (op, mode) || minus_zero_constant (op, mode)
-           ? 8 : 0);
-
   /* V1TImode is a special container for TImode.  Ignore for now.  */
   else if (mode == V1TImode)
     return 0;
@@ -6806,12 +6647,6 @@ xxspltib_constant_p (rtx op,
   /* Handle (vec_duplicate <constant>).  */
   if (GET_CODE (op) == VEC_DUPLICATE)
     {
-      element = XEXP (op, 0);
-
-      /* For 16-bit floating point, the only valid use is xxspltib is 0.0.  */
-      if (FP16_VECTOR_MODE_P (mode))
-       return element == CONST0_RTX (GET_MODE_INNER (mode));
-
       if (mode != V16QImode && mode != V8HImode && mode != V4SImode
          && mode != V2DImode)
        return false;
@@ -6828,20 +6663,6 @@ xxspltib_constant_p (rtx op,
   /* Handle (const_vector [...]).  */
   else if (GET_CODE (op) == CONST_VECTOR)
     {
-      /* For V8BFmode & V8HFmode, the only valid use is xxspltib is 0.0.  */
-      if (FP16_VECTOR_MODE_P (mode))
-       {
-         if (op == CONST0_RTX (mode))
-           return true;
-
-         rtx zero = CONST0_RTX (GET_MODE_INNER (mode));
-         for (i = 0; i < nunits; i++)
-           if (CONST_VECTOR_ELT (op, i) != zero)
-             return false;
-
-         return true;
-       }
-
       if (mode != V16QImode && mode != V8HImode && mode != V4SImode
          && mode != V2DImode)
        return false;
@@ -7058,8 +6879,6 @@ output_vec_const_move (rtx *operands)
          return "vspltisw %0,%1";
 
        case E_V8HImode:
-       case E_V8HFmode:
-       case E_V8BFmode:
          return "vspltish %0,%1";
 
        case E_V16QImode:
@@ -7288,15 +7107,6 @@ rs6000_expand_vector_init (rtx target, rtx vals)
       return;
     }
 
-  /* Special case splats of 16-bit floating point.  */
-  if (all_same && FP16_VECTOR_MODE_P (mode))
-    {
-      rtx op0 = force_reg (GET_MODE_INNER (mode), XVECEXP (vals, 0, 0));
-      rtx dup = gen_rtx_VEC_DUPLICATE (mode, op0);
-      emit_insn (gen_rtx_SET (target, dup));
-      return;
-    }
-                                                    
   /* Special case initializing vector short/char that are splats if we are on
      64-bit systems with direct move.  */
   if (all_same && TARGET_DIRECT_MOVE_64BIT
@@ -7791,10 +7601,6 @@ rs6000_expand_vector_set (rtx target, rtx val, rtx 
elt_rtx)
            insn = gen_vsx_set_v4si_p9 (target, target, val, elt_rtx);
          else if (mode == V8HImode)
            insn = gen_vsx_set_v8hi_p9 (target, target, val, elt_rtx);
-         else if (mode == V8HFmode)
-           insn = gen_vsx_set_v8hf_p9 (target, target, val, elt_rtx);
-         else if (mode == V8BFmode)
-           insn = gen_vsx_set_v8bf_p9 (target, target, val, elt_rtx);
          else if (mode == V16QImode)
            insn = gen_vsx_set_v16qi_p9 (target, target, val, elt_rtx);
          else if (mode == V4SFmode)
@@ -7912,22 +7718,6 @@ rs6000_expand_vector_extract (rtx target, rtx vec, rtx 
elt)
            }
          else
            break;
-       case E_V8HFmode:
-         if (TARGET_DIRECT_MOVE_64BIT)
-           {
-             emit_insn (gen_vsx_extract_v8hf (target, vec, elt));
-             return;
-           }
-         else
-           break;
-       case E_V8BFmode:
-         if (TARGET_DIRECT_MOVE_64BIT)
-           {
-             emit_insn (gen_vsx_extract_v8bf (target, vec, elt));
-             return;
-           }
-         else
-           break;
        case E_V4SImode:
          if (TARGET_DIRECT_MOVE_64BIT)
            {
@@ -7975,14 +7765,6 @@ rs6000_expand_vector_extract (rtx target, rtx vec, rtx 
elt)
          emit_insn (gen_vsx_extract_v8hi_var (target, vec, elt));
          return;
 
-       case E_V8HFmode:
-         emit_insn (gen_vsx_extract_v8hf_var (target, vec, elt));
-         return;
-
-       case E_V8BFmode:
-         emit_insn (gen_vsx_extract_v8bf_var (target, vec, elt));
-         return;
-
        case E_V16QImode:
          emit_insn (gen_vsx_extract_v16qi_var (target, vec, elt));
          return;
@@ -8260,10 +8042,7 @@ rs6000_split_vec_extract_var (rtx dest, rtx src, rtx 
element, rtx tmp_gpr,
       /* See if we want to generate VEXTU{B,H,W}{L,R}X if the destination is in
         a general purpose register.  */
       if (TARGET_P9_VECTOR
-         && (mode == V16QImode
-             || mode == V8HImode
-             || mode == V4SImode
-             || FP16_VECTOR_MODE_P (mode))
+         && (mode == V16QImode || mode == V8HImode || mode == V4SImode)
          && INT_REGNO_P (dest_regno)
          && ALTIVEC_REGNO_P (src_regno)
          && INT_REGNO_P (element_regno))
@@ -8276,7 +8055,7 @@ rs6000_split_vec_extract_var (rtx dest, rtx src, rtx 
element, rtx tmp_gpr,
                       ? gen_vextublx (dest_si, element_si, src)
                       : gen_vextubrx (dest_si, element_si, src));
 
-         else if (mode == V8HImode || FP16_VECTOR_MODE_P (mode))
+         else if (mode == V8HImode)
            {
              rtx tmp_gpr_si = gen_rtx_REG (SImode, REGNO (tmp_gpr));
              emit_insn (gen_ashlsi3 (tmp_gpr_si, element_si, const1_rtx));
@@ -8378,8 +8157,6 @@ rs6000_split_vec_extract_var (rtx dest, rtx src, rtx 
element, rtx tmp_gpr,
 
        case E_V4SImode:
        case E_V8HImode:
-       case E_V8HFmode:
-       case E_V8BFmode:
        case E_V16QImode:
          {
            rtx tmp_altivec_di = gen_rtx_REG (DImode, REGNO (tmp_altivec));
@@ -8968,8 +8745,6 @@ reg_offset_addressing_ok_p (machine_mode mode)
     {
     case E_V16QImode:
     case E_V8HImode:
-    case E_V8HFmode:
-    case E_V8BFmode:
     case E_V4SFmode:
     case E_V4SImode:
     case E_V2DFmode:
@@ -8997,13 +8772,6 @@ reg_offset_addressing_ok_p (machine_mode mode)
     case E_TDOmode:
       return TARGET_DMF;
 
-      /* For 16-bit floating point types, do not allow offset addressing, since
-        it is assumed that most of the use will be in vector registers, and we
-        only have reg+reg addressing for 16-bit modes.  */
-    case E_BFmode:
-    case E_HFmode:
-      return false;
-
     case E_SDmode:
       /* If we can do direct load/stores of SDmode, restrict it to reg+reg
         addressing for the LFIWZX and STFIWX instructions.  */
@@ -9288,13 +9056,6 @@ rs6000_legitimate_offset_address_p (machine_mode mode, 
rtx x,
   extra = 0;
   switch (mode)
     {
-      /* For 16-bit floating point types, do not allow offset addressing, since
-        it is assumed that most of the use will be in vector registers, and we
-        only have reg+reg addressing for 16-bit modes.  */
-    case E_BFmode:
-    case E_HFmode:
-      return false;
-
     case E_DFmode:
     case E_DDmode:
     case E_DImode:
@@ -9396,11 +9157,6 @@ macho_lo_sum_memory_operand (rtx x, machine_mode mode)
 static bool
 legitimate_lo_sum_address_p (machine_mode mode, rtx x, int strict)
 {
-      /* For 16-bit floating point types, do not allow offset addressing, since
-        it is assumed that most of the use will be in vector registers, and we
-        only have reg+reg addressing for 16-bit modes.  */
-  if (FP16_SCALAR_MODE_P (mode))
-    return false;
   if (GET_CODE (x) != LO_SUM)
     return false;
   if (!REG_P (XEXP (x, 0)))
@@ -11097,8 +10853,6 @@ rs6000_const_vec (machine_mode mode)
       subparts = 4;
       break;
     case E_V8HImode:
-    case E_V8HFmode:
-    case E_V8BFmode:
       subparts = 8;
       break;
     case E_V16QImode:
@@ -11554,8 +11308,6 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode 
mode)
 
     case E_V16QImode:
     case E_V8HImode:
-    case E_V8HFmode:
-    case E_V8BFmode:
     case E_V4SFmode:
     case E_V4SImode:
     case E_V2DFmode:
@@ -13018,9 +12770,6 @@ rs6000_secondary_reload_simple_move (enum 
rs6000_reg_type to_type,
       && ((to_type == GPR_REG_TYPE && from_type == VSX_REG_TYPE)
          || (to_type == VSX_REG_TYPE && from_type == GPR_REG_TYPE)))
     {
-      if (FP16_SCALAR_MODE_P (mode))
-       return true;
-
       if (TARGET_POWERPC64)
        {
          /* ISA 2.07: MTVSRD or MVFVSRD.  */
@@ -13818,11 +13567,6 @@ rs6000_preferred_reload_class (rtx x, enum reg_class 
rclass)
          || mode_supports_dq_form (mode))
        return rclass;
 
-      /* IEEE 16-bit and bf16 don't support offset addressing, but they can
-        go in any floating point/vector register.  */
-      if (FP16_SCALAR_MODE_P (mode))
-       return rclass;
-
       /* If this is a scalar floating point value and we don't have D-form
         addressing, prefer the traditional floating point registers so that we
         can use D-form (register+offset) addressing.  */
@@ -13840,16 +13584,6 @@ rs6000_preferred_reload_class (rtx x, enum reg_class 
rclass)
       return rclass;
     }
 
-  /* For 16-bit floating point scalar modes, if we have lxsihzx/stxsihzx from
-     Power9, prefer the vector registers.  On power8, we will need to use GPRs
-     to do load/store.  For 16-bit floating point vector modes, only prefer
-     VSX.  */
-  if (FP16_VECTOR_MODE_P (mode))
-    return TARGET_P9_VECTOR ? VSX_REGS : rclass;
-
-  if (FP16_VECTOR_MODE_P (mode))
-    return VSX_REGS;
-
   if (is_constant || GET_CODE (x) == PLUS)
     {
       if (reg_class_subset_p (GENERAL_REGS, rclass))
@@ -14085,9 +13819,6 @@ rs6000_can_change_mode_class (machine_mode from,
   unsigned from_size = GET_MODE_SIZE (from);
   unsigned to_size = GET_MODE_SIZE (to);
 
-  if (FP16_SCALAR_MODE_P (from) || FP16_SCALAR_MODE_P (to))
-    return from_size == to_size;
-
   if (from_size != to_size)
     {
       enum reg_class xclass = (TARGET_VSX) ? VSX_REGS : FLOAT_REGS;
@@ -14305,8 +14036,7 @@ rs6000_output_move_128bit (rtx operands[])
          else if (TARGET_P9_VECTOR)
            return "lxvx %x0,%y1";
 
-         else if (mode == V16QImode || mode == V8HImode || mode == V4SImode
-                  || FP16_VECTOR_MODE_P (mode))
+         else if (mode == V16QImode || mode == V8HImode || mode == V4SImode)
            return "lxvw4x %x0,%y1";
 
          else
@@ -14344,8 +14074,7 @@ rs6000_output_move_128bit (rtx operands[])
          else if (TARGET_P9_VECTOR)
            return "stxvx %x1,%y0";
 
-         else if (mode == V16QImode || mode == V8HImode || mode == V4SImode
-                  || FP16_VECTOR_MODE_P (mode))
+         else if (mode == V16QImode || mode == V8HImode || mode == V4SImode)
            return "stxvw4x %x1,%y0";
 
          else
@@ -23459,7 +23188,7 @@ rs6000_load_constant_and_splat (machine_mode mode, 
REAL_VALUE_TYPE dconst)
 {
   rtx reg;
 
-  if (mode == SFmode || mode == DFmode || FP16_SCALAR_MODE_P (mode))
+  if (mode == SFmode || mode == DFmode)
     {
       rtx d = const_double_from_real_value (dconst, mode);
       reg = force_reg (mode, d);
@@ -24802,8 +24531,6 @@ rs6000_scalar_mode_supported_p (scalar_mode mode)
     return default_decimal_float_supported_p ();
   else if (TARGET_FLOAT128_TYPE && (mode == KFmode || mode == IFmode))
     return true;
-  else if (FP16_SCALAR_MODE_P (mode))
-    return true;
   else
     return default_scalar_mode_supported_p (mode);
 }
@@ -24828,10 +24555,6 @@ rs6000_libgcc_floating_mode_supported_p 
(scalar_float_mode mode)
     case E_KFmode:
       return TARGET_FLOAT128_TYPE && !TARGET_IEEEQUAD;
 
-    case E_BFmode:
-    case E_HFmode:
-      return TARGET_FLOAT16;
-
     default:
       return false;
     }
@@ -24859,9 +24582,6 @@ rs6000_floatn_mode (int n, bool extended)
     {
       switch (n)
        {
-       case 16:
-         return TARGET_FLOAT16 ? SFmode : opt_scalar_float_mode ();
-
        case 32:
          return DFmode;
 
@@ -24883,9 +24603,6 @@ rs6000_floatn_mode (int n, bool extended)
     {
       switch (n)
        {
-       case 16:
-         return TARGET_FLOAT16 ? HFmode : opt_scalar_float_mode ();
-
        case 32:
          return SFmode;
 
@@ -25049,7 +24766,6 @@ static struct rs6000_opt_mask const rs6000_opt_masks[] =
   { "dense-math",              OPTION_MASK_DMF,                false, true  },
   { "hard-dfp",                        OPTION_MASK_DFP,                false, 
true  },
   { "htm",                     OPTION_MASK_HTM,                false, true  },
-  { "float16",                 OPTION_MASK_FLOAT16,            false, true  },
   { "isel",                    OPTION_MASK_ISEL,               false, true  },
   { "mfcrf",                   OPTION_MASK_MFCRF,              false, true  },
   { "mfpgpr",                  0,                              false, true  },
@@ -29483,37 +29199,24 @@ constant_fp_to_128bit_vector (rtx op,
   const REAL_VALUE_TYPE *rtype = CONST_DOUBLE_REAL_VALUE (op);
   long real_words[VECTOR_128BIT_WORDS];
 
-  /* For 16-bit floating point, the constant doesn't fill the whole 32-bit
-     word.  Deal with it here, storing the bytes in big endian fashion.  */
-  if (FP16_SCALAR_MODE_P (mode))
-    {
-      real_to_target (real_words, rtype, mode);
-      info->bytes[byte_num] = (unsigned char) (real_words[0] >> 8);
-      info->bytes[byte_num+1] = (unsigned char) (real_words[0]);
-    }
+  /* Make sure we don't overflow the real_words array and that it is
+     filled completely.  */
+  gcc_assert (num_words <= VECTOR_128BIT_WORDS && (bitsize % 32) == 0);
 
-  else
-    {
-      /* Make sure we don't overflow the real_words array and that it is filled
-        completely.  */
-      gcc_assert (num_words <= VECTOR_128BIT_WORDS && (bitsize % 32) == 0);
+  real_to_target (real_words, rtype, mode);
 
-      real_to_target (real_words, rtype, mode);
-
-      /* Iterate over each 32-bit word in the floating point constant.  The
-        real_to_target function puts out words in target endian fashion.  We
-        need to arrange the order so that the bytes are written in big endian
-        order.  */
-      for (unsigned num = 0; num < num_words; num++)
-       {
-         unsigned endian_num = (BYTES_BIG_ENDIAN
-                                ? num
-                                : num_words - 1 - num);
+  /* Iterate over each 32-bit word in the floating point constant.  The
+     real_to_target function puts out words in target endian fashion.  We need
+     to arrange the order so that the bytes are written in big endian order.  
*/
+  for (unsigned num = 0; num < num_words; num++)
+    {
+      unsigned endian_num = (BYTES_BIG_ENDIAN
+                            ? num
+                            : num_words - 1 - num);
 
-         unsigned uvalue = real_words[endian_num];
-         for (int shift = 32 - 8; shift >= 0; shift -= 8)
-           info->bytes[byte_num++] = (uvalue >> shift) & 0xff;
-       }
+      unsigned uvalue = real_words[endian_num];
+      for (int shift = 32 - 8; shift >= 0; shift -= 8)
+       info->bytes[byte_num++] = (uvalue >> shift) & 0xff;
     }
 
   /* Mark that this constant involves floating point.  */
@@ -29552,7 +29255,6 @@ vec_const_128bit_to_bytes (rtx op,
     return false;
 
   /* Set up the bits.  */
-  info->mode = mode;
   switch (GET_CODE (op))
     {
       /* Integer constants, default to double word.  */
@@ -29780,10 +29482,6 @@ constant_generates_xxspltiw (vec_const_128bit_type 
*vsx_const)
   if (!TARGET_SPLAT_WORD_CONSTANT || !TARGET_PREFIXED || !TARGET_VSX)
     return 0;
 
-  /* HFmode/BFmode constants can always use XXSPLTIW.  */
-  if (FP16_SCALAR_MODE_P (vsx_const->mode))
-    return 1;
-
   if (!vsx_const->all_words_same)
     return 0;
 
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index c888c4c4a4f6..ecd415a9b2f4 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -318,26 +318,6 @@ extern const char *host_detect_local_cpu (int argc, const 
char **argv);
 #define TARGET_DEBUG_TARGET    (rs6000_debug & MASK_DEBUG_TARGET)
 #define TARGET_DEBUG_BUILTIN   (rs6000_debug & MASK_DEBUG_BUILTIN)
 
-/* Is this a valid 16-bit scalar floating point mode?  */
-#define FP16_SCALAR_MODE_P(MODE)                                       \
-  (TARGET_FLOAT16 && ((MODE) == HFmode || (MODE) == BFmode))
-
-/* Is this a valid 16-bit scalar floating point mode?  */
-#define FP16_VECTOR_MODE_P(MODE)                                       \
-  (TARGET_FLOAT16 && ((MODE) == V8HFmode || (MODE) == V8BFmode))
-
-/* Do we have conversion support in hardware for the 16-bit floating point?  */
-#define TARGET_BFLOAT16_HW     (TARGET_FLOAT16 && TARGET_POWER10)
-#define TARGET_FLOAT16_HW      (TARGET_FLOAT16 && TARGET_P9_VECTOR)
-
-/* Macro to say that we have the minimum hardware to enable 16-bit floating
-   point.  We require a little endian 64-bit machine that supports at least
-   power8 with VSX support.  */
-#define TARGET_FLOAT16_MIN_HARDWARE    (TARGET_P8_VECTOR               \
-                                        && TARGET_POWERPC64            \
-                                        && !BYTES_BIG_ENDIAN           \
-                                        && TARGET_HARD_FLOAT)
-
 /* Helper macros for TFmode.  Quad floating point (TFmode) can be either IBM
    long double format that uses a pair of doubles, or IEEE 128-bit floating
    point.  KFmode was added as a way to represent IEEE 128-bit floating point,
@@ -1022,8 +1002,6 @@ enum data_align { align_abi, align_opt, align_both };
 #define ALTIVEC_VECTOR_MODE(MODE)                                      \
   ((MODE) == V16QImode                                                 \
    || (MODE) == V8HImode                                               \
-   || (MODE) == V8HFmode                                               \
-   || (MODE) == V8BFmode                                               \
    || (MODE) == V4SFmode                                               \
    || (MODE) == V4SImode                                               \
    || VECTOR_ALIGNMENT_P (MODE))
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index 3bff9e4aa31b..d2d2a95eaa9a 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -571,8 +571,6 @@
 (define_mode_iterator FMOVE128_GPR [TI
                                    V16QI
                                    V8HI
-                                   V8BF
-                                   V8HF
                                    V4SI
                                    V4SF
                                    V2DI
@@ -733,14 +731,10 @@
 ; A generic w/d attribute, for things like cmpw/cmpd.
 (define_mode_attr wd [(QI    "b")
                      (HI    "h")
-                     (BF    "h")
-                     (HF    "h")
                      (SI    "w")
                      (DI    "d")
                      (V16QI "b")
                      (V8HI  "h")
-                     (V8BF  "h")
-                     (V8HF  "h")
                      (V4SI  "w")
                      (V2DI  "d")
                      (V1TI  "q")
@@ -753,8 +747,6 @@
                           (DI    "d")
                           (V16QI "du")
                           (V8HI  "du")
-                          (V8BF  "du")
-                          (V8HF  "du")
                           (V4SI  "du")
                           (V2DI  "d")])
 
@@ -804,8 +796,6 @@
                                         PTI
                                         (V16QI "TARGET_ALTIVEC")
                                         (V8HI  "TARGET_ALTIVEC")
-                                        (V8BF  "TARGET_ALTIVEC")
-                                        (V8HF  "TARGET_ALTIVEC")
                                         (V4SI  "TARGET_ALTIVEC")
                                         (V4SF  "TARGET_ALTIVEC")
                                         (V2DI  "TARGET_ALTIVEC")
@@ -823,8 +813,6 @@
                                         (PTI   "&r,r,r")
                                         (V16QI "wa,v,&?r,?r,?r")
                                         (V8HI  "wa,v,&?r,?r,?r")
-                                        (V8BF  "wa,v,&?r,?r,?r")
-                                        (V8HF  "wa,v,&?r,?r,?r")
                                         (V4SI  "wa,v,&?r,?r,?r")
                                         (V4SF  "wa,v,&?r,?r,?r")
                                         (V2DI  "wa,v,&?r,?r,?r")
@@ -836,8 +824,6 @@
                                         (PTI   "r,0,r")
                                         (V16QI "wa,v,r,0,r")
                                         (V8HI  "wa,v,r,0,r")
-                                        (V8BF  "wa,v,r,0,r")
-                                        (V8HF  "wa,v,r,0,r")
                                         (V4SI  "wa,v,r,0,r")
                                         (V4SF  "wa,v,r,0,r")
                                         (V2DI  "wa,v,r,0,r")
@@ -849,8 +835,6 @@
                                         (PTI   "r,r,0")
                                         (V16QI "wa,v,r,r,0")
                                         (V8HI  "wa,v,r,r,0")
-                                        (V8BF  "wa,v,r,r,0")
-                                        (V8HF  "wa,v,r,r,0")
                                         (V4SI  "wa,v,r,r,0")
                                         (V4SF  "wa,v,r,r,0")
                                         (V2DI  "wa,v,r,r,0")
@@ -864,8 +848,6 @@
                                         (PTI   "r,0,0")
                                         (V16QI "wa,v,r,0,0")
                                         (V8HI  "wa,v,r,0,0")
-                                        (V8BF  "wa,v,r,0,0")
-                                        (V8HF  "wa,v,r,0,0")
                                         (V4SI  "wa,v,r,0,0")
                                         (V4SF  "wa,v,r,0,0")
                                         (V2DI  "wa,v,r,0,0")
@@ -874,8 +856,8 @@
 
 ;; Reload iterator for creating the function to allocate a base register to
 ;; supplement addressing modes.
-(define_mode_iterator RELOAD [V16QI V8HI V8BF V8HF V4SI V2DI V4SF V2DF V1TI
-                             SF SD SI DF DD DI TI PTI KF IF TF HF BF
+(define_mode_iterator RELOAD [V16QI V8HI V4SI V2DI V4SF V2DF V1TI
+                             SF SD SI DF DD DI TI PTI KF IF TF
                              OO XO])
 
 ;; Iterate over smin, smax
@@ -16256,4 +16238,3 @@
 (include "htm.md")
 (include "fusion.md")
 (include "pcrel-opt.md")
-(include "float16.md")
diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt
index 28f679ff69c7..8632e1064584 100644
--- a/gcc/config/rs6000/rs6000.opt
+++ b/gcc/config/rs6000/rs6000.opt
@@ -642,10 +642,6 @@ mieee128-constant
 Target Var(TARGET_IEEE128_CONSTANT) Init(1) Save
 Generate (do not generate) code that uses the LXVKQ instruction.
 
-mfloat16
-Target Mask(FLOAT16) Var(rs6000_isa_flags)
-Enable or disable 16-bit floating point.
-
 ; Documented parameters
 
 -param=rs6000-vect-unroll-limit=
diff --git a/gcc/config/rs6000/vector.md b/gcc/config/rs6000/vector.md
index 5fd4e470ade0..7a44a8a7e553 100644
--- a/gcc/config/rs6000/vector.md
+++ b/gcc/config/rs6000/vector.md
@@ -50,31 +50,11 @@
 (define_mode_iterator VEC_K [V16QI V8HI V4SI V4SF])
 
 ;; Vector logical modes
-(define_mode_iterator VEC_L [V16QI
-                            V8HI
-                            V8BF
-                            V8HF
-                            V4SI
-                            V2DI
-                            V4SF
-                            V2DF
-                            V1TI
-                            TI
-                            KF
-                            TF])
+(define_mode_iterator VEC_L [V16QI V8HI V4SI V2DI V4SF V2DF V1TI TI KF TF])
 
 ;; Vector modes for moves.  Don't do TImode or TFmode here, since their
 ;; moves are handled elsewhere.
-(define_mode_iterator VEC_M [V16QI
-                            V8HI
-                            V4SI
-                            V2DI
-                            V8BF
-                            V8HF
-                            V4SF
-                            V2DF
-                            V1TI
-                            KF])
+(define_mode_iterator VEC_M [V16QI V8HI V4SI V2DI V4SF V2DF V1TI KF])
 
 ;; Vector modes for types that don't need a realignment under VSX
 (define_mode_iterator VEC_N [V4SI V4SF V2DI V2DF V1TI KF TF])
@@ -83,14 +63,7 @@
 (define_mode_iterator VEC_C [V16QI V8HI V4SI V2DI V4SF V2DF V1TI])
 
 ;; Vector init/extract modes
-(define_mode_iterator VEC_E [V16QI
-                            V8HI
-                            V4SI
-                            V2DI
-                            V8BF
-                            V8HF
-                            V4SF
-                            V2DF])
+(define_mode_iterator VEC_E [V16QI V8HI V4SI V2DI V4SF V2DF])
 
 ;; Vector modes for 64-bit base types
 (define_mode_iterator VEC_64 [V2DI V2DF])
@@ -103,8 +76,6 @@
                            (V8HI  "HI")
                            (V4SI  "SI")
                            (V2DI  "DI")
-                           (V8BF  "BF")
-                           (V8HF  "HF")
                            (V4SF  "SF")
                            (V2DF  "DF")
                            (V1TI  "TI")
@@ -115,8 +86,6 @@
                              (V8HI  "hi")
                              (V4SI  "si")
                              (V2DI  "di")
-                             (V8BF  "bf")
-                             (V8HF  "hf")
                              (V4SF  "sf")
                              (V2DF  "df")
                              (V1TI  "ti")
diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md
index 7c87ecb50023..3a7905df5bae 100644
--- a/gcc/config/rs6000/vsx.md
+++ b/gcc/config/rs6000/vsx.md
@@ -46,14 +46,9 @@
 ;; Iterator for vector floating point types supported by VSX
 (define_mode_iterator VSX_F [V4SF V2DF])
 
-;; Iterator for 8 element vectors
-(define_mode_iterator VECTOR_16BIT [V8HI V8BF V8HF])
-
 ;; Iterator for logical types supported by VSX
 (define_mode_iterator VSX_L [V16QI
                             V8HI
-                            V8BF
-                            V8HF
                             V4SI
                             V2DI
                             V4SF
@@ -66,8 +61,6 @@
 ;; Iterator for memory moves.
 (define_mode_iterator VSX_M [V16QI
                             V8HI
-                            V8BF
-                            V8HF
                             V4SI
                             V2DI
                             V4SF
@@ -78,8 +71,6 @@
                             TI])
 
 (define_mode_attr VSX_XXBR  [(V8HI  "h")
-                            (V8BF  "h")
-                            (V8HF  "h")
                             (V4SI  "w")
                             (V4SF  "w")
                             (V2DF  "d")
@@ -89,8 +80,6 @@
 ;; Map into the appropriate load/store name based on the type
 (define_mode_attr VSm  [(V16QI "vw4")
                        (V8HI  "vw4")
-                       (V8BF  "vw4")
-                       (V8HF  "vw4")
                        (V4SI  "vw4")
                        (V4SF  "vw4")
                        (V2DF  "vd2")
@@ -104,8 +93,6 @@
 ;; Map the register class used
 (define_mode_attr VSr  [(V16QI "v")
                         (V8HI  "v")
-                        (V8BF  "wa")
-                        (V8HF  "wa")
                         (V4SI  "v")
                         (V4SF  "wa")
                         (V2DI  "wa")
@@ -121,8 +108,6 @@
 ;; What value we need in the "isa" field, to make the IEEE QP float work.
 (define_mode_attr VSisa        [(V16QI "*")
                         (V8HI  "*")
-                        (V8BF  "*")
-                        (V8HF  "*")
                         (V4SI  "*")
                         (V4SF  "*")
                         (V2DI  "*")
@@ -139,8 +124,6 @@
 ;; integer modes.
 (define_mode_attr ??r  [(V16QI "??r")
                         (V8HI  "??r")
-                        (V8BF  "??r")
-                        (V8HF  "??r")
                         (V4SI  "??r")
                         (V4SF  "??r")
                         (V2DI  "??r")
@@ -153,8 +136,6 @@
 ;; A mode attribute used for 128-bit constant values.
 (define_mode_attr nW   [(V16QI "W")
                         (V8HI  "W")
-                        (V8BF  "W")
-                        (V8HF  "W")
                         (V4SI  "W")
                         (V4SF  "W")
                         (V2DI  "W")
@@ -182,8 +163,6 @@
 ;; operation
 (define_mode_attr VSv  [(V16QI "v")
                         (V8HI  "v")
-                        (V8BF  "v")
-                        (V8HF  "v")
                         (V4SI  "v")
                         (V4SF  "v")
                         (V2DI  "v")
@@ -224,30 +203,24 @@
 ;; Iterator for ISA 3.0 vector extract/insert of small integer vectors.
 ;; VSX_EXTRACT_I2 doesn't include V4SImode because SI extracts can be
 ;; done on ISA 2.07 and not just ISA 3.0.
-(define_mode_iterator VSX_EXTRACT_I  [V16QI V8HI V8HF V8BF V4SI])
-(define_mode_iterator VSX_EXTRACT_I2 [V16QI V8HI V8HF V8BF])
-(define_mode_iterator VSX_EXTRACT_I4 [V16QI V8HI V8HF V8BF V4SI V2DI])
+(define_mode_iterator VSX_EXTRACT_I  [V16QI V8HI V4SI])
+(define_mode_iterator VSX_EXTRACT_I2 [V16QI V8HI])
+(define_mode_iterator VSX_EXTRACT_I4 [V16QI V8HI V4SI V2DI])
 
 (define_mode_attr VSX_EXTRACT_WIDTH [(V16QI "b")
                                     (V8HI "h")
-                                    (V8HF "h")
-                                    (V8BF "h")
                                     (V4SI "w")])
 
 ;; Mode attribute to give the correct predicate for ISA 3.0 vector extract and
 ;; insert to validate the operand number.
 (define_mode_attr VSX_EXTRACT_PREDICATE [(V16QI "const_0_to_15_operand")
                                         (V8HI  "const_0_to_7_operand")
-                                        (V8HF  "const_0_to_7_operand")
-                                        (V8BF  "const_0_to_7_operand")
                                         (V4SI  "const_0_to_3_operand")])
 
 ;; Mode attribute to give the constraint for vector extract and insert
 ;; operations.
 (define_mode_attr VSX_EX [(V16QI "v")
                          (V8HI  "v")
-                         (V8HF  "v")
-                         (V8BF  "v")
                          (V4SI  "wa")])
 
 ;; Mode iterator for binary floating types other than double to
@@ -444,8 +417,6 @@
 ;; Like VM2 in altivec.md, just do char, short, int, long, float and double
 (define_mode_iterator VM3 [V4SI
                           V8HI
-                          V8BF
-                          V8HF
                           V16QI
                           V4SF
                           V2DF
@@ -457,8 +428,6 @@
 (define_mode_attr VM3_char [(V2DI "d")
                           (V4SI "w")
                           (V8HI "h")
-                          (V8BF "h")
-                          (V8HF "h")
                           (V16QI "b")
                           (V2DF  "d")
                           (V4SF  "w")])
@@ -596,21 +565,21 @@
   [(set_attr "type" "vecload")
    (set_attr "length" "8")])
 
-(define_insn_and_split "*vsx_le_perm_load_<mode>"
-  [(set (match_operand:VECTOR_16BIT 0 "vsx_register_operand" "=wa")
-        (match_operand:VECTOR_16BIT 1 "indexed_or_indirect_operand" "Z"))]
+(define_insn_and_split "*vsx_le_perm_load_v8hi"
+  [(set (match_operand:V8HI 0 "vsx_register_operand" "=wa")
+        (match_operand:V8HI 1 "indexed_or_indirect_operand" "Z"))]
   "!BYTES_BIG_ENDIAN && TARGET_VSX && !TARGET_P9_VECTOR"
   "#"
   "&& 1"
   [(set (match_dup 2)
-        (vec_select:VECTOR_16BIT
+        (vec_select:V8HI
           (match_dup 1)
           (parallel [(const_int 4) (const_int 5)
                      (const_int 6) (const_int 7)
                      (const_int 0) (const_int 1)
                      (const_int 2) (const_int 3)])))
    (set (match_dup 0)
-        (vec_select:VECTOR_16BIT
+        (vec_select:V8HI
           (match_dup 2)
           (parallel [(const_int 4) (const_int 5)
                      (const_int 6) (const_int 7)
@@ -857,27 +826,27 @@
                     (const_int 0) (const_int 1)])))]
   "")
 
-(define_insn "*vsx_le_perm_store_<mode>"
-  [(set (match_operand:VECTOR_16BIT 0 "indexed_or_indirect_operand" "=Z")
-        (match_operand:VECTOR_16BIT 1 "vsx_register_operand" "wa"))]
+(define_insn "*vsx_le_perm_store_v8hi"
+  [(set (match_operand:V8HI 0 "indexed_or_indirect_operand" "=Z")
+        (match_operand:V8HI 1 "vsx_register_operand" "wa"))]
   "!BYTES_BIG_ENDIAN && TARGET_VSX && !TARGET_P9_VECTOR"
   "#"
   [(set_attr "type" "vecstore")
    (set_attr "length" "12")])
 
 (define_split
-  [(set (match_operand:VECTOR_16BIT 0 "indexed_or_indirect_operand")
-        (match_operand:VECTOR_16BIT 1 "vsx_register_operand"))]
+  [(set (match_operand:V8HI 0 "indexed_or_indirect_operand")
+        (match_operand:V8HI 1 "vsx_register_operand"))]
   "!BYTES_BIG_ENDIAN && TARGET_VSX && !TARGET_P9_VECTOR && !reload_completed"
   [(set (match_dup 2)
-        (vec_select:VECTOR_16BIT
+        (vec_select:V8HI
           (match_dup 1)
           (parallel [(const_int 4) (const_int 5)
                      (const_int 6) (const_int 7)
                      (const_int 0) (const_int 1)
                      (const_int 2) (const_int 3)])))
    (set (match_dup 0)
-        (vec_select:VECTOR_16BIT
+        (vec_select:V8HI
           (match_dup 2)
           (parallel [(const_int 4) (const_int 5)
                      (const_int 6) (const_int 7)
@@ -916,25 +885,25 @@
 ;; The post-reload split requires that we re-permute the source
 ;; register in case it is still live.
 (define_split
-  [(set (match_operand:VECTOR_16BIT 0 "indexed_or_indirect_operand")
-        (match_operand:VECTOR_16BIT 1 "vsx_register_operand"))]
+  [(set (match_operand:V8HI 0 "indexed_or_indirect_operand")
+        (match_operand:V8HI 1 "vsx_register_operand"))]
   "!BYTES_BIG_ENDIAN && TARGET_VSX && !TARGET_P9_VECTOR && reload_completed"
   [(set (match_dup 1)
-        (vec_select:VECTOR_16BIT
+        (vec_select:V8HI
           (match_dup 1)
           (parallel [(const_int 4) (const_int 5)
                      (const_int 6) (const_int 7)
                      (const_int 0) (const_int 1)
                      (const_int 2) (const_int 3)])))
    (set (match_dup 0)
-        (vec_select:VECTOR_16BIT
+        (vec_select:V8HI
           (match_dup 1)
           (parallel [(const_int 4) (const_int 5)
                      (const_int 6) (const_int 7)
                      (const_int 0) (const_int 1)
                      (const_int 2) (const_int 3)])))
    (set (match_dup 1)
-        (vec_select:VECTOR_16BIT
+        (vec_select:V8HI
           (match_dup 1)
           (parallel [(const_int 4) (const_int 5)
                      (const_int 6) (const_int 7)
@@ -1489,15 +1458,15 @@
   "lxvw4x %x0,%y1"
   [(set_attr "type" "vecload")])
 
-(define_expand "vsx_ld_elemrev_<mode>"
-  [(set (match_operand:VECTOR_16BIT 0 "vsx_register_operand" "=wa")
-        (vec_select:VECTOR_16BIT
-         (match_operand:VECTOR_16BIT 1 "memory_operand" "Z")
+(define_expand "vsx_ld_elemrev_v8hi"
+  [(set (match_operand:V8HI 0 "vsx_register_operand" "=wa")
+        (vec_select:V8HI
+         (match_operand:V8HI 1 "memory_operand" "Z")
          (parallel [(const_int 7) (const_int 6)
                     (const_int 5) (const_int 4)
                     (const_int 3) (const_int 2)
                     (const_int 1) (const_int 0)])))]
-  "VECTOR_MEM_VSX_P (<MODE>mode) && !BYTES_BIG_ENDIAN"
+  "VECTOR_MEM_VSX_P (V8HImode) && !BYTES_BIG_ENDIAN"
 {
   if (!TARGET_P9_VECTOR)
     {
@@ -1507,9 +1476,9 @@
       unsigned int reorder[16] = {13,12,15,14,9,8,11,10,5,4,7,6,1,0,3,2};
       int i;
 
-      subreg = simplify_gen_subreg (V4SImode, operands[1], <MODE>mode, 0);
+      subreg = simplify_gen_subreg (V4SImode, operands[1], V8HImode, 0);
       emit_insn (gen_vsx_ld_elemrev_v4si (tmp, subreg));
-      subreg2 = simplify_gen_subreg (<MODE>mode, tmp, V4SImode, 0);
+      subreg2 = simplify_gen_subreg (V8HImode, tmp, V4SImode, 0);
 
       for (i = 0; i < 16; ++i)
        perm[i] = GEN_INT (reorder[i]);
@@ -1517,21 +1486,21 @@
       pcv = force_reg (V16QImode,
                        gen_rtx_CONST_VECTOR (V16QImode,
                                              gen_rtvec_v (16, perm)));
-      emit_insn (gen_altivec_vperm_<mode>_direct (operands[0], subreg2,
-                                                  subreg2, pcv));
+      emit_insn (gen_altivec_vperm_v8hi_direct (operands[0], subreg2,
+                                                subreg2, pcv));
       DONE;
     }
 })
 
-(define_insn "*vsx_ld_elemrev_<mode>_internal"
-  [(set (match_operand:VECTOR_16BIT 0 "vsx_register_operand" "=wa")
-        (vec_select:VECTOR_16BIT
-          (match_operand:VECTOR_16BIT 1 "memory_operand" "Z")
+(define_insn "*vsx_ld_elemrev_v8hi_internal"
+  [(set (match_operand:V8HI 0 "vsx_register_operand" "=wa")
+        (vec_select:V8HI
+          (match_operand:V8HI 1 "memory_operand" "Z")
           (parallel [(const_int 7) (const_int 6)
                      (const_int 5) (const_int 4)
                      (const_int 3) (const_int 2)
                      (const_int 1) (const_int 0)])))]
-  "VECTOR_MEM_VSX_P (<MODE>mode) && !BYTES_BIG_ENDIAN && TARGET_P9_VECTOR"
+  "VECTOR_MEM_VSX_P (V8HImode) && !BYTES_BIG_ENDIAN && TARGET_P9_VECTOR"
   "lxvh8x %x0,%y1"
   [(set_attr "type" "vecload")])
 
@@ -1639,20 +1608,20 @@
   "stxvw4x %x1,%y0"
   [(set_attr "type" "vecstore")])
 
-(define_expand "vsx_st_elemrev_<mode>"
-  [(set (match_operand:VECTOR_16BIT 0 "memory_operand" "=Z")
-        (vec_select:VECTOR_16BIT
-          (match_operand:VECTOR_16BIT 1 "vsx_register_operand" "wa")
+(define_expand "vsx_st_elemrev_v8hi"
+  [(set (match_operand:V8HI 0 "memory_operand" "=Z")
+        (vec_select:V8HI
+          (match_operand:V8HI 1 "vsx_register_operand" "wa")
           (parallel [(const_int 7) (const_int 6)
                      (const_int 5) (const_int 4)
                      (const_int 3) (const_int 2)
                      (const_int 1) (const_int 0)])))]
-  "VECTOR_MEM_VSX_P (<MODE>mode) && !BYTES_BIG_ENDIAN"
+  "VECTOR_MEM_VSX_P (V8HImode) && !BYTES_BIG_ENDIAN"
 {
   if (!TARGET_P9_VECTOR)
     {
       rtx mem_subreg, subreg, perm[16], pcv;
-      rtx tmp = gen_reg_rtx (<MODE>mode);
+      rtx tmp = gen_reg_rtx (V8HImode);
       /* 2 is leftmost element in register */
       unsigned int reorder[16] = {13,12,15,14,9,8,11,10,5,4,7,6,1,0,3,2};
       int i;
@@ -1663,10 +1632,10 @@
       pcv = force_reg (V16QImode,
                        gen_rtx_CONST_VECTOR (V16QImode,
                                              gen_rtvec_v (16, perm)));
-      emit_insn (gen_altivec_vperm_<mode>_direct (tmp, operands[1],
-                                                  operands[1], pcv));
-      subreg = simplify_gen_subreg (V4SImode, tmp, <MODE>mode, 0);
-      mem_subreg = simplify_gen_subreg (V4SImode, operands[0], <MODE>mode, 0);
+      emit_insn (gen_altivec_vperm_v8hi_direct (tmp, operands[1],
+                                                operands[1], pcv));
+      subreg = simplify_gen_subreg (V4SImode, tmp, V8HImode, 0);
+      mem_subreg = simplify_gen_subreg (V4SImode, operands[0], V8HImode, 0);
       emit_insn (gen_vsx_st_elemrev_v4si (mem_subreg, subreg));
       DONE;
     }
@@ -1681,15 +1650,15 @@
   "stxvd2x %x1,%y0"
   [(set_attr "type" "vecstore")])
 
-(define_insn "*vsx_st_elemrev_<mode>_internal"
-  [(set (match_operand:VECTOR_16BIT 0 "memory_operand" "=Z")
-        (vec_select:VECTOR_16BIT
-          (match_operand:VECTOR_16BIT 1 "vsx_register_operand" "wa")
+(define_insn "*vsx_st_elemrev_v8hi_internal"
+  [(set (match_operand:V8HI 0 "memory_operand" "=Z")
+        (vec_select:V8HI
+          (match_operand:V8HI 1 "vsx_register_operand" "wa")
           (parallel [(const_int 7) (const_int 6)
                      (const_int 5) (const_int 4)
                      (const_int 3) (const_int 2)
                      (const_int 1) (const_int 0)])))]
-  "VECTOR_MEM_VSX_P (<MODE>mode) && !BYTES_BIG_ENDIAN && TARGET_P9_VECTOR"
+  "VECTOR_MEM_VSX_P (V8HImode) && !BYTES_BIG_ENDIAN && TARGET_P9_VECTOR"
   "stxvh8x %x1,%y0"
   [(set_attr "type" "vecstore")])
 
@@ -3361,10 +3330,10 @@
   "xxpermdi %x0,%x1,%x1,2"
   [(set_attr "type" "vecperm")])
 
-(define_insn "xxswapd_<mode>"
-  [(set (match_operand:VECTOR_16BIT 0 "vsx_register_operand" "=wa")
-       (vec_select:VECTOR_16BIT
-         (match_operand:VECTOR_16BIT 1 "vsx_register_operand" "wa")
+(define_insn "xxswapd_v8hi"
+  [(set (match_operand:V8HI 0 "vsx_register_operand" "=wa")
+       (vec_select:V8HI
+         (match_operand:V8HI 1 "vsx_register_operand" "wa")
          (parallel [(const_int 4) (const_int 5)
                     (const_int 6) (const_int 7)
                     (const_int 0) (const_int 1)
@@ -3464,15 +3433,15 @@
   "lxvd2x %x0,%y1"
   [(set_attr "type" "vecload")])
 
-(define_insn "*vsx_lxvd2x8_le_<MODE>"
-  [(set (match_operand:VECTOR_16BIT 0 "vsx_register_operand" "=wa")
-        (vec_select:VECTOR_16BIT
-          (match_operand:VECTOR_16BIT 1 "memory_operand" "Z")
+(define_insn "*vsx_lxvd2x8_le_V8HI"
+  [(set (match_operand:V8HI 0 "vsx_register_operand" "=wa")
+        (vec_select:V8HI
+          (match_operand:V8HI 1 "memory_operand" "Z")
           (parallel [(const_int 4) (const_int 5)
                      (const_int 6) (const_int 7)
                      (const_int 0) (const_int 1)
                      (const_int 2) (const_int 3)])))]
-  "!BYTES_BIG_ENDIAN && VECTOR_MEM_VSX_P (<MODE>mode) && !TARGET_P9_VECTOR"
+  "!BYTES_BIG_ENDIAN && VECTOR_MEM_VSX_P (V8HImode) && !TARGET_P9_VECTOR"
   "lxvd2x %x0,%y1"
   [(set_attr "type" "vecload")])
 
@@ -3540,15 +3509,15 @@
   [(set_attr "type" "vecstore")
    (set_attr "length" "8")])
 
-(define_insn "*vsx_stxvd2x8_le_<MODE>"
-  [(set (match_operand:VECTOR_16BIT 0 "memory_operand" "=Z")
-        (vec_select:VECTOR_16BIT
-          (match_operand:VECTOR_16BIT 1 "vsx_register_operand" "wa")
+(define_insn "*vsx_stxvd2x8_le_V8HI"
+  [(set (match_operand:V8HI 0 "memory_operand" "=Z")
+        (vec_select:V8HI
+          (match_operand:V8HI 1 "vsx_register_operand" "wa")
           (parallel [(const_int 4) (const_int 5)
                      (const_int 6) (const_int 7)
                      (const_int 0) (const_int 1)
                      (const_int 2) (const_int 3)])))]
-  "!BYTES_BIG_ENDIAN && VECTOR_MEM_VSX_P (<MODE>mode) && !TARGET_P9_VECTOR"
+  "!BYTES_BIG_ENDIAN && VECTOR_MEM_VSX_P (V8HImode) && !TARGET_P9_VECTOR"
   "stxvd2x %x1,%y0"
   [(set_attr "type" "vecstore")])
 
@@ -4122,8 +4091,7 @@
   if (which_alternative == 0
       && ((<MODE>mode == V16QImode
           && INTVAL (operands[2]) == (BYTES_BIG_ENDIAN ? 7 : 8))
-         || ((<MODE>mode == V8HImode || <MODE>mode == V8HFmode
-             || <MODE>mode == V8BFmode)
+         || (<MODE>mode == V8HImode
              && INTVAL (operands[2]) == (BYTES_BIG_ENDIAN ? 3 : 4))))
     {
       enum machine_mode dest_mode = GET_MODE (operands[0]);
@@ -4202,8 +4170,7 @@
       else
        vec_tmp = src;
     }
-  else if (<MODE>mode == V8HImode || <MODE>mode == V8HFmode
-          || <MODE>mode == V8BFmode)
+  else if (<MODE>mode == V8HImode)
     {
       if (value != 3)
        emit_insn (gen_altivec_vsplth_direct (vec_tmp, src, element));
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 8ea00cddd491..8a2c65a861eb 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -1404,7 +1404,8 @@ See RS/6000 and PowerPC Options.
 -mveclibabi=@var{type}  -mfriz
 -mpointers-to-nested-functions  -msave-toc-indirect  -mpower8-fusion
 -mcrypto  -mhtm  -mquad-memory  -mquad-memory-atomic
--mcompat-align-parm -mfloat128  -mfloat128-hardware -mfloat16
+-mcompat-align-parm
+-mfloat128  -mfloat128-hardware
 -mgnu-attribute
 -mstack-protector-guard=@var{guard}  -mstack-protector-guard-reg=@var{reg}
 -mstack-protector-guard-offset=@var{offset}  -mprefixed
@@ -32261,28 +32262,6 @@ The default for @option{-mfloat128-hardware} is 
enabled on PowerPC
 Linux systems using the ISA 3.0 instruction set, and disabled on other
 systems.
 
-
-@opindex mfloat16
-@opindex mno-float16
-@item -mfloat16
-@itemx -mno-float16
-Enable/disable both the @code{_Float16} and @code{__bf16} keywords
-for using 16-bit floating point.
-
-The @code{_Float16} keyword is for IEEE 16-bit floating point and GCC
-generates either software emulation for IEEE 16-bit floating point or
-hardware instructions.
-
-The @code{__bf16} keyword is for Google brain 16-bit floating
-point and GCC generates either software emulation for Google brain
-16-bit floating point or hardware instructions.
-
-At the current time, 16-bit floating point support is experimental,
-and support may be changed in future releases.
-
-The configuration option @option{--with-powerpc-float16} controls
-whether @option{-mfloat16} is enabled by default.
-
 @opindex m32
 @opindex m64
 @item -m32
diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi
index 60ee6f79acca..b99040f56368 100644
--- a/gcc/doc/md.texi
+++ b/gcc/doc/md.texi
@@ -3373,9 +3373,6 @@ A signed integer constant that can be used with the 
paddis instruction.
 @item eV
 A signed integer constant that paddis and paddi instructions generate.
 
-@item eZ
-The floating point constant -0.0.
-
 @ifset INTERNALS
 @item G
 A floating point constant that can be loaded into a register with one

Reply via email to