version 1.3, 2014/03/29 21:09:28 |
version 1.6, 2021/12/25 22:09:59 |
|
|
diff -ubBr Makefile.in.orig Makefile.in |
diff -ubBr Makefile.in.orig Makefile.in |
--- Makefile.in.orig 2008-07-18 23:00:38.000000000 +0900 |
--- Makefile.in.orig 2011-06-07 22:56:05.000000000 +0900 |
+++ Makefile.in 2014-03-30 05:56:20.000000000 +0900 |
+++ Makefile.in 2021-03-23 14:57:31.896967000 +0900 |
@@ -12,19 +12,18 @@ |
@@ -5,7 +5,7 @@ |
YACC=@YACC@ |
|
LEX=@LEX@ |
|
|
|
-SUBDIR=cc |
@SET_MAKE@ |
+SUBDIR=cpp |
|
|
|
all: ${SUBDIR} |
-ALL_SUBDIRS= cc |
|
+ALL_SUBDIRS= cpp |
|
DIST_SUBDIRS= $(ALL_SUBDIRS) f77 |
|
|
install: |
all install clean: |
- cd cc && ${MAKE} install |
|
+ cd cpp && ${MAKE} install |
|
|
|
clean: |
|
- cd cc && ${MAKE} clean |
|
+ cd cpp && ${MAKE} clean |
|
|
|
distclean: |
|
- cd cc && ${MAKE} distclean |
|
- cd f77 && ${MAKE} distclean |
|
+ cd cpp && ${MAKE} distclean |
|
/bin/rm -rf Makefile config.log stamp-h1 config.status \ |
|
configure.lineno config.h autom4te.cache |
|
|
|
diff -ubBr configure.orig configure |
diff -ubBr configure.orig configure |
--- configure.orig 2010-11-01 03:20:51.000000000 +0900 |
--- configure.orig 2020-06-13 23:55:53.000000000 +0900 |
+++ configure 2014-03-30 05:57:22.000000000 +0900 |
+++ configure 2021-03-23 15:00:01.478465000 +0900 |
@@ -5081,7 +5081,7 @@ |
@@ -2598,6 +2598,7 @@ |
|
i?86) targmach=i386 ;; |
|
powerpc) targmach=powerpc endian=big ;; |
|
x86_64) targmach=amd64 ;; |
|
+ arm*) targmach=arm ;; |
|
esac |
|
;; |
|
|
|
@@ -5445,7 +5446,7 @@ |
_ACEOF |
_ACEOF |
|
|
|
|
-ac_config_files="$ac_config_files Makefile cc/Makefile cc/cc/Makefile cc/cpp/Makefile cc/ccom/Makefile f77/Makefile f77/f77/Makefile f77/fcom/Makefile" |
-ac_config_files="$ac_config_files Makefile cc/Makefile cc/cc/Makefile cc/cpp/Makefile cc/ccom/Makefile cc/cxxcom/Makefile cc/driver/Makefile f77/Makefile f77/f77/Makefile f77/fcom/Makefile" |
+ac_config_files="$ac_config_files Makefile cpp/Makefile" |
+ac_config_files="$ac_config_files Makefile cpp/Makefile" |
|
|
cat >confcache <<\_ACEOF |
cat >confcache <<\_ACEOF |
# This file is a shell script that caches the results of configure |
# This file is a shell script that caches the results of configure |
@@ -5640,7 +5640,7 @@ |
@@ -6143,7 +6143,7 @@ |
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
"cc/Makefile") CONFIG_FILES="$CONFIG_FILES cc/Makefile" ;; |
"cc/Makefile") CONFIG_FILES="$CONFIG_FILES cc/Makefile" ;; |
"cc/cc/Makefile") CONFIG_FILES="$CONFIG_FILES cc/cc/Makefile" ;; |
"cc/cc/Makefile") CONFIG_FILES="$CONFIG_FILES cc/cc/Makefile" ;; |
- "cc/cpp/Makefile") CONFIG_FILES="$CONFIG_FILES cc/cpp/Makefile" ;; |
- "cc/cpp/Makefile") CONFIG_FILES="$CONFIG_FILES cc/cpp/Makefile" ;; |
+ "cpp/Makefile") CONFIG_FILES="$CONFIG_FILES cpp/Makefile" ;; |
+ "cpp/Makefile") CONFIG_FILES="$CONFIG_FILES cpp/Makefile" ;; |
"cc/ccom/Makefile") CONFIG_FILES="$CONFIG_FILES cc/ccom/Makefile" ;; |
"cc/ccom/Makefile") CONFIG_FILES="$CONFIG_FILES cc/ccom/Makefile" ;; |
"f77/Makefile") CONFIG_FILES="$CONFIG_FILES f77/Makefile" ;; |
"cc/cxxcom/Makefile") CONFIG_FILES="$CONFIG_FILES cc/cxxcom/Makefile" ;; |
"f77/f77/Makefile") CONFIG_FILES="$CONFIG_FILES f77/f77/Makefile" ;; |
"cc/driver/Makefile") CONFIG_FILES="$CONFIG_FILES cc/driver/Makefile" ;; |
diff -ubBr cc/cpp/Makefile.in.orig cc/cpp/Makefile.in |
diff -ubBr cc/cpp/Makefile.in.orig cpp/Makefile.in |
--- cc/cpp/Makefile.in.orig 2010-12-19 00:22:13.000000000 +0900 |
--- cc/cpp/Makefile.in.orig 2020-06-29 22:37:18.000000000 +0900 |
+++ cc/cpp/Makefile.in 2011-01-14 22:05:51.000000000 +0900 |
+++ cc/cpp/Makefile.in 2021-03-23 15:04:06.518851000 +0900 |
@@ -12,7 +12,7 @@ |
@@ -32,7 +32,7 @@ |
prefix = @prefix@ |
MDIR=$(top_srcdir)/arch/$(TARGMACH) |
exec_prefix = @exec_prefix@ |
COMMONDIR=$(top_srcdir)/common |
bindir = @bindir@ |
|
-libexecdir = @libexecdir@ |
|
+libexecdir = @bindir@ |
|
datarootdir = @datarootdir@ |
|
mandir = @mandir@ |
|
strip = @strip@ |
|
@@ -30,7 +30,7 @@ |
|
|
|
OBJS=cpp.o cpy.o token.o compat.o |
|
HEADERS=cpp.h |
|
-DEST=@BINPREFIX@cpp$(EXEEXT) |
-DEST=@BINPREFIX@cpp$(EXEEXT) |
+DEST=@BINPREFIX@ox_cpp$(EXEEXT) |
+DEST=@BINPREFIX@ox_cpp$(EXEEXT) |
|
MANPAGE=@BINPREFIX@cpp |
|
|
MIPDIR=$(top_srcdir)/mip |
all: $(DEST) |
MDIR=$(top_srcdir)/arch/$(TARGMACH) |
diff -ubBr cc/cpp/cpp.c.orig cc/cpp/cpp.c |
@@ -89,8 +89,6 @@ |
--- cc/cpp/cpp.c.orig 2020-02-27 02:58:19.000000000 +0900 |
strip ${DESTDIR}${libexecdir}/${DEST} ; \ |
+++ cc/cpp/cpp.c 2021-03-25 17:01:14.157700000 +0900 |
echo strip ${DESTDIR}${libexecdir}/${DEST} ; \ |
@@ -802,10 +802,8 @@ |
fi |
free(nm); |
- test -z "${DESTDIR}$(mandir)/man1" || mkdir -p "${DESTDIR}$(mandir)/man1" |
nm = addname(ob->buf); |
- ${INSTALL} $(srcdir)/cpp.1 ${DESTDIR}${mandir}/man1/$(DEST).1 |
bufree(ob); |
|
- if (pushfile(nm, fn, SYSINC, NULL) == 0) |
|
+ pushfile(nm, fn, SYSINC, NULL); |
|
return 1; |
|
- |
|
- return 0; |
|
} |
|
|
clean: |
#endif |
/bin/rm -f $(OBJS) $(DEST) lex.yy.c y.tab.[ch] tests/run* |
|
diff -ubBr mip/node.h.orig mip/node.h |
|
--- mip/node.h.orig 2010-08-11 23:08:44.000000000 +0900 |
|
+++ mip/node.h 2011-05-18 12:21:30.000000000 +0900 |
|
@@ -42,7 +42,7 @@ |
|
struct attr { |
|
struct attr *next; |
|
int atype; |
|
- union aarg aa[]; |
|
+ union aarg aa[1]; |
|
}; |
|
|
|
/* |
|