This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: PATCH: PR ld/4875: sha1.h:25:20: error: stdint.h: No such file or directory


On Fri, Aug 10, 2007 at 04:38:43PM +0930, Alan Modra wrote:
> On Thu, Aug 09, 2007 at 11:30:46AM -0700, H.J. Lu wrote:
> > 	PR ld/4875
> > 	* elf-hints-local.h: Include ../bfd/bfd_stdint.h.  Use
> > 	uint32_t instead of u_int32_t.
> > 
> > 	* sha1.h: Include ../bfd/bfd_stdint.h instead of <stdint.h>.
> 
> Can't you omit "../bfd/"?  OK with that change.
> 

I checked in this and "make dep-am".

Thanks.

H.J.
---
2007-08-09  H.J. Lu  <hongjiu.lu@intel.com>

	PR ld/4875
	* elf-hints-local.h: Include bfd_stdint.h.  Use uint32_t
	instead of u_int32_t.

	* sha1.h: Include bfd_stdint.h instead of <stdint.h>.

--- ld/elf-hints-local.h.stdint	2006-04-11 03:36:26.000000000 -0700
+++ ld/elf-hints-local.h	2007-08-09 11:24:40.000000000 -0700
@@ -25,16 +25,18 @@
 #ifndef	_ELF_HINTS_H_
 #define	_ELF_HINTS_H_
 
+#include "bfd_stdint.h"
+
 /* Hints file produced by ldconfig.  */
 struct elfhints_hdr
 {
-  u_int32_t magic;		/* Magic number.  */
-  u_int32_t version;		/* File version (1).  */
-  u_int32_t strtab;		/* Offset of string table in file.  */
-  u_int32_t strsize;		/* Size of string table.  */
-  u_int32_t dirlist;		/* Offset of directory list in string table.  */
-  u_int32_t dirlistlen;		/* strlen(dirlist).  */
-  u_int32_t spare[26];		/* Room for expansion.  */
+  uint32_t magic;		/* Magic number.  */
+  uint32_t version;		/* File version (1).  */
+  uint32_t strtab;		/* Offset of string table in file.  */
+  uint32_t strsize;		/* Size of string table.  */
+  uint32_t dirlist;		/* Offset of directory list in string table.  */
+  uint32_t dirlistlen;		/* strlen(dirlist).  */
+  uint32_t spare[26];		/* Room for expansion.  */
 };
 
 #define ELFHINTS_MAGIC	0x746e6845
--- ld/sha1.h.stdint	2007-07-21 01:55:49.000000000 -0700
+++ ld/sha1.h	2007-08-09 11:24:22.000000000 -0700
@@ -22,7 +22,7 @@
 #define SHA1_H 1
 
 #include <stdio.h>
-#include <stdint.h>
+#include "bfd_stdint.h"
 
 /* Structure to save state of computation between the single steps.  */
 struct sha1_ctx
 ----
2007-08-10  H.J. Lu  <hongjiu.lu@intel.com>

	* Makefile.am: Run "make dep-am".
	* Makefile.in: Regenerate.

--- ld/Makefile.am.dep	2007-07-13 06:57:55.000000000 -0700
+++ ld/Makefile.am	2007-08-10 05:27:27.000000000 -0700
@@ -2034,6 +2034,7 @@ pep-dll.o: pep-dll.c pe-dll.c sysdep.h c
   ldmisc.h ldgram.h ldmain.h ldfile.h ldemul.h $(INCDIR)/coff/internal.h \
   $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h deffile.h pe-dll.h \
   pep-dll.h
+sha1.o: sha1.c config.h sha1.h ../bfd/bfd_stdint.h
 ldgram.o: ldgram.c sysdep.h config.h $(INCDIR)/fopen-same.h \
   ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
   $(INCDIR)/bfdlink.h ld.h ldexp.h ldver.h ldlang.h ldfile.h \
@@ -2047,5 +2048,4 @@ deffilep.o: deffilep.c sysdep.h config.h
   $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h \
   ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
   ld.h ldmisc.h deffile.h
-sha1.o: sha1.c config.h sha1.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
--- ld/Makefile.in.dep	2007-07-13 06:57:55.000000000 -0700
+++ ld/Makefile.in	2007-08-10 05:28:50.000000000 -0700
@@ -228,11 +228,9 @@ VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 XGETTEXT = @XGETTEXT@
 YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi`
-ac_ct_AR = @ac_ct_AR@
+YFLAGS = -d
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@@ -249,6 +247,7 @@ build_vendor = @build_vendor@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
@@ -261,13 +260,16 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -281,7 +283,6 @@ AUTOMAKE_OPTIONS = cygnus dejagnu
 ACLOCAL_AMFLAGS = -I .. -I ../config -I ../bfd
 SUBDIRS = po
 tooldir = $(exec_prefix)/$(target_alias)
-YFLAGS = -d
 AM_CFLAGS = $(WARN_CFLAGS)
 
 # We put the scripts in the directory $(scriptdir)/ldscripts.
@@ -2821,6 +2822,7 @@ pep-dll.o: pep-dll.c pe-dll.c sysdep.h c
   ldmisc.h ldgram.h ldmain.h ldfile.h ldemul.h $(INCDIR)/coff/internal.h \
   $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h deffile.h pe-dll.h \
   pep-dll.h
+sha1.o: sha1.c config.h sha1.h ../bfd/bfd_stdint.h
 ldgram.o: ldgram.c sysdep.h config.h $(INCDIR)/fopen-same.h \
   ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
   $(INCDIR)/bfdlink.h ld.h ldexp.h ldver.h ldlang.h ldfile.h \
@@ -2834,7 +2836,6 @@ deffilep.o: deffilep.c sysdep.h config.h
   $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h \
   ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
   ld.h ldmisc.h deffile.h
-sha1.o: sha1.c config.h sha1.h
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]