X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=upstream%2Fdarwin-linker%2Fpatches%2Fmisc.patch;h=2363a1e3e97c5dd624a615f8695b704b58387723;hp=a9efdc9d4cb7c9a94ea7664d7442df7dfa9e8fed;hb=39b8b717736ea31aa80aac9b976dd6dd34b8950e;hpb=4ccee83e6c66f35aa714d987002d0fd6377bf917

diff --git a/upstream/darwin-linker/patches/misc.patch b/upstream/darwin-linker/patches/misc.patch
index a9efdc9..2363a1e 100644
--- a/upstream/darwin-linker/patches/misc.patch
+++ b/upstream/darwin-linker/patches/misc.patch
@@ -1,7 +1,7 @@
-Only in misc: CVS
-diff -ubr misc/Makefile misc/Makefile
+Only in misc/: CVS
+diff -rub misc/Makefile misc/Makefile
 --- misc/Makefile	Tue Jan 14 23:35:29 2003
-+++ misc/Makefile	Mon Aug 25 22:06:23 2003
++++ misc/Makefile	Sat Sep  6 20:17:36 2003
 @@ -2,11 +2,11 @@
  OFLAG = -O
  RC_OS = macos
@@ -23,7 +23,7 @@ diff -ubr misc/Makefile misc/Makefile
 -  CFLAGS = $(OFLAG) -g -Wall -Wno-precomp $(X_CFLAGS) \
 +  ifeq "Linux" "$(shell uname)"
 +    CFLAGS = $(OFLAG) -g -Wall $(X_CFLAGS) \
-+      -I$(SRCROOT) -I$(SRCROOT)/../include -I$(OFILE_DIR) -D__ppc__ -I/usr/include -I../../macosx-include
++      -I$(SRCROOT) -I$(SRCROOT)/../include -I$(OFILE_DIR) -D__LITTLE_ENDIAN__ -U__BIG_ENDIAN__ -D__ppc__ -I/usr/include -I../../macosx-include
 +  else
 +    CFLAGS = $(OFLAG) -g -Wall $(X_CFLAGS) \
  	 -I$(SRCROOT) -I$(SRCROOT)/../include -I$(OFILE_DIR)
@@ -87,23 +87,23 @@ diff -ubr misc/Makefile misc/Makefile
  
  shlib_clean:
  	-rm -f \
-Only in misc: ar.c
-Only in misc: atom.c
-Only in misc: check_dylib.c
-Only in misc: check_hints.c
-Only in misc: checksyms.c
-Only in misc: cmpdylib.c
-Only in misc: dylib_pcsampler.c
-Only in misc: file.c
-Only in misc: indr.c
-Only in misc: inout.c
-Only in misc: install_name_tool.c
-Only in misc: kern_tool.c
-Only in misc: libtool.c
-Only in misc: lipo.c
-Only in misc: main.c
-Only in misc: nm.c
-diff -ubr misc/notes misc/notes
+Only in misc/: ar.c
+Only in misc/: atom.c
+Only in misc/: check_dylib.c
+Only in misc/: check_hints.c
+Only in misc/: checksyms.c
+Only in misc/: cmpdylib.c
+Only in misc/: dylib_pcsampler.c
+Only in misc/: file.c
+Only in misc/: indr.c
+Only in misc/: inout.c
+Only in misc/: install_name_tool.c
+Only in misc/: kern_tool.c
+Only in misc/: libtool.c
+Only in misc/: lipo.c
+Only in misc/: main.c
+Only in misc/: nm.c
+diff -rub misc/notes misc/notes
 --- misc/notes	Tue Jan 14 23:35:29 2003
 +++ misc/notes	Mon Aug 25 12:12:34 2003
 @@ -7,6 +7,148 @@
@@ -255,10 +255,12 @@ diff -ubr misc/notes misc/notes
  Changes for the 5.11 release (the cctools-440 release):
  - Fixed the warnings about extra tokens at end of #endif directive in
    check_hints.c, strip.c and make_defs.h (Radar bug #3072042).
-Only in misc: pagestuff.c
-Only in misc: redo_prebinding.c
-Only in misc: seg_addr_table.c
-diff -ubr misc/seg_hack.c misc/seg_hack.c
+Only in misc/: pagestuff.c
+Only in misc/: redo_prebinding.c
+Only in misc/: seg_addr_table.c
+Only in misc/: seg_hack
+Only in misc/: seg_hack.NEW
+diff -rub misc/seg_hack.c misc/seg_hack.c
 --- misc/seg_hack.c	Fri Sep  6 18:28:06 2002
 +++ misc/seg_hack.c	Mon Aug 25 12:12:34 2003
 @@ -58,7 +58,7 @@
@@ -270,10 +272,13 @@ diff -ubr misc/seg_hack.c misc/seg_hack.c
      char *input, *output;
      struct arch *archs;
      unsigned long narchs;
-Only in misc: segedit.c
-Only in misc: size.c
-Only in misc: strings.c
-diff -ubr misc/strip.c misc/strip.c
+Only in misc/: seg_hack.o
+Only in misc/: seg_hack.private.o
+Only in misc/: segedit.c
+Only in misc/: size.c
+Only in misc/: strings.c
+Only in misc/: strip.NEW
+diff -rub misc/strip.c misc/strip.c
 --- misc/strip.c	Tue Jan 14 23:35:30 2003
 +++ misc/strip.c	Mon Aug 25 22:02:32 2003
 @@ -38,11 +38,13 @@
@@ -949,4 +954,8 @@ diff -ubr misc/strip.c misc/strip.c
  			   global_name[j+1] == 'F'){
  			    global_name[j+1] = 'f';
  			}
-Only in misc: vers_string
+Only in misc/: strip.o
+Only in misc/: strip.private.o
+Only in misc/: vers.c
+Only in misc/: vers.o
+Only in misc/: vers_string