Merge remote-tracking branch 'origin/master' into merge-job

Author: Jenkins

.pre-commit-config.yaml

@@ -71,12 +71,12 @@ repos:
     rev: v2.4.2
     hooks:
     - id: codespell
-      files: '^(gdbsupport|gdbserver|gdb/(dwarf2|tui|target|data-directory|po|system-gdbinit|mi|syscalls|arch|regformats|compile|python|guile|config|unittests|cli|testsuite/gdb.(ctf|dap|debuginfod|gdb|go|guile|mi|modula2|objc|opencl|opt|pascal|perf|replay|reverse|rocm|server|stabs|testsuite|tui|xml)))/'
-      args: [--config, gdb/contrib/setup.cfg]
+      files: '^(gdbsupport|gdbserver|gdb/(doc|stubs|features|nat|contrib|dwarf2|tui|target|data-directory|po|system-gdbinit|mi|syscalls|arch|regformats|compile|python|guile|config|unittests|cli|testsuite/gdb.(ctf|dap|debuginfod|gdb|go|guile|mi|modula2|objc|opencl|opt|pascal|perf|replay|reverse|rocm|server|stabs|testsuite|tui|xml)))/'
+      args: [--toml, gdb/pyproject.toml]
     - id: codespell
       name: codespell-log
       entry: gdb/contrib/codespell-log.sh
-      args: [--config, gdb/contrib/setup.cfg]
+      args: [--toml, gdb/pyproject.toml]
       always_run: true
       verbose: true
       stages: [commit-msg]

binutils/stabs.c

@@ -1293,6 +1293,12 @@ parse_stab_type (void *                dhandle,
 	}
     }
 
+  if (*pp >= p_end)
+    {
+      bad_stab (orig);
+      return DEBUG_TYPE_NULL;
+    }
+
   descriptor = **pp;
   ++*pp;
 
