[Debootloaders-devel] r182 - in trunk/emile: debian first libblock
libcontainer libgzip libiso9660 libmacos libstream libunix second
Wouter Verhelst
wouter at alioth.debian.org
Thu Nov 9 09:25:13 CET 2006
Author: wouter
Date: 2006-11-09 09:25:09 +0100 (Thu, 09 Nov 2006)
New Revision: 182
Modified:
trunk/emile/debian/changelog
trunk/emile/debian/control
trunk/emile/debian/rules
trunk/emile/first/first.S
trunk/emile/libblock/Makefile
trunk/emile/libcontainer/Makefile
trunk/emile/libgzip/Makefile
trunk/emile/libiso9660/Makefile
trunk/emile/libmacos/Makefile
trunk/emile/libmacos/display_properties.S
trunk/emile/libstream/Makefile
trunk/emile/libunix/divsi3.S
trunk/emile/libunix/modsi3.S
trunk/emile/libunix/mulsi3.S
trunk/emile/libunix/udivsi3.S
trunk/emile/libunix/umodsi3.S
trunk/emile/second/MMU030_asm.S
trunk/emile/second/MMU040_asm.S
trunk/emile/second/PPC_asm.S
trunk/emile/second/enter_kernel030.S
trunk/emile/second/enter_kernel040.S
trunk/emile/second/enter_kernelPPC.S
trunk/emile/second/enter_kernelnoMMU.S
trunk/emile/second/head.S
Log:
* Make sure this stuff builds with recent toolchains
* Allow for debian/emile-install-kernel to actually be installed.
Final build started; this will be uploaded, unless I find another bug :)
Modified: trunk/emile/debian/changelog
===================================================================
--- trunk/emile/debian/changelog 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/debian/changelog 2006-11-09 08:25:09 UTC (rev 182)
@@ -10,6 +10,9 @@
* Make emile-bootblocks a versioned depends, using the proper dpkg-substvars
variable.
* Fix build system in debian/rules.
+ * Remove -Werror from CFLAGS, and build with 'gcc' rather than 'gcc-3.3'
+ * Replace '.chip' assembly directives by '.cpu', which works with binutils
+ 2.17
[ Aurélien GÉRÔME ]
* Add the XS-Vcs-Svn field in debian/control.
@@ -20,7 +23,7 @@
* Add Homepage in debian/control.
* Add debian/watch file.
- -- Aurélien GÉRÔME <ag at roxor.cx> Tue, 7 Nov 2006 23:27:27 +0100
+ -- Wouter Verhelst <wouter at debian.org> Wed, 8 Nov 2006 19:30:43 +0100
emile (0.10-1) unstable; urgency=low
Modified: trunk/emile/debian/control
===================================================================
--- trunk/emile/debian/control 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/debian/control 2006-11-09 08:25:09 UTC (rev 182)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debootloaders EMILE Maintainers Team <debootloaders-emile at lists.alioth.debian.org>
Uploaders: Wouter Verhelst <wouter at debian.org>, Stephen R. Marenka <smarenka at debian.org>, Aurélien GÉRÔME <ag at roxor.cx>
-Build-Depends: debhelper (>> 4.1.16), docbook-to-man, gcc-3.3
+Build-Depends: debhelper (>> 4.1.16), docbook-to-man, gcc
Build-Depends-Indep: m68k-linux-gcc [!m68k]
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/debootloaders/trunk/emile/
Modified: trunk/emile/debian/rules
===================================================================
--- trunk/emile/debian/rules 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/debian/rules 2006-11-09 08:25:09 UTC (rev 182)
@@ -3,11 +3,7 @@
# This file is public domain software, originally written by Joey Hess.
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifeq ($(DEB_BUILD_ARCH),m68k)
-M68K_CC=m68k-linux-gnu-gcc-3.3
-else
-M68K_CC=m68k-linux-gcc
-endif
+M68K_CC=m68k-linux-gnu-gcc
build: build-stamp
build-stamp:
@@ -15,9 +11,9 @@
# Add here commands to compile the package.
ifeq ($(DEB_BUILD_ARCH),m68k)
- $(MAKE) CC=gcc-3.3 M68K_CC=$(M68K_CC)
+ $(MAKE) CC=gcc M68K_CC=$(M68K_CC)
else
- $(MAKE) CC=gcc-3.3 tools docs
+ $(MAKE) CC=gcc tools docs
endif
touch build-stamp
Modified: trunk/emile/first/first.S
===================================================================
--- trunk/emile/first/first.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/first/first.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -4,7 +4,7 @@
*
*/
- .chip 68000
+ .cpu 68000
.equ sector_size, 512
.equ first_level_size, 2 * sector_size
Modified: trunk/emile/libblock/Makefile
===================================================================
--- trunk/emile/libblock/Makefile 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libblock/Makefile 2006-11-09 08:25:09 UTC (rev 182)
@@ -5,7 +5,7 @@
TOP=$(shell pwd)
#CFLAGS = -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2 -m68000 -Wa,-m68000 -Os
-CFLAGS = -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2 -m68020 -Wa,-m68020 -Os
+CFLAGS = -nostdlib -nodefaultlibs -Wall -Wno-multichar -fpic -O2 -m68020 -Wa,-m68020 -Os
CPPFLAGS = -I$(TOP)/../libmacos -DARCH_M68K -I$(TOP)/../libstream
LIBRARY = libblock.a
Modified: trunk/emile/libcontainer/Makefile
===================================================================
--- trunk/emile/libcontainer/Makefile 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libcontainer/Makefile 2006-11-09 08:25:09 UTC (rev 182)
@@ -5,7 +5,7 @@
TOP=$(shell pwd)
VPATH=$(TOP)
-CFLAGS = -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2 -m68020 -Wa,-m68020 -Os
+CFLAGS = -nostdlib -nodefaultlibs -Wall -Wno-multichar -fpic -O2 -m68020 -Wa,-m68020 -Os
CPPFLAGS = -I$(TOP)/../libstream
LIBRARY = libcontainer.a
Modified: trunk/emile/libgzip/Makefile
===================================================================
--- trunk/emile/libgzip/Makefile 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libgzip/Makefile 2006-11-09 08:25:09 UTC (rev 182)
@@ -13,7 +13,7 @@
LD=$(CROSS_COMPILE)ld
AR=$(CROSS_COMPILE)ar
-CFLAGS = -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar
+CFLAGS = -nostdlib -nodefaultlibs -Wall -Wno-multichar
ifeq ($(TARGET), m68k-linux)
CFLAGS += -fpic -O2 -m68020 -Wa,-m68020 -Os
endif
Modified: trunk/emile/libiso9660/Makefile
===================================================================
--- trunk/emile/libiso9660/Makefile 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libiso9660/Makefile 2006-11-09 08:25:09 UTC (rev 182)
@@ -11,7 +11,7 @@
AR=$(CROSS_COMPILE)ar
TARGET = native
-CFLAGS = -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar
+CFLAGS = -nostdlib -nodefaultlibs -Wall -Wno-multichar
ifeq ($(TARGET), m68k-linux)
CFLAGS += -fpic -O2 -m68020 -Wa,-m68020 -Os
endif
Modified: trunk/emile/libmacos/Makefile
===================================================================
--- trunk/emile/libmacos/Makefile 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libmacos/Makefile 2006-11-09 08:25:09 UTC (rev 182)
@@ -4,7 +4,7 @@
TOP = $(shell pwd)
-CFLAGS = -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -O2 -m68020 -Wa,-m68020 -Os
+CFLAGS = -nostdlib -nodefaultlibs -Wall -Wno-multichar -fpic -O2 -m68020 -Wa,-m68020 -Os
CPPFLAGS = -I$(TOP) -DARCH_M68K
LIBRARY = libmacos.a
Modified: trunk/emile/libmacos/display_properties.S
===================================================================
--- trunk/emile/libmacos/display_properties.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libmacos/display_properties.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -4,7 +4,7 @@
*
*/
- .chip 68000
+ .cpu 68000
.align 2
Modified: trunk/emile/libstream/Makefile
===================================================================
--- trunk/emile/libstream/Makefile 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libstream/Makefile 2006-11-09 08:25:09 UTC (rev 182)
@@ -5,7 +5,7 @@
TOP = $(shell pwd)
VPATH=$(TOP)
-CFLAGS = -nostdlib -nodefaultlibs -Wall -Werror -Wno-multichar -fpic -g -O2 -Os
+CFLAGS = -nostdlib -nodefaultlibs -Wall -Wno-multichar -fpic -g -O2 -Os
#-m68000 -Wa,-m68000
CPPFLAGS = -I$(TOP)/../libmacos -I$(TOP) -I$(TOP)/../libgzip
Modified: trunk/emile/libunix/divsi3.S
===================================================================
--- trunk/emile/libunix/divsi3.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libunix/divsi3.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -7,7 +7,7 @@
*
*/
- .chip 68000
+ .cpu 68000
.align 2
Modified: trunk/emile/libunix/modsi3.S
===================================================================
--- trunk/emile/libunix/modsi3.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libunix/modsi3.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -7,7 +7,7 @@
*
*/
- .chip 68000
+ .cpu 68000
.align 2
Modified: trunk/emile/libunix/mulsi3.S
===================================================================
--- trunk/emile/libunix/mulsi3.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libunix/mulsi3.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -7,7 +7,7 @@
*
*/
- .chip 68000
+ .cpu 68000
.align 2
Modified: trunk/emile/libunix/udivsi3.S
===================================================================
--- trunk/emile/libunix/udivsi3.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libunix/udivsi3.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -7,7 +7,7 @@
*
*/
- .chip 68000
+ .cpu 68000
.align 2
Modified: trunk/emile/libunix/umodsi3.S
===================================================================
--- trunk/emile/libunix/umodsi3.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/libunix/umodsi3.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -7,7 +7,7 @@
*
*/
- .chip 68000
+ .cpu 68000
.align 2
Modified: trunk/emile/second/MMU030_asm.S
===================================================================
--- trunk/emile/second/MMU030_asm.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/second/MMU030_asm.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -4,7 +4,7 @@
*
*/
- .chip 68030
+ .cpu 68030
.global MMU030_disable_cache
MMU030_disable_cache:
Modified: trunk/emile/second/MMU040_asm.S
===================================================================
--- trunk/emile/second/MMU040_asm.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/second/MMU040_asm.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -4,7 +4,7 @@
*
*/
- .chip 68040
+ .cpu 68040
.global MMU040_disable_cache
MMU040_disable_cache:
Modified: trunk/emile/second/PPC_asm.S
===================================================================
--- trunk/emile/second/PPC_asm.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/second/PPC_asm.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -4,4 +4,4 @@
*
*/
- .chip 68020
+ .cpu 68020
Modified: trunk/emile/second/enter_kernel030.S
===================================================================
--- trunk/emile/second/enter_kernel030.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/second/enter_kernel030.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -4,7 +4,7 @@
*
*/
- .chip 68030
+ .cpu 68030
.include "copymem.i"
Modified: trunk/emile/second/enter_kernel040.S
===================================================================
--- trunk/emile/second/enter_kernel040.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/second/enter_kernel040.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -4,7 +4,7 @@
*
*/
- .chip 68040
+ .cpu 68040
.include "copymem.i"
Modified: trunk/emile/second/enter_kernelPPC.S
===================================================================
--- trunk/emile/second/enter_kernelPPC.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/second/enter_kernelPPC.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -5,7 +5,7 @@
*
*/
- .chip 68020
+ .cpu 68020
.equ PC, 0x00FC
.equ GPR, 0x0100
Modified: trunk/emile/second/enter_kernelnoMMU.S
===================================================================
--- trunk/emile/second/enter_kernelnoMMU.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/second/enter_kernelnoMMU.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -3,7 +3,7 @@
* (c) 2004 Laurent Vivier <LaurentVivier at wanadoo.fr>
*
*/
- .chip 68000
+ .cpu 68000
.include "copymem.i"
Modified: trunk/emile/second/head.S
===================================================================
--- trunk/emile/second/head.S 2006-11-07 22:28:02 UTC (rev 181)
+++ trunk/emile/second/head.S 2006-11-09 08:25:09 UTC (rev 182)
@@ -4,7 +4,7 @@
*
*/
- .chip 68000
+ .cpu 68000
.macro SysError
.short 0xA9C9
More information about the Debootloaders-devel
mailing list