diff --git a/common/jpeg/simd/jcclrmmx.asm b/common/jpeg/simd/jcclrmmx.asm
index 34c4224..b6b8912 100644
--- a/common/jpeg/simd/jcclrmmx.asm
+++ b/common/jpeg/simd/jcclrmmx.asm
@@ -474,3 +474,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcclrss2-64.asm b/common/jpeg/simd/jcclrss2-64.asm
index f2cd8f4..31c5be6 100644
--- a/common/jpeg/simd/jcclrss2-64.asm
+++ b/common/jpeg/simd/jcclrss2-64.asm
@@ -482,3 +482,6 @@
 	pop	rbp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcclrss2.asm b/common/jpeg/simd/jcclrss2.asm
index d6f868c..8def718 100644
--- a/common/jpeg/simd/jcclrss2.asm
+++ b/common/jpeg/simd/jcclrss2.asm
@@ -500,3 +500,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcqnt3dn.asm b/common/jpeg/simd/jcqnt3dn.asm
index 194b7f9..182c869 100644
--- a/common/jpeg/simd/jcqnt3dn.asm
+++ b/common/jpeg/simd/jcqnt3dn.asm
@@ -228,3 +228,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcqntmmx.asm b/common/jpeg/simd/jcqntmmx.asm
index fa54902..08b08b7 100644
--- a/common/jpeg/simd/jcqntmmx.asm
+++ b/common/jpeg/simd/jcqntmmx.asm
@@ -269,3 +269,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcqnts2f-64.asm b/common/jpeg/simd/jcqnts2f-64.asm
index 51d6307..e09387c 100644
--- a/common/jpeg/simd/jcqnts2f-64.asm
+++ b/common/jpeg/simd/jcqnts2f-64.asm
@@ -150,3 +150,7 @@
 	uncollect_args
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcqnts2f.asm b/common/jpeg/simd/jcqnts2f.asm
index 19c1d01..d80ae5d 100644
--- a/common/jpeg/simd/jcqnts2f.asm
+++ b/common/jpeg/simd/jcqnts2f.asm
@@ -166,3 +166,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcqnts2i-64.asm b/common/jpeg/simd/jcqnts2i-64.asm
index d561590..4568dfc 100644
--- a/common/jpeg/simd/jcqnts2i-64.asm
+++ b/common/jpeg/simd/jcqnts2i-64.asm
@@ -179,3 +179,7 @@
 	uncollect_args
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcqnts2i.asm b/common/jpeg/simd/jcqnts2i.asm
index 404ae95..0864d6e 100644
--- a/common/jpeg/simd/jcqnts2i.asm
+++ b/common/jpeg/simd/jcqnts2i.asm
@@ -195,3 +195,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcqntsse.asm b/common/jpeg/simd/jcqntsse.asm
index 0f412d7..3065eca 100644
--- a/common/jpeg/simd/jcqntsse.asm
+++ b/common/jpeg/simd/jcqntsse.asm
@@ -206,3 +206,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcsammmx.asm b/common/jpeg/simd/jcsammmx.asm
index 982a6e0..c7126a0 100644
--- a/common/jpeg/simd/jcsammmx.asm
+++ b/common/jpeg/simd/jcsammmx.asm
@@ -319,3 +319,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcsamss2-64.asm b/common/jpeg/simd/jcsamss2-64.asm
index cf7a776..29c3f4f 100644
--- a/common/jpeg/simd/jcsamss2-64.asm
+++ b/common/jpeg/simd/jcsamss2-64.asm
@@ -322,3 +322,7 @@
 	uncollect_args
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jcsamss2.asm b/common/jpeg/simd/jcsamss2.asm
index 98e97da..818e911 100644
--- a/common/jpeg/simd/jcsamss2.asm
+++ b/common/jpeg/simd/jcsamss2.asm
@@ -346,3 +346,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jdclrmmx.asm b/common/jpeg/simd/jdclrmmx.asm
index 09f72ca..79772e0 100644
--- a/common/jpeg/simd/jdclrmmx.asm
+++ b/common/jpeg/simd/jdclrmmx.asm
@@ -402,3 +402,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jdclrss2-64.asm b/common/jpeg/simd/jdclrss2-64.asm
index c3c1b07..ea9d2ac 100644
--- a/common/jpeg/simd/jdclrss2-64.asm
+++ b/common/jpeg/simd/jdclrss2-64.asm
@@ -481,3 +481,7 @@
 	pop	rsp		; rsp <- original rbp
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jdclrss2.asm b/common/jpeg/simd/jdclrss2.asm
index 06a9ade..865fa82 100644
--- a/common/jpeg/simd/jdclrss2.asm
+++ b/common/jpeg/simd/jdclrss2.asm
@@ -500,3 +500,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jdmrgmmx.asm b/common/jpeg/simd/jdmrgmmx.asm
index 08b0985..f5fa936 100644
--- a/common/jpeg/simd/jdmrgmmx.asm
+++ b/common/jpeg/simd/jdmrgmmx.asm
@@ -461,3 +461,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jdmrgss2-64.asm b/common/jpeg/simd/jdmrgss2-64.asm
index 6329f95..3e54c7a 100644
--- a/common/jpeg/simd/jdmrgss2-64.asm
+++ b/common/jpeg/simd/jdmrgss2-64.asm
@@ -563,3 +563,7 @@
 	pop	rbx
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jdmrgss2.asm b/common/jpeg/simd/jdmrgss2.asm
index 5018a23..99b7eb9 100644
--- a/common/jpeg/simd/jdmrgss2.asm
+++ b/common/jpeg/simd/jdmrgss2.asm
@@ -559,3 +559,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jdsammmx.asm b/common/jpeg/simd/jdsammmx.asm
index e05d540..c09e5b9 100644
--- a/common/jpeg/simd/jdsammmx.asm
+++ b/common/jpeg/simd/jdsammmx.asm
@@ -732,3 +732,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jdsamss2-64.asm b/common/jpeg/simd/jdsamss2-64.asm
index 143a97a..8521491 100644
--- a/common/jpeg/simd/jdsamss2-64.asm
+++ b/common/jpeg/simd/jdsamss2-64.asm
@@ -662,3 +662,7 @@
 	pop	rbx
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jdsamss2.asm b/common/jpeg/simd/jdsamss2.asm
index 7d787f1..b5c863b 100644
--- a/common/jpeg/simd/jdsamss2.asm
+++ b/common/jpeg/simd/jdsamss2.asm
@@ -724,3 +724,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jf3dnflt.asm b/common/jpeg/simd/jf3dnflt.asm
index ed7e6a0..542672d 100644
--- a/common/jpeg/simd/jf3dnflt.asm
+++ b/common/jpeg/simd/jf3dnflt.asm
@@ -315,3 +315,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jfmmxfst.asm b/common/jpeg/simd/jfmmxfst.asm
index 3511457..0647242 100644
--- a/common/jpeg/simd/jfmmxfst.asm
+++ b/common/jpeg/simd/jfmmxfst.asm
@@ -392,3 +392,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jfmmxint.asm b/common/jpeg/simd/jfmmxint.asm
index e018e6b..a7e73f7 100644
--- a/common/jpeg/simd/jfmmxint.asm
+++ b/common/jpeg/simd/jfmmxint.asm
@@ -617,3 +617,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jfss2fst-64.asm b/common/jpeg/simd/jfss2fst-64.asm
index b6a06bc..c99acc2 100644
--- a/common/jpeg/simd/jfss2fst-64.asm
+++ b/common/jpeg/simd/jfss2fst-64.asm
@@ -386,3 +386,7 @@
 	pop	rsp		; rsp <- original rbp
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jfss2fst.asm b/common/jpeg/simd/jfss2fst.asm
index f0ad962..73fc9e5 100644
--- a/common/jpeg/simd/jfss2fst.asm
+++ b/common/jpeg/simd/jfss2fst.asm
@@ -399,3 +399,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jfss2int-64.asm b/common/jpeg/simd/jfss2int-64.asm
index 5fc4ac8..b8ec4b5 100644
--- a/common/jpeg/simd/jfss2int-64.asm
+++ b/common/jpeg/simd/jfss2int-64.asm
@@ -616,3 +616,7 @@
 	pop	rsp		; rsp <- original rbp
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jfss2int.asm b/common/jpeg/simd/jfss2int.asm
index 5338db3..5e3f2aa 100644
--- a/common/jpeg/simd/jfss2int.asm
+++ b/common/jpeg/simd/jfss2int.asm
@@ -629,3 +629,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jfsseflt-64.asm b/common/jpeg/simd/jfsseflt-64.asm
index 859ff54..0f3e21a 100644
--- a/common/jpeg/simd/jfsseflt-64.asm
+++ b/common/jpeg/simd/jfsseflt-64.asm
@@ -352,3 +352,7 @@
 	pop	rsp		; rsp <- original rbp
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jfsseflt.asm b/common/jpeg/simd/jfsseflt.asm
index 9b8d04c..bc54ccc 100644
--- a/common/jpeg/simd/jfsseflt.asm
+++ b/common/jpeg/simd/jfsseflt.asm
@@ -365,3 +365,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/ji3dnflt.asm b/common/jpeg/simd/ji3dnflt.asm
index 6c9abca..dc2076f 100644
--- a/common/jpeg/simd/ji3dnflt.asm
+++ b/common/jpeg/simd/ji3dnflt.asm
@@ -447,3 +447,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jimmxfst.asm b/common/jpeg/simd/jimmxfst.asm
index e5802ac..3b05572 100644
--- a/common/jpeg/simd/jimmxfst.asm
+++ b/common/jpeg/simd/jimmxfst.asm
@@ -495,3 +495,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jimmxint.asm b/common/jpeg/simd/jimmxint.asm
index 563f41c..7b52fae 100644
--- a/common/jpeg/simd/jimmxint.asm
+++ b/common/jpeg/simd/jimmxint.asm
@@ -847,3 +847,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jimmxred.asm b/common/jpeg/simd/jimmxred.asm
index 4ee34a0..a2b7103 100644
--- a/common/jpeg/simd/jimmxred.asm
+++ b/common/jpeg/simd/jimmxred.asm
@@ -701,3 +701,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jiss2flt-64.asm b/common/jpeg/simd/jiss2flt-64.asm
index a3d4a54..0e8522d 100644
--- a/common/jpeg/simd/jiss2flt-64.asm
+++ b/common/jpeg/simd/jiss2flt-64.asm
@@ -477,3 +477,7 @@
 	pop	rsp		; rsp <- original rbp
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jiss2flt.asm b/common/jpeg/simd/jiss2flt.asm
index fc9e21a..17bc363 100644
--- a/common/jpeg/simd/jiss2flt.asm
+++ b/common/jpeg/simd/jiss2flt.asm
@@ -493,3 +493,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jiss2fst-64.asm b/common/jpeg/simd/jiss2fst-64.asm
index ab6af50..8b664a6 100644
--- a/common/jpeg/simd/jiss2fst-64.asm
+++ b/common/jpeg/simd/jiss2fst-64.asm
@@ -486,3 +486,7 @@
 	pop	rbp
 	ret
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jiss2fst.asm b/common/jpeg/simd/jiss2fst.asm
index fda073f..b53664d 100644
--- a/common/jpeg/simd/jiss2fst.asm
+++ b/common/jpeg/simd/jiss2fst.asm
@@ -497,3 +497,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jiss2int-64.asm b/common/jpeg/simd/jiss2int-64.asm
index 97317af..82da0a7 100644
--- a/common/jpeg/simd/jiss2int-64.asm
+++ b/common/jpeg/simd/jiss2int-64.asm
@@ -842,3 +842,7 @@
 	pop	rsp		; rsp <- original rbp
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jiss2int.asm b/common/jpeg/simd/jiss2int.asm
index d568dad..adf39fb 100644
--- a/common/jpeg/simd/jiss2int.asm
+++ b/common/jpeg/simd/jiss2int.asm
@@ -854,3 +854,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jiss2red-64.asm b/common/jpeg/simd/jiss2red-64.asm
index dcf745b..85ba941 100644
--- a/common/jpeg/simd/jiss2red-64.asm
+++ b/common/jpeg/simd/jiss2red-64.asm
@@ -569,3 +569,7 @@
 	pop	rbx
 	pop	rbp
 	ret
+
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jiss2red.asm b/common/jpeg/simd/jiss2red.asm
index 10046e9..238c61d 100644
--- a/common/jpeg/simd/jiss2red.asm
+++ b/common/jpeg/simd/jiss2red.asm
@@ -589,3 +589,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jisseflt.asm b/common/jpeg/simd/jisseflt.asm
index db9d1a3..d6147c1 100644
--- a/common/jpeg/simd/jisseflt.asm
+++ b/common/jpeg/simd/jisseflt.asm
@@ -567,3 +567,6 @@
 	pop	ebp
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16
diff --git a/common/jpeg/simd/jsimdcpu.asm b/common/jpeg/simd/jsimdcpu.asm
index 31f2a6a..bdbcc23 100644
--- a/common/jpeg/simd/jsimdcpu.asm
+++ b/common/jpeg/simd/jsimdcpu.asm
@@ -100,3 +100,6 @@
 	pop	ebx
 	ret
 
+; For some reason, the OS X linker does not honor the request to align the
+; segment unless we do this.
+	align	16