@@ -3219,18 +3225,16 @@ parse_stab_array_type (void *dhandle,
     {
       index_type = debug_find_named_type (dhandle, "int");
       if (index_type == DEBUG_TYPE_NULL)
-	{
-	  index_type = debug_make_int_type (dhandle, 4, false);
-	  if (index_type == DEBUG_TYPE_NULL)
-	    return DEBUG_TYPE_NULL;
-	}
+	index_type = debug_make_int_type (dhandle, 4, false);
       *pp = p;
     }
   else
     {
       index_type = parse_stab_type (dhandle, info, (const char *) NULL, pp,
 				    (debug_type **) NULL, p_end);
     }
+  if (index_type == DEBUG_TYPE_NULL)
+    return DEBUG_TYPE_NULL;
 
   if (**pp != ';')
     {

gas/config/obj-macho.c

@@ -1383,7 +1383,8 @@ void obj_mach_o_frob_label (struct symbol *sp)
 
   s = (bfd_mach_o_asymbol *) symbol_get_bfdsym (sp);
   /* Leave debug symbols alone.  */
-  if ((s->n_type & BFD_MACH_O_N_STAB) != 0)
+  if ((s->n_type & BFD_MACH_O_N_STAB) != 0
+      || (s->symbol.section->flags & SEC_DEBUGGING) != 0)
     return;
 
   /* This is the base symbol type, that we mask in.  */
@@ -1433,7 +1434,8 @@ obj_mach_o_frob_symbol (struct symbol *sp)
 
   s = (bfd_mach_o_asymbol *) symbol_get_bfdsym (sp);
   /* Leave debug symbols alone.  */
-  if ((s->n_type & BFD_MACH_O_N_STAB) != 0)
+  if ((s->n_type & BFD_MACH_O_N_STAB) != 0
+      || (s->symbol.section->flags & SEC_DEBUGGING) != 0)
     return 0;
 
   base_type = obj_mach_o_type_for_symbol (s);
@@ -1554,68 +1556,6 @@ obj_mach_o_process_stab (int what, const char *string,
   s->symbol.udata.i = SYM_MACHO_FIELDS_NOT_VALIDATED;
 }
 
-/* This is a place to check for any errors that we can't detect until we know
-   what remains undefined at the end of assembly.  */
-
-static void
-obj_mach_o_check_before_writing (bfd *abfd ATTRIBUTE_UNUSED,
-				 asection *sec,
-				 void *unused ATTRIBUTE_UNUSED)
-{
-  fixS *fixP;
-  struct frchain *frchp;
-  segment_info_type *seginfo = seg_info (sec);
-
-  if (seginfo == NULL)
-    return;
-
-  /* We are not allowed subtractions where either of the operands is
-     undefined.  So look through the frags for any fixes to check.  */
-  for (frchp = seginfo->frchainP; frchp != NULL; frchp = frchp->frch_next)
-   for (fixP = frchp->fix_root; fixP != NULL; fixP = fixP->fx_next)
-    {
-      if (fixP->fx_addsy != NULL
-	  && fixP->fx_subsy != NULL
-	  && (! S_IS_DEFINED (fixP->fx_addsy)
-	      || ! S_IS_DEFINED (fixP->fx_subsy)))
-	{
-	  segT add_symbol_segment = S_GET_SEGMENT (fixP->fx_addsy);
-	  segT sub_symbol_segment = S_GET_SEGMENT (fixP->fx_subsy);
-
-	  if (! S_IS_DEFINED (fixP->fx_addsy)
-	      && S_IS_DEFINED (fixP->fx_subsy))
-	    {
-	      as_bad_where (fixP->fx_file, fixP->fx_line,
-		_("`%s' can't be undefined in `%s' - `%s' {%s section}"),
-		S_GET_NAME (fixP->fx_addsy), S_GET_NAME (fixP->fx_addsy),
-		S_GET_NAME (fixP->fx_subsy), segment_name (sub_symbol_segment));
-	    }
-	  else if (! S_IS_DEFINED (fixP->fx_subsy)
-		   && S_IS_DEFINED (fixP->fx_addsy))
-	    {
-	      as_bad_where (fixP->fx_file, fixP->fx_line,
-		_("`%s' can't be undefined in `%s' {%s section} - `%s'"),
-		S_GET_NAME (fixP->fx_subsy), S_GET_NAME (fixP->fx_addsy),
-		segment_name (add_symbol_segment), S_GET_NAME (fixP->fx_subsy));
-	    }
-	  else
-	    {
-	      as_bad_where (fixP->fx_file, fixP->fx_line,
-		_("`%s' and `%s' can't be undefined in `%s' - `%s'"),
-		S_GET_NAME (fixP->fx_addsy), S_GET_NAME (fixP->fx_subsy),
-		S_GET_NAME (fixP->fx_addsy), S_GET_NAME (fixP->fx_subsy));
-	    }
-	}
-    }
-}
-
-/* Do any checks that we can't complete without knowing what's undefined.  */
-void
-obj_mach_o_pre_output_hook (void)
-{
-  bfd_map_over_sections (stdoutput, obj_mach_o_check_before_writing, NULL);
-}
-
 /* Here we count up frags in each subsection (where a sub-section is defined
    as starting with a non-local symbol).
    Note that, if there are no non-local symbols in a section, all the frags will
@@ -1632,6 +1572,10 @@ obj_mach_o_set_subsections (bfd *abfd ATTRIBUTE_UNUSED,
   fragS *frag;
   frchainS *chain;
 
+  /* Don't waste time on debug sections.  */
+  if ((sec->flags & SEC_DEBUGGING) != 0)
+    return;
+
   /* Protect against sections not created by gas.  */
   if (seginfo == NULL)
     return;
@@ -1925,8 +1869,9 @@ obj_mach_o_allow_local_subtract (expressionS * left ATTRIBUTE_UNUSED,
   return obj_mach_o_is_frame_section (seg);
 }
 
-int
-obj_mach_o_in_different_subsection (symbolS *a, symbolS *b)
+static bool
+obj_mach_o_in_different_subsection (symbolS *a, segT aseg, valueT offset,
+				    symbolS *b)
 {
   fragS *fa;
   fragS *fb;
@@ -1936,55 +1881,72 @@ obj_mach_o_in_different_subsection (symbolS *a, symbolS *b)
       || !S_IS_DEFINED (b))
     {
       /* Not in the same segment, or undefined symbol.  */
-      return 1;
+      return true;
     }
 
-  fa = symbol_get_frag (a);
+  if (symbol_section_p (a) && aseg != NULL)
+    fa = get_frag_for_address (NULL, seg_info (aseg), offset);
+  else
+    fa = symbol_get_frag (a);
   fb = symbol_get_frag (b);
   if (fa == NULL || fb == NULL)
     {
       /* One of the symbols is not in a subsection.  */
-      return 1;
+      return true;
     }
 
   return fa->obj_frag_data.subsection != fb->obj_frag_data.subsection;
 }
 
-int
-obj_mach_o_force_reloc_sub_same (fixS *fix, segT seg)
+bool
+obj_mach_o_force_reloc_sub_same (segT seg, fixS *fix, segT addsymseg)
 {
-  if (! SEG_NORMAL (seg))
-    return 1;
-  return obj_mach_o_in_different_subsection (fix->fx_addsy, fix->fx_subsy);
+  if (!SEG_NORMAL (addsymseg))
+    return true;
+  if ((seg->flags & SEC_DEBUGGING) != 0)
+    return false;
+  return obj_mach_o_in_different_subsection (fix->fx_addsy, addsymseg,
+					     fix->fx_offset, fix->fx_subsy);
 }
 
-int
-obj_mach_o_force_reloc_sub_local (fixS *fix, segT seg ATTRIBUTE_UNUSED)
+bool
+obj_mach_o_force_reloc_sub_local (segT seg, fixS *fix,
+				  segT addsymseg ATTRIBUTE_UNUSED)
 {
-  return obj_mach_o_in_different_subsection (fix->fx_addsy, fix->fx_subsy);
+  if ((seg->flags & SEC_DEBUGGING) != 0)
+    return false;
+  symbolS *fragsym = fix->fx_frag->obj_frag_data.subsection;
+  if (fragsym == NULL)
+    return false;
+  return obj_mach_o_in_different_subsection (fix->fx_subsy, NULL, 0, fragsym);
 }
 
-int
-obj_mach_o_force_reloc (fixS *fix)
+bool
+obj_mach_o_force_reloc (segT seg, fixS *fix)
 {
   if (generic_force_reloc (fix))
-    return 1;
+    return true;
+
+  if ((seg->flags & SEC_DEBUGGING) != 0)
+    return false;
 
   /* Force a reloc if the target is not in the same subsection.
      FIXME: handle (a - b) where a and b belongs to the same subsection ?  */
   if (fix->fx_addsy != NULL)
     {
       symbolS *subsec = fix->fx_frag->obj_frag_data.subsection;
-      symbolS *targ = fix->fx_addsy;
 
       /* There might be no subsections at all.  */
       if (subsec == NULL)
-        return 0;
+	return false;
 
-      if (S_GET_SEGMENT (targ) == absolute_section)
-        return 0;
+      symbolS *targ = fix->fx_addsy;
+      segT targseg = S_GET_SEGMENT (targ);
+      if (targseg == absolute_section)
+	return false;
 
-      return obj_mach_o_in_different_subsection (targ, subsec);
+      return obj_mach_o_in_different_subsection (targ, targseg,
+						 fix->fx_offset, subsec);
     }
-  return 0;
+  return false;
 }

gas/config/obj-macho.h

@@ -87,9 +87,6 @@ struct obj_mach_o_frag_data
 
 #define OBJ_FRAG_TYPE struct obj_mach_o_frag_data
 
-#define md_pre_output_hook obj_mach_o_pre_output_hook()
-extern void obj_mach_o_pre_output_hook(void);
-
 #define md_pre_relax_hook obj_mach_o_pre_relax_hook()
 extern void obj_mach_o_pre_relax_hook (void);
 
@@ -111,9 +108,8 @@ extern int obj_mach_o_allow_local_subtract (expressionS *, expressionS *,
 					    segT);
 
 struct fix;
-extern int obj_mach_o_in_different_subsection (symbolS *a, symbolS *b);
-extern int obj_mach_o_force_reloc (struct fix *fix);
-extern int obj_mach_o_force_reloc_sub_same (struct fix *fix, segT seg);
-extern int obj_mach_o_force_reloc_sub_local (struct fix *fix, segT seg);
+extern bool obj_mach_o_force_reloc (segT, struct fix *);
+extern bool obj_mach_o_force_reloc_sub_same (segT, struct fix *, segT);
+extern bool obj_mach_o_force_reloc_sub_local (segT, struct fix *, segT);
 
 #endif /* _OBJ_MACH_O_H */

gas/config/tc-i386.h

@@ -498,15 +498,13 @@ void tc_pe_dwarf2_emit_offset (symbolS *, unsigned int);
 
 #ifdef OBJ_MACH_O
 
-#define TC_FORCE_RELOCATION(FIX) (obj_mach_o_force_reloc (FIX))
+#define TC_FORCE_RELOCATION(FIX) (obj_mach_o_force_reloc (this_segment, FIX))
 
 #define TC_FORCE_RELOCATION_SUB_SAME(FIX,SEG) \
-	  (obj_mach_o_force_reloc_sub_same (FIX, SEG))
+	  (obj_mach_o_force_reloc_sub_same (this_segment, FIX, SEG))
 
 #define TC_FORCE_RELOCATION_SUB_LOCAL(FIX,SEG) \
-	(obj_mach_o_force_reloc_sub_local (FIX, SEG))
-
-#define TC_VALIDATE_FIX_SUB(FIX, SEG) 1
+	(obj_mach_o_force_reloc_sub_local (this_segment, FIX, SEG))
 
 #endif /* OBJ_MACH_O */
 

gas/testsuite/gas/i386/insn-32.d

@@ -1,7 +1,6 @@
 #as: --divide
 #objdump: -dw
 #name: .insn (32-bit code)
-#xfail: *-*-darwin*
 
 .*: +file format .*
 

gas/write.c

@@ -1228,33 +1228,41 @@ install_reloc (asection *sec, arelent *reloc, fragS *fragp,
     }
 }
 
