[PATCH][GOLD] Fix gold build breakage on OSX

View: New views
2 Messages — Rating Filter:   Alert me  

[PATCH][GOLD] Fix gold build breakage on OSX

by Doug Kwan (關振德) :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Hi,

    This patch fixes a few minor problems that cause build breakage on OSX.

-Doug

2009-11-10  Doug Kwan  <dougkwan@...>

        * i386.cc (Target_i386::do_calls_non_split): Add a cast to avoid
        a format warning.
        * incremental.cc (open_incremental_binary): Initialized local
        variables to avoid warnings.
        * object.cc (make_elf_object): Ditto.
        * x86_64.cc (Target_x86_64::do_calls_non_split): Add a cast to avoid
        a format warning.

Index: gold/i386.cc
===================================================================
RCS file: /cvs/src/src/gold/i386.cc,v
retrieving revision 1.99
diff -u -p -r1.99 i386.cc
--- gold/i386.cc 4 Nov 2009 16:35:51 -0000 1.99
+++ gold/i386.cc 9 Nov 2009 16:55:08 -0000
@@ -2716,7 +2716,7 @@ Target_i386::do_calls_non_split(Relobj*
       if (!object->has_no_split_stack())
  object->error(_("failed to match split-stack sequence at "
  "section %u offset %0zx"),
-      shndx, fnoffset);
+      shndx, static_cast<size_t>(fnoffset));
       return;
     }
 
Index: gold/incremental.cc
===================================================================
RCS file: /cvs/src/src/gold/incremental.cc,v
retrieving revision 1.8
diff -u -p -r1.8 incremental.cc
--- gold/incremental.cc 9 Oct 2009 22:38:07 -0000 1.8
+++ gold/incremental.cc 9 Nov 2009 16:55:08 -0000
@@ -388,8 +388,8 @@ open_incremental_binary(Output_file* fil
       return NULL;
     }
 
-  int size;
-  bool big_endian;
+  int size = 0;
+  bool big_endian = false;
   std::string error;
   if (!elfcpp::Elf_recognizer::is_valid_header(p, want, &size, &big_endian,
                                                &error))
Index: gold/object.cc
===================================================================
RCS file: /cvs/src/src/gold/object.cc,v
retrieving revision 1.105
diff -u -p -r1.105 object.cc
--- gold/object.cc 21 Oct 2009 00:45:52 -0000 1.105
+++ gold/object.cc 9 Nov 2009 16:55:08 -0000
@@ -2310,8 +2310,8 @@ make_elf_object(const std::string& name,
     *punconfigured = false;
 
   std::string error;
-  bool big_endian;
-  int size;
+  bool big_endian = false;
+  int size = 0;
   if (!elfcpp::Elf_recognizer::is_valid_header(p, bytes, &size,
                                                &big_endian, &error))
     {
Index: gold/x86_64.cc
===================================================================
RCS file: /cvs/src/src/gold/x86_64.cc,v
retrieving revision 1.92
diff -u -p -r1.92 x86_64.cc
--- gold/x86_64.cc 4 Nov 2009 16:35:51 -0000 1.92
+++ gold/x86_64.cc 9 Nov 2009 16:55:08 -0000
@@ -2705,7 +2705,7 @@ Target_x86_64::do_calls_non_split(Relobj
       if (!object->has_no_split_stack())
  object->error(_("failed to match split-stack sequence at "
  "section %u offset %0zx"),
-      shndx, fnoffset);
+      shndx, static_cast<size_t>(fnoffset));
       return;
     }
 

Re: [PATCH][GOLD] Fix gold build breakage on OSX

by Ian Lance Taylor-3 :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

"Doug Kwan (關振德)" <dougkwan@...> writes:

> 2009-11-10  Doug Kwan  <dougkwan@...>
>
>         * i386.cc (Target_i386::do_calls_non_split): Add a cast to avoid
>         a format warning.
>         * incremental.cc (open_incremental_binary): Initialized local
>         variables to avoid warnings.
>         * object.cc (make_elf_object): Ditto.
>         * x86_64.cc (Target_x86_64::do_calls_non_split): Add a cast to avoid
>         a format warning.

This is OK.

Thanks.

Ian