From ccaf6a01bae457aba3a3f6baf1239bb55bc189a4 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 3 Aug 2018 14:38:20 -0700 Subject: [PATCH] [gold] Fix integer narrowing in switch gold/ * target.h (Sized_target::record_gnu_property): Use unsigned int for second argument. * x86_64.cc (Target_x86_64::record_gnu_property): Likewise. --- gold/ChangeLog | 6 ++++++ gold/target.h | 3 ++- gold/x86_64.cc | 5 +++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index d5cc02b14bd..b6ccbdd74c6 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2018-08-03 Roland McGrath + + * target.h (Sized_target::record_gnu_property): Use unsigned int + for second argument. + * x86_64.cc (Target_x86_64::record_gnu_property): Likewise. + 2018-07-30 Nick Clifton * layout.cc (section_name_mapping): Add an entry for diff --git a/gold/target.h b/gold/target.h index bb312067b5f..00a1f988e7a 100644 --- a/gold/target.h +++ b/gold/target.h @@ -1147,7 +1147,8 @@ class Sized_target : public Target // Record a target-specific program property in the .note.gnu.property // section. virtual void - record_gnu_property(int, int, size_t, const unsigned char*, const Object*) + record_gnu_property(int, unsigned int, size_t, const unsigned char*, + const Object*) { } // Merge the target-specific program properties from the current object. diff --git a/gold/x86_64.cc b/gold/x86_64.cc index 27f273d64b3..36c2c27f5b6 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -1307,7 +1307,8 @@ class Target_x86_64 : public Sized_target // Record a target-specific program property in the .note.gnu.property // section. void - record_gnu_property(int, int, size_t, const unsigned char*, const Object*); + record_gnu_property(int, unsigned int, size_t, const unsigned char*, + const Object*); // Merge the target-specific program properties from the current object. void @@ -1579,7 +1580,7 @@ Target_x86_64::rela_irelative_section(Layout* layout) template void Target_x86_64::record_gnu_property( - int, int pr_type, + int, unsigned int pr_type, size_t pr_datasz, const unsigned char* pr_data, const Object* object) { -- 2.39.2