-static fragS *
-get_frag_for_reloc (fragS *last_frag,
-		    const segment_info_type *seginfo,
-		    const struct reloc_list *r)
+fragS *
+get_frag_for_address (fragS *last_frag,
+		      const segment_info_type *seginfo,
+		      addressT addr)
 {
   fragS *f;
 
   for (f = last_frag; f != NULL; f = f->fr_next)
-    if (f->fr_address <= r->u.b.r.address
-	&& r->u.b.r.address < f->fr_address + f->fr_fix)
+    if (f->fr_address <= addr && addr < f->fr_address + f->fr_fix)
       return f;
 
   for (f = seginfo->frchainP->frch_root; f != NULL; f = f->fr_next)
-    if (f->fr_address <= r->u.b.r.address
-	&& r->u.b.r.address < f->fr_address + f->fr_fix)
+    if (f->fr_address <= addr && addr < f->fr_address + f->fr_fix)
       return f;
 
   for (f = seginfo->frchainP->frch_root; f != NULL; f = f->fr_next)
-    if (f->fr_address <= r->u.b.r.address
-	&& r->u.b.r.address <= f->fr_address + f->fr_fix)
+    if (f->fr_address <= addr && addr <= f->fr_address + f->fr_fix)
       return f;
 
-  as_bad_where (r->file, r->line,
-		_("reloc not within (fixed part of) section"));
   return NULL;
 }
 
