Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(640)

Side by Side Diff: ports/binutils/nacl.patch

Issue 1667483002: Remove unneeded parts of binutils patch (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « docs/port_list.md ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c 1 diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
2 --- a/bfd/elf32-i386.c 2 --- a/bfd/elf32-i386.c
3 +++ b/bfd/elf32-i386.c 3 +++ b/bfd/elf32-i386.c
4 @@ -3807,7 +3807,7 @@ elf_i386_relocate_section (bfd *output_bfd, 4 @@ -3807,7 +3807,7 @@ elf_i386_relocate_section (bfd *output_bfd,
5 if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GD) 5 if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GD)
6 { 6 {
7 unsigned int type; 7 unsigned int type;
8 - bfd_vma roff; 8 - bfd_vma roff;
9 + bfd_vma roff = 0; 9 + bfd_vma roff = 0;
10 10
11 /* GD->LE transition. */ 11 /* GD->LE transition. */
12 type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2); 12 type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
13 @@ -4163,7 +4163,7 @@ elf_i386_relocate_section (bfd *output_bfd, 13 @@ -4163,7 +4163,7 @@ elf_i386_relocate_section (bfd *output_bfd,
14 else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GD) 14 else if (ELF32_R_TYPE (rel->r_info) == R_386_TLS_GD)
15 { 15 {
16 unsigned int val, type; 16 unsigned int val, type;
17 - bfd_vma roff; 17 - bfd_vma roff;
18 + bfd_vma roff = 0; 18 + bfd_vma roff = 0;
19 19
20 /* GD->IE transition. */ 20 /* GD->IE transition. */
21 type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2); 21 type = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
22 diff --git a/binutils/Makefile.in b/binutils/Makefile.in
23 --- a/binutils/Makefile.in
24 +++ b/binutils/Makefile.in
25 @@ -332,7 +332,7 @@ LIBICONV = @LIBICONV@
26 LIBINTL = @LIBINTL@
27 LIBINTL_DEP = @LIBINTL_DEP@
28 LIBOBJS = @LIBOBJS@
29 -LIBS = @LIBS@
30 +LIBS = @LIBS@ $(EXTRA_LIBS)
31 LIBTOOL = @LIBTOOL@
32 LIPO = @LIPO@
33 LN_S = @LN_S@
34 diff --git a/gas/Makefile.in b/gas/Makefile.in
35 --- a/gas/Makefile.in
36 +++ b/gas/Makefile.in
37 @@ -197,7 +197,7 @@ LIBINTL = @LIBINTL@
38 LIBINTL_DEP = @LIBINTL_DEP@
39 LIBM = @LIBM@
40 LIBOBJS = @LIBOBJS@
41 -LIBS = @LIBS@
42 +LIBS = @LIBS@ $(EXTRA_LIBS)
43 LIBTOOL = @LIBTOOL@
44 LIPO = @LIPO@
45 LN_S = @LN_S@
46 diff --git a/ld/Makefile.in b/ld/Makefile.in 22 diff --git a/ld/Makefile.in b/ld/Makefile.in
47 --- a/ld/Makefile.in 23 --- a/ld/Makefile.in
48 +++ b/ld/Makefile.in 24 +++ b/ld/Makefile.in
49 @@ -890,7 +890,7 @@ ld_new_SOURCES = ldgram.y ldlex-wrapper.c lexsup.c ldlang.c mri.c ldctor.c ldmai
50 ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c $(PLUGIN_C )
51
52 ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBI BERTY) $(LIBINTL_DEP)
53 -ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL)
54 +ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL) $(EXTRA_LIBS)
55
56 # A test program for C++ constructors and destructors.
57 # This test is now in the testsuite.
58 @@ -1072,7 +1072,10 @@ deffilep.h: deffilep.c 25 @@ -1072,7 +1072,10 @@ deffilep.h: deffilep.c
59 else :; fi 26 else :; fi
60 ld-new$(EXEEXT): $(ld_new_OBJECTS) $(ld_new_DEPENDENCIES) 27 ld-new$(EXEEXT): $(ld_new_OBJECTS) $(ld_new_DEPENDENCIES)
61 @rm -f ld-new$(EXEEXT) 28 @rm -f ld-new$(EXEEXT)
62 - $(LINK) $(ld_new_OBJECTS) $(ld_new_LDADD) $(LIBS) 29 - $(LINK) $(ld_new_OBJECTS) $(ld_new_LDADD) $(LIBS)
63 + # ./ldscripts/* will be read during this link and it messes up the 30 + # ./ldscripts/* will be read during this link and it messes up the
64 + # link result because ./ldscripts contains the linker script for 31 + # link result because ./ldscripts contains the linker script for
65 + # statically linked binaries. So, we temporary rename it. 32 + # statically linked binaries. So, we temporary rename it.
66 + mv ldscripts ldscripts.tmp && ($(LINK) $(ld_new_OBJECTS) $(ld_new_LDADD) $(LIBS) || (mv bar foo && false)) && mv ldscripts.tmp ldscripts 33 + mv ldscripts ldscripts.tmp && ($(LINK) $(ld_new_OBJECTS) $(ld_new_LDADD) $(LIBS) || (mv bar foo && false)) && mv ldscripts.tmp ldscripts
67 34
68 mostlyclean-compile: 35 mostlyclean-compile:
69 -rm -f *.$(OBJEXT) 36 -rm -f *.$(OBJEXT)
OLDNEW
« no previous file with comments | « docs/port_list.md ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698