]>
Commit | Line | Data |
---|---|---|
15afd9ab JB |
1 | --- uClibc-0.9.19/Makefile.orig Mon Mar 3 07:47:56 2003 |
2 | +++ uClibc-0.9.19/Makefile Wed Apr 2 23:44:51 2003 | |
3 | @@ -257,21 +257,21 @@ | |
4 | ifeq ($(strip $(HAVE_SHARED)),y) | |
5 | install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin; | |
6 | install -m 755 ldso/util/ldd \ | |
7 | - $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd | |
8 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldd \ | |
9 | + $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldd | |
10 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldd \ | |
11 | $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldd | |
1ecf6a0b JB |
12 | # For now, don't bother with readelf since surely the host |
13 | # system has binutils, or we couldn't have gotten this far... | |
15afd9ab JB |
14 | #install -m 755 ldso/util/readelf \ |
15 | - # $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf | |
16 | - #ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf \ | |
17 | + # $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-readelf | |
18 | + #ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-readelf \ | |
19 | # $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/readelf | |
1ecf6a0b JB |
20 | @if [ -x ldso/util/ldconfig ] ; then \ |
21 | set -x -e; \ | |
22 | install -d $(PREFIX)$(DEVEL_PREFIX)/etc; \ | |
15afd9ab JB |
23 | install -m 755 ldso/util/ldconfig \ |
24 | - $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig; \ | |
25 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ldconfig \ | |
26 | + $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldconfig; \ | |
27 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ldconfig \ | |
28 | $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ldconfig; \ | |
1ecf6a0b JB |
29 | fi; |
30 | endif | |
15afd9ab JB |
31 | --- uClibc-0.9.19/extra/Configs/Config.in.orig Wed Feb 5 08:45:34 2003 |
32 | +++ uClibc-0.9.19/extra/Configs/Config.in Wed Apr 2 23:46:51 2003 | |
33 | @@ -299,7 +299,7 @@ | |
1ecf6a0b | 34 | |
15afd9ab JB |
35 | config DEVEL_PREFIX |
36 | string "uClibc development environment directory" | |
37 | - default "/usr/$(TARGET_ARCH)-linux-uclibc" | |
38 | + default "/usr/$(TARGET_CPU)-linux-uclibc" | |
39 | help | |
40 | DEVEL_PREFIX is the directory into which the uClibc development | |
41 | environment will be installed. The result will look something | |
42 | --- uClibc-0.9.19/extra/Configs/Config.i386.default.orig Thu Jan 16 08:15:18 2003 | |
43 | +++ uClibc-0.9.19/extra/Configs/Config.i386.default Wed Apr 2 23:47:11 2003 | |
44 | @@ -60,7 +60,7 @@ | |
45 | # Library Installation Options | |
46 | # | |
47 | SHARED_LIB_LOADER_PATH="$(DEVEL_PREFIX)/lib" | |
48 | -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" | |
49 | +DEVEL_PREFIX="/usr/$(TARGET_CPU)-linux-uclibc" | |
50 | SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" | |
51 | DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" | |
1ecf6a0b | 52 | |
15afd9ab JB |
53 | --- uClibc-0.9.19/extra/gcc-uClibc/Makefile.orig Wed Dec 4 23:40:16 2002 |
54 | +++ uClibc-0.9.19/extra/gcc-uClibc/Makefile Wed Apr 2 23:48:42 2003 | |
55 | @@ -41,36 +41,36 @@ | |
1ecf6a0b JB |
56 | endif |
57 | ||
58 | gcc-uClibc: gcc-uClibc.h gcc-uClibc.c | |
15afd9ab JB |
59 | - $(HOSTCC) $(HOSTCFLAGS) -Wl,-s gcc-uClibc.c -o $(TARGET_ARCH)-uclibc-gcc |
60 | + $(HOSTCC) $(HOSTCFLAGS) -Wl,-s gcc-uClibc.c -o $(TARGET_CPU)-uclibc-gcc | |
1ecf6a0b JB |
61 | |
62 | ld-uClibc: | |
63 | - @echo "#!/bin/sh" > $(TARGET_ARCH)-uclibc-ld | |
64 | - @echo "# This file was autogenerated by make" >> $(TARGET_ARCH)-uclibc-ld | |
65 | + @echo "#!/bin/sh" > $(TARGET_CPU)-uclibc-ld | |
66 | + @echo "# This file was autogenerated by make" >> $(TARGET_CPU)-uclibc-ld | |
67 | @echo "$(LD_BIN) \$$@ -L$(DEVEL_PREFIX)/usr/lib -L$(DEVEL_PREFIX)/lib "\ | |
68 | - "-L$(UCLIBC_DIR)" >> $(TARGET_ARCH)-uclibc-ld | |
69 | - chmod a+x $(TARGET_ARCH)-uclibc-ld | |
70 | + "-L$(UCLIBC_DIR)" >> $(TARGET_CPU)-uclibc-ld | |
71 | + chmod a+x $(TARGET_CPU)-uclibc-ld | |
72 | ||
73 | install: all | |
15afd9ab | 74 | install -d $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin; |
1ecf6a0b JB |
75 | install -d $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin; |
76 | - install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ | |
77 | - install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ | |
1ecf6a0b | 78 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc |
15afd9ab JB |
79 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/gcc |
80 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/cc | |
81 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ld | |
1ecf6a0b JB |
82 | + install -m 755 $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ |
83 | + install -m 755 $(TARGET_CPU)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ | |
15afd9ab JB |
84 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-cc |
85 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/gcc | |
86 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/cc | |
87 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-ld $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/ld | |
88 | ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) | |
89 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-g++ | |
90 | - ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-c++ | |
91 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/c++ | |
92 | - ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/g++ | |
1ecf6a0b JB |
93 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-g++ |
94 | + ln -fs $(TARGET_CPU)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-c++ | |
15afd9ab JB |
95 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/c++ |
96 | + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-gcc $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/g++ | |
97 | endif | |
1ecf6a0b JB |
98 | for app in addr2line ar as cpp gasp nm objcopy \ |
99 | objdump ranlib size strings strip; do \ | |
15afd9ab JB |
100 | APPNAME=`which $(CROSS)$${app}`; \ |
101 | if [ -x "$$APPNAME" ] ; then \ | |
102 | ln -fs "$$APPNAME" $(PREFIX)$(DEVEL_TOOL_PREFIX)/bin/$${app}; \ | |
103 | - ln -fs "$$APPNAME" $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-$${app}; \ | |
104 | + ln -fs "$$APPNAME" $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_CPU)-uclibc-$${app}; \ | |
105 | fi; \ | |
1ecf6a0b JB |
106 | done |
107 | ||
15afd9ab JB |
108 | --- uClibc-0.9.19/ldso/util/Makefile.orig Sat Mar 1 12:02:43 2003 |
109 | +++ uClibc-0.9.19/ldso/util/Makefile Wed Apr 2 23:42:31 2003 | |
1ecf6a0b JB |
110 | @@ -22,7 +22,7 @@ |
111 | ||
112 | TOPDIR=../../ | |
113 | include $(TOPDIR)Rules.mak | |
114 | -TARGET_CC = $(TOPDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc | |
115 | +TARGET_CC = $(TOPDIR)extra/gcc-uClibc/$(TARGET_CPU)-uclibc-gcc | |
116 | ||
15afd9ab JB |
117 | TARGETS = elf_header ldd |
118 | ifeq ($(OSTYPE),linux) | |
119 | --- uClibc-0.9.19/test/Rules.mak.orig Thu Feb 27 18:04:22 2003 | |
120 | +++ uClibc-0.9.19/test/Rules.mak Wed Apr 2 23:49:34 2003 | |
121 | @@ -41,7 +41,7 @@ | |
122 | # make CROSS=mipsel-linux- | |
123 | # will build uClibc for 'mipsel'. | |
1ecf6a0b | 124 | |
15afd9ab JB |
125 | -CROSS=../$(TESTDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc- |
126 | +CROSS=../$(TESTDIR)extra/gcc-uClibc/$(TARGET_CPU)-uclibc- | |
127 | CC= $(CROSS)gcc | |
1ecf6a0b | 128 | STRIPTOOL=strip |
15afd9ab | 129 | LDD=../$(TESTDIR)ldso/util/ldd |