+static fragS *
+get_frag_for_reloc (fragS *last_frag,
+		    const segment_info_type *seginfo,
+		    const struct reloc_list *r)
+{
+  fragS *f = get_frag_for_address (last_frag, seginfo, r->u.b.r.address);
+
+  if (f == NULL)
+    as_bad_where (r->file, r->line,
+		  _("reloc not within (fixed part of) section"));
+  return f;
+}
+
 static void
 write_relocs (bfd *abfd ATTRIBUTE_UNUSED, asection *sec,
 	      void *xxx ATTRIBUTE_UNUSED)

gas/write.h

@@ -188,5 +188,8 @@ extern fixS *fix_new_exp (fragS *, unsigned long, unsigned long,
 			  const expressionS *, int, bfd_reloc_code_real_type);
 extern void write_print_statistics (FILE *);
 extern void as_bad_subtract (fixS *);
+struct segment_info_struct;
+extern fragS *get_frag_for_address (fragS *, const struct segment_info_struct *,
+				    addressT);
 
 #endif /* __write_h__ */

gdb/contrib/ari/update-web-ari.sh

@@ -877,12 +877,12 @@ EOF
 
     # Check for invalid categories
     for a in $all; do
-	alls="$alls all[$a] = 1 ;"
+	all2="$all2 all[$a] = 1 ;"
     done
     cat ari.*.doc | $AWK >> ${newari} '
 BEGIN {
     FS = ":"
-    '"$alls"'
+    '"$all2"'
 }
 {
     # ari.*.doc: <BUG>:<COUNT>:<CATEGORY>:<DOC>