[klibc] [klibc:master] arch: Remove m32r port
klibc-bot for Ben Hutchings
ben at decadent.org.uk
Fri Jan 18 08:42:19 PST 2019
Commit-ID: 1e6e96615227de6ca88d096fb0ebe45bf25981c2
Gitweb: http://git.kernel.org/?p=libs/klibc/klibc.git;a=commit;h=1e6e96615227de6ca88d096fb0ebe45bf25981c2
Author: Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Fri, 18 Jan 2019 00:33:51 +0000
Committer: Ben Hutchings <ben at decadent.org.uk>
CommitDate: Fri, 18 Jan 2019 03:10:14 +0000
[klibc] arch: Remove m32r port
klibc targets the latest kernel version, and the m32r kernel port
was removed in Linux 4.17. Remove our support for it.
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
usr/include/arch/m32r/klibc/archconfig.h | 14 ----------
usr/include/arch/m32r/klibc/archsetjmp.h | 21 --------------
usr/include/arch/m32r/klibc/archsignal.h | 14 ----------
usr/include/arch/m32r/klibc/archstat.h | 39 --------------------------
usr/klibc/arch/m32r/Kbuild | 13 ---------
usr/klibc/arch/m32r/MCONFIG | 18 ------------
usr/klibc/arch/m32r/crt0.S | 24 ----------------
usr/klibc/arch/m32r/setjmp.S | 47 --------------------------------
usr/klibc/arch/m32r/syscall.S | 29 --------------------
usr/klibc/arch/m32r/sysstub.ph | 25 -----------------
10 files changed, 244 deletions(-)
diff --git a/usr/include/arch/m32r/klibc/archconfig.h b/usr/include/arch/m32r/klibc/archconfig.h
deleted file mode 100644
index 9489877..0000000
--- a/usr/include/arch/m32r/klibc/archconfig.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * include/arch/m32r/klibc/archconfig.h
- *
- * See include/klibc/sysconfig.h for the options that can be set in
- * this file.
- *
- */
-
-#ifndef _KLIBC_ARCHCONFIG_H
-#define _KLIBC_ARCHCONFIG_H
-
-/* All defaults */
-
-#endif /* _KLIBC_ARCHCONFIG_H */
diff --git a/usr/include/arch/m32r/klibc/archsetjmp.h b/usr/include/arch/m32r/klibc/archsetjmp.h
deleted file mode 100644
index d82df9c..0000000
--- a/usr/include/arch/m32r/klibc/archsetjmp.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * arch/m32r/include/klibc/archsetjmp.h
- */
-
-#ifndef _KLIBC_ARCHSETJMP_H
-#define _KLIBC_ARCHSETJMP_H
-
-struct __jmp_buf {
- unsigned long __r8;
- unsigned long __r9;
- unsigned long __r10;
- unsigned long __r11;
- unsigned long __r12;
- unsigned long __r13;
- unsigned long __r14;
- unsigned long __r15;
-};
-
-typedef struct __jmp_buf jmp_buf[1];
-
-#endif /* _KLIBC_ARCHSETJMP_H */
diff --git a/usr/include/arch/m32r/klibc/archsignal.h b/usr/include/arch/m32r/klibc/archsignal.h
deleted file mode 100644
index b753026..0000000
--- a/usr/include/arch/m32r/klibc/archsignal.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * arch/m32r/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-#include <asm/signal.h>
-/* No special stuff for this architecture */
-
-#endif
diff --git a/usr/include/arch/m32r/klibc/archstat.h b/usr/include/arch/m32r/klibc/archstat.h
deleted file mode 100644
index 09d3ade..0000000
--- a/usr/include/arch/m32r/klibc/archstat.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#include <klibc/stathelp.h>
-
-#define _STATBUF_ST_NSEC
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat {
- __stdev64 (st_dev);
- unsigned char __pad0[4];
-
- unsigned long __st_ino;
-
- unsigned int st_mode;
- unsigned int st_nlink;
-
- unsigned long st_uid;
- unsigned long st_gid;
-
- __stdev64 (st_rdev);
- unsigned char __pad3[4];
-
- long long st_size;
- unsigned long st_blksize;
-
- unsigned long st_blocks; /* Number 512-byte blocks allocated. */
- unsigned long __pad4; /* future possible st_blocks high bits */
-
- struct timespec st_atim;
- struct timespec st_mtim;
- struct timespec st_ctim;
-
- unsigned long long st_ino;
-};
-
-#endif
diff --git a/usr/klibc/arch/m32r/Kbuild b/usr/klibc/arch/m32r/Kbuild
deleted file mode 100644
index ceb2ba0..0000000
--- a/usr/klibc/arch/m32r/Kbuild
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# klibc files for m32r
-#
-
-
-klib-y := setjmp.o syscall.o
-
-klib-y += ../../libgcc/__divdi3.o ../../libgcc/__moddi3.o
-klib-y += ../../libgcc/__udivdi3.o ../../libgcc/__umoddi3.o
-klib-y += ../../libgcc/__udivmoddi4.o
-
-always := crt0.o
-targets := crt0.o
diff --git a/usr/klibc/arch/m32r/MCONFIG b/usr/klibc/arch/m32r/MCONFIG
deleted file mode 100644
index 7ca2785..0000000
--- a/usr/klibc/arch/m32r/MCONFIG
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- makefile -*-
-#
-# arch/m32r/MCONFIG
-#
-# Special rules for this architecture. Note that this is actually
-# included from the main Makefile, and that pathnames should be
-# accordingly.
-#
-
-KLIBCOPTFLAGS += -Os
-KLIBCBITSIZE = 32
-
-# Extra linkflags when building the shared version of the library
-# This address needs to be reachable using normal inter-module
-# calls, and work on the memory models for this architecture
-# 224 MB - normal binaries start at 0 (?)
-# (lib?)gcc on cris seems to insist on producing .init and .fini sections
-KLIBCSHAREDFLAGS = --section-start .init=0x0e000100
diff --git a/usr/klibc/arch/m32r/crt0.S b/usr/klibc/arch/m32r/crt0.S
deleted file mode 100644
index 568e5d8..0000000
--- a/usr/klibc/arch/m32r/crt0.S
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# arch/m32r/crt0.S
-#
-# Does arch-specific initialization and invokes __libc_init
-# with the appropriate arguments.
-#
-# See __static_init.c or __shared_init.c for the expected
-# arguments.
-#
-
- .text
- .balign 4
- .type _start, at function
- .globl _start
-_start:
- /* Save the address of the ELF argument array */
- mv r0, sp
-
- /* atexit() function (assume null) */
- xor r1, r1
-
- bl __libc_init
-
- .size _start, .-_start
diff --git a/usr/klibc/arch/m32r/setjmp.S b/usr/klibc/arch/m32r/setjmp.S
deleted file mode 100644
index 02a25e7..0000000
--- a/usr/klibc/arch/m32r/setjmp.S
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# arch/m32r/setjmp.S
-#
-# setjmp/longjmp for the M32R architecture
-#
-
-#
-# The jmp_buf is assumed to contain the following, in order:
-# r8-r15
-#
-# Note that r14 is the return address register and
-# r15 is the stack pointer.
-#
-
- .text
- .balign 4
- .globl setjmp
- .type setjmp, @function
-setjmp:
- st r8, @r0
- st r9, @+r0
- st r10, @+r0
- st r11, @+r0
- st r12, @+r0
- st r13, @+r0
- st r14, @+r0
- st r15, @+r0
- xor r0, r0
- jmp r14
- .size setjmp,.-setjmp
-
- .text
- .balign 4
- .globl longjmp
- .type longjmp, @function
-longjmp:
- ld r8, @r0+
- ld r9, @r0+
- ld r10, @r0+
- ld r11, @r0+
- ld r12, @r0+
- ld r13, @r0+
- ld r14, @r0+
- ld r15, @r0
- mv r0, r1
- jmp r14
- .size longjmp,.-longjmp
diff --git a/usr/klibc/arch/m32r/syscall.S b/usr/klibc/arch/m32r/syscall.S
deleted file mode 100644
index a20a336..0000000
--- a/usr/klibc/arch/m32r/syscall.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * arch/m32r/syscall.S
- *
- * r7 contains the syscall number (set by stub);
- * r0..r3 contains arguments 0-3 per standard calling convention;
- * r4..r5 contains arguments 4-5, but we have to get those from
- * the stack.
- */
-
- .section ".text","ax"
- .balign 4
- .globl __syscall_common
- .type __syscall_common, at function
-__syscall_common:
- ld r4, at sp
- ld r5,@(4,sp)
- trap #2
- cmpi r0, #-4096
- bnc 1f
- jmp r14
-1:
- seth r2,#high(errno)
- or3 r2,r2,#low(errno)
- neg r1,r0
- st r1, at r7
- ldi r0,#-1
- jmp r14
-
- .size __syscall_common,.-__syscall_common
diff --git a/usr/klibc/arch/m32r/sysstub.ph b/usr/klibc/arch/m32r/sysstub.ph
deleted file mode 100644
index 98dfb9d..0000000
--- a/usr/klibc/arch/m32r/sysstub.ph
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- perl -*-
-#
-# arch/m32r/sysstub.ph
-#
-# Script to generate system call stubs
-#
-
-sub make_sysstub($$$$$@) {
- my($outputdir, $fname, $type, $sname, $stype, @args) = @_;
-
- open(OUT, '>', "${outputdir}/${fname}.S");
- print OUT "#include <asm/unistd.h>\n";
- print OUT "\n";
- print OUT "\t.text\n";
- print OUT "\t.type\t${fname},\@function\n";
- print OUT "\t.globl\t${fname}\n";
- print OUT "\t.balign\t4\n";
- print OUT "${fname}:\n";
- print OUT "\tldi\tr7,#__NR_${sname}\n";
- print OUT "\tbra\t__syscall_common\n";
- print OUT "\t.size ${fname},.-${fname}\n";
- close(OUT);
-}
-
-1;
More information about the klibc
mailing list