From: "Joseph S. Myers" <joseph@codesourcery.com>
To: libc-ports@sourceware.org
Cc: Chris Metcalf <cmetcalf@tilera.com>
Subject: Update MIPS for syscall-list changes
Date: Wed, 30 May 2012 16:03:00 -0000 [thread overview]
Message-ID: <Pine.LNX.4.64.1205301558560.32198@digraph.polyomino.org.uk> (raw)
I've applied this patch to update the MIPS port for the syscall-list
changes in libc, so that triarch headers are still generated correctly
after those changes.
I think tilegx should properly be updated to have the right definitions as
a biarch port - even if there are no differences for lib-names.h or
syscall.h between the 32-bit and 64-bit cases, each should still get its
own stubs.h generated.
diff --git a/ChangeLog.mips b/ChangeLog.mips
index d058589..7d07aa6 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,5 +1,18 @@
2012-05-30 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/unix/sysv/linux/mips/Makefile (syscall-list-variants):
+ Rename to abi-variants.
+ (syscall-list-includes): Rename to abi-includes.
+ (syscall-list-o32-options): Rename to abi-o32-options.
+ (syscall-list-o32-condition): Rename to abi-o32-condition.
+ (syscall-list-n32-options): Rename to abi-n32-options.
+ (syscall-list-n32-condition): Rename to abi-n32-condition.
+ (syscall-list-n64-options): Rename to abi-n64-options.
+ (syscall-list-n64-condition): Rename to abi-n64-condition.
+ * sysdeps/unix/sysv/linux/mips/mips32/Makefile: New file.
+ * sysdeps/unix/sysv/linux/mips/mips64/n32/Makefile: Likewise.
+ * sysdeps/unix/sysv/linux/mips/mips64/n64/Makefile: Likewise.
+
* sysdeps/unix/sysv/linux/mips/nptl/pthread_once.c: Replace
_internal alias by hidden_def.
diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile
index 2aaf63c..fd6e3e0 100644
--- a/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/sysdeps/unix/sysv/linux/mips/Makefile
@@ -8,14 +8,14 @@ sysdep_routines += cachectl cacheflush sysmips _test_and_set
sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h
# _MIPS_SIM_ABI32 == 1, _MIPS_SIM_ABIN32 == 2, _MIPS_SIM_ABI64 == 3
-syscall-list-variants := o32 n32 n64
-syscall-list-includes := sgidefs.h
-syscall-list-o32-options := -D_MIPS_SIM=1
-syscall-list-o32-condition := _MIPS_SIM == _MIPS_SIM_ABI32
-syscall-list-n32-options := -D_MIPS_SIM=2
-syscall-list-n32-condition := _MIPS_SIM == _MIPS_SIM_ABIN32
-syscall-list-n64-options := -D_MIPS_SIM=3
-syscall-list-n64-condition := _MIPS_SIM == _MIPS_SIM_ABI64
+abi-variants := o32 n32 n64
+abi-includes := sgidefs.h
+abi-o32-options := -D_MIPS_SIM=1
+abi-o32-condition := _MIPS_SIM == _MIPS_SIM_ABI32
+abi-n32-options := -D_MIPS_SIM=2
+abi-n32-condition := _MIPS_SIM == _MIPS_SIM_ABIN32
+abi-n64-options := -D_MIPS_SIM=3
+abi-n64-condition := _MIPS_SIM == _MIPS_SIM_ABI64
endif
ifeq ($(subdir),elf)
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/Makefile b/sysdeps/unix/sysv/linux/mips/mips32/Makefile
new file mode 100644
index 0000000..77e9121
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips32/Makefile
@@ -0,0 +1 @@
+default-abi := o32
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/Makefile b/sysdeps/unix/sysv/linux/mips/mips64/n32/Makefile
new file mode 100644
index 0000000..2368c40
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/Makefile
@@ -0,0 +1 @@
+default-abi := n32
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/Makefile b/sysdeps/unix/sysv/linux/mips/mips64/n64/Makefile
new file mode 100644
index 0000000..fed17ba
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/Makefile
@@ -0,0 +1 @@
+default-abi := n64
--
Joseph S. Myers
joseph@codesourcery.com
next reply other threads:[~2012-05-30 16:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-30 16:03 Joseph S. Myers [this message]
2012-05-30 17:44 ` Chris Metcalf
2012-05-30 18:46 ` Joseph S. Myers
2012-05-30 19:54 ` Chris Metcalf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.1205301558560.32198@digraph.polyomino.org.uk \
--to=joseph@codesourcery.com \
--cc=cmetcalf@tilera.com \
--cc=libc-ports@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).