diff options
| -rw-r--r-- | binutils/Makefile.am | 4 | ||||
| -rw-r--r-- | binutils/Makefile.in | 4 | ||||
| -rw-r--r-- | binutils/bin2c.c | 24 |
3 files changed, 9 insertions, 23 deletions
diff --git a/binutils/Makefile.am b/binutils/Makefile.am index 09d194c552..0978538f29 100644 --- a/binutils/Makefile.am +++ b/binutils/Makefile.am @@ -273,8 +273,8 @@ sysinfo.@OBJEXT@: sysinfo.c $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \ fi -bin2c$(EXEEXT_FOR_BUILD): $(LIBINTL_DEP) - $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c $(srcdir)/version.c $(LIBINTL) +bin2c$(EXEEXT_FOR_BUILD): bin2c.c + $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c embedspu: embedspu.sh sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@ diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 3505da046d..fddc931e66 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -1225,8 +1225,8 @@ sysinfo.@OBJEXT@: sysinfo.c $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \ fi -bin2c$(EXEEXT_FOR_BUILD): $(LIBINTL_DEP) - $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c $(srcdir)/version.c $(LIBINTL) +bin2c$(EXEEXT_FOR_BUILD): bin2c.c + $(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c embedspu: embedspu.sh sed "s@^program_transform_name=@program_transform_name=$(program_transform_name)@" < $< > $@ diff --git a/binutils/bin2c.c b/binutils/bin2c.c index a1f0ef51d4..0719fb9138 100644 --- a/binutils/bin2c.c +++ b/binutils/bin2c.c @@ -18,9 +18,9 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "sysdep.h" -#include "bfd.h" -#include "bucomm.h" +#include <stdio.h> +#include <stdlib.h> +#include "binary-io.h" int main (int argc, char *argv[]) @@ -28,19 +28,9 @@ main (int argc, char *argv[]) int c; int i; -#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) - setlocale (LC_MESSAGES, ""); -#endif -#if defined (HAVE_SETLOCALE) - setlocale (LC_CTYPE, ""); -#endif - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - if (argc != 1) { int ishelp = 0; - int isvers = 0; FILE *stream; if (argc == 2 && argv[1][0] == '-') @@ -49,15 +39,11 @@ main (int argc, char *argv[]) if (*opt == '-') ++opt; ishelp = *opt == 'h' || *opt == 'H'; - isvers = *opt == 'v' || *opt == 'V'; } - if (isvers) - print_version ("bin2c"); - stream = ishelp ? stdout : stderr; - fprintf (stream, _("Usage: %s < input_file > output_file\n"), argv[0]); - fprintf (stream, _("Prints bytes from stdin in hex format.\n")); + fprintf (stream, "Usage: %s < input_file > output_file\n", argv[0]); + fprintf (stream, "Prints bytes from stdin in hex format.\n"); exit (!ishelp